marinofaggiana 5 years ago
parent
commit
34ca59396a

+ 1 - 1
File Provider Extension/FileProviderData.swift

@@ -43,7 +43,7 @@ class fileProviderData: NSObject {
     var currentAnchor: UInt64 = 0
 
     // Rank favorite
-    var listFavoriteIdentifierRank = [String:NSNumber]()
+    var listFavoriteIdentifierRank = [String: NSNumber]()
     
     // Item for signalEnumerator
     var fileProviderSignalDeleteContainerItemIdentifier = [NSFileProviderItemIdentifier:NSFileProviderItemIdentifier]()

+ 1 - 1
File Provider Extension/FileProviderExtension.swift

@@ -53,7 +53,7 @@ import Alamofire
 class FileProviderExtension: NSFileProviderExtension {
     
     var outstandingSessionTasks = [URL: URLSessionTask]()
-    var outstandingOcIdTemp = [String:String]()
+    var outstandingOcIdTemp = [String: String]()
     
     override init() {
         super.init()

+ 1 - 1
Notification Service Extension/NotificationService.swift

@@ -46,7 +46,7 @@ class NotificationService: UNNotificationServiceExtension {
                     guard let data = decryptedMessage.data(using: .utf8) else {
                         continue
                     }
-                    let json = try JSONSerialization.jsonObject(with: data) as! [String:AnyObject]
+                    let json = try JSONSerialization.jsonObject(with: data) as! [String: AnyObject]
                     if let subject = json["subject"] as? String {
                         bestAttemptContent.body = subject
                     }

+ 5 - 5
iOSClient/Database/NCManageDatabase.swift

@@ -1763,7 +1763,7 @@ class NCManageDatabase: NSObject {
     
         var counter: Int = 0
         var isEncrypted: Bool = false
-        var listServerUrl = [String:Bool]()
+        var listServerUrl = [String: Bool]()
         
         var metadataFolder = tableMetadata()
         var metadataFolders = [tableMetadata]()
@@ -1835,7 +1835,7 @@ class NCManageDatabase: NSObject {
     @discardableResult
     @objc func addMetadatas(_ metadatas: [tableMetadata]) -> [tableMetadata]? {
         
-        var directoryToClearDate = [String:String]()
+        var directoryToClearDate = [String: String]()
 
         let realm = try! Realm()
 
@@ -1914,7 +1914,7 @@ class NCManageDatabase: NSObject {
     
     @objc func deleteMetadata(predicate: NSPredicate) {
         
-        var directoryToClearDate = [String:String]()
+        var directoryToClearDate = [String: String]()
         
         let realm = try! Realm()
 
@@ -2268,9 +2268,9 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: result)
     }
     
-    @objc func getTableMetadatasDirectoryFavoriteIdentifierRank(account: String) -> [String:NSNumber] {
+    @objc func getTableMetadatasDirectoryFavoriteIdentifierRank(account: String) -> [String: NSNumber] {
         
-        var listIdentifierRank = [String:NSNumber]()
+        var listIdentifierRank = [String: NSNumber]()
 
         let realm = try! Realm()
         realm.refresh()

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -59,7 +59,7 @@ extension NCCreateFormUploadConflictDelegate {
     
     var metadatasConflictNewFiles = [String]()
     var metadatasConflictAlreadyExistingFiles = [String]()
-    var fileNamesPath = [String:String]()
+    var fileNamesPath = [String: String]()
 
     // MARK: - Cicle
 

+ 7 - 8
iOSClient/Media/NCMedia.swift

@@ -180,10 +180,7 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
         
         // Title
         self.navigationItem.title = NSLocalizedString("_media_", comment: "")
-        
-        //
-        //self.updateNewPhotoVideo()
-        
+                
         // Reload Data Source
         self.reloadDataSource(loadNetworkDatasource: true) { }
     }
@@ -191,6 +188,8 @@ class NCMedia: UIViewController, DropdownMenuDelegate, DZNEmptyDataSetSource, DZ
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
+        searchNewPhotoVideo()
+        
         reloadDataThenPerform {
             self.selectSearchSections()
         }
@@ -638,7 +637,7 @@ extension NCMedia {
         }
     }
     
-    func updateNewPhotoVideo() {
+    func searchNewPhotoVideo() {
         
         let tableAccount = NCManageDatabase.sharedInstance.getAccountActive()
         let fromDate = tableAccount?.dateUpdateMedia
@@ -646,10 +645,10 @@ extension NCMedia {
             NCManageDatabase.sharedInstance.setAccountDateUpdateMedia(Date() as NSDate)
             return
         }
-        let lteDate: TimeInterval = Date().timeIntervalSince1970
-        let gteDate: TimeInterval = fromDate!.timeIntervalSince1970
+        let lteDate: Int = Int(Date().timeIntervalSince1970)
+        let gteDate: Int = Int(fromDate!.timeIntervalSince1970)
         
-        let elementDate = "nc:upload_time/"//"upload_time xmlns=\"http://nextcloud.org/ns\"/"
+        let elementDate = "nc:upload_time/"
         
         NCCommunication.shared.searchMedia(lteDate: lteDate, gteDate: gteDate, elementDate: elementDate ,showHiddenFiles: CCUtility.getShowHiddenFiles(), user: appDelegate.activeUser) { (account, files, errorCode, errorDescription) in
             if errorCode == 0 && files != nil && files!.count > 0 {

+ 3 - 3
iOSClient/Networking/NCNetworking.swift

@@ -42,8 +42,8 @@ import Alamofire
     var delegate: NCNetworkingDelegate?
     
     var lastReachability: Bool = true
-    var downloadRequest = [String:DownloadRequest]()
-    var uploadRequest = [String:UploadRequest]()
+    var downloadRequest = [String: DownloadRequest]()
+    var uploadRequest = [String: UploadRequest]()
 
     //MARK: - Communication Delegate
        
@@ -740,7 +740,7 @@ import Alamofire
         }
     }
     
-    func deleteMetadataPlain(_ metadata: tableMetadata, addCustomHeaders: [String:String]?, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->()) {
+    func deleteMetadataPlain(_ metadata: tableMetadata, addCustomHeaders: [String: String]?, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->()) {
         
         // verify permission
         let permission = NCUtility.sharedInstance.permissionsContainsString(metadata.permissions, permissions: k_permission_can_delete)

+ 2 - 2
iOSClient/Security/NCEndToEndMetadata.swift

@@ -74,7 +74,7 @@ class NCEndToEndMetadata : NSObject  {
         let jsonEncoder = JSONEncoder.init()
         var files = [String: e2eMetadata.filesCodable]()
         var version = 1
-        var metadataKeysDictionary = [String:String]()
+        var metadataKeysDictionary = [String: String]()
         
         for recordE2eEncryption in recordsE2eEncryption {
             
@@ -155,7 +155,7 @@ class NCEndToEndMetadata : NSObject  {
             let files = decode.files
             let metadata = decode.metadata
             //let sharing = decode.sharing ---> V 2.0
-            var metadataKeysDictionary = [String:String]()
+            var metadataKeysDictionary = [String: String]()
             
             for metadataKeyDictionaryEncrypted in metadata.metadataKeys {