coding

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Extensions/Array+Extensions.swift

@@ -29,11 +29,9 @@ extension Array {
     func unique<T: Hashable>(map: ((Element) -> (T))) -> [Element] {
         var set = Set<T>() // the unique list kept in a Set for fast retrieval
         var arrayOrdered = [Element]() // keeping the unique list of elements but ordered
-        for value in self {
-            if !set.contains(map(value)) {
-                set.insert(map(value))
-                arrayOrdered.append(value)
-            }
+        for value in self where !set.contains(map(value)) {
+            set.insert(map(value))
+            arrayOrdered.append(value)
         }
 
         return arrayOrdered

iOSClient/Favorites/NCFavorite.swift

@@ -103,13 +103,9 @@ class NCFavorite: NCCollectionViewCommon {
         } else {
 
             networkReadFolder(forced: forced) { tableDirectory, metadatas, metadatasUpdate, metadatasDelete, error in
-                if error == .success {
-                    for metadata in metadatas ?? [] {
-                        if !metadata.directory {
-                            if NCManageDatabase.shared.isDownloadMetadata(metadata, download: false) {
-                                NCOperationQueue.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile)
-                            }
-                        }
+                if error == .success, let metadatas = metadatas {
+                    for metadata in metadatas where (!metadata.directory && NCManageDatabase.shared.isDownloadMetadata(metadata, download: false)) {
+                        NCOperationQueue.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile)
                     }
                 }
 

iOSClient/Menu/UIViewController+Menu.swift

@@ -65,7 +65,7 @@ extension UIViewController {
         let serverVersionMajor = NCManageDatabase.shared.getCapabilitiesServerInt(account: appDelegate.account, elements: NCElementsJSON.shared.capabilitiesVersionMajor)
         guard serverVersionMajor >= NCGlobal.shared.nextcloudVersion23 else { return }
 
-        NextcloudKit.shared.getHovercard(for: userId) { account, card, data, _ in
+        NextcloudKit.shared.getHovercard(for: userId) { account, card, _, _ in
             guard let card = card, account == appDelegate.account else { return }
 
             let personHeader = NCMenuAction(

iOSClient/Offline/NCOffline.swift

@@ -103,13 +103,9 @@ class NCOffline: NCCollectionViewCommon {
         collectionView?.reloadData()
 
         networkReadFolder(forced: forced) { tableDirectory, metadatas, metadatasUpdate, metadatasDelete, error in
-            if error == .success {
-                for metadata in metadatas ?? [] {
-                    if !metadata.directory {
-                        if NCManageDatabase.shared.isDownloadMetadata(metadata, download: true) {
-                            NCOperationQueue.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile)
-                        }
-                    }
+            if error == .success, let metadatas = metadatas {
+                for metadata in metadatas where (!metadata.directory && NCManageDatabase.shared.isDownloadMetadata(metadata, download: true)) {
+                    NCOperationQueue.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorDownloadFile)
                 }
             }
 

iOSClient/ScanDocument/NCScan.swift

@@ -186,17 +186,13 @@ class NCScan: UIViewController, NCScanCellCellDelegate {
 
     @IBAction func transferDown(sender: UIButton) {
 
-        for fileName in itemsSource {
+        for fileName in itemsSource where !itemsDestination.contains(fileName) {
 
-            if !itemsDestination.contains(fileName) {
+            let fileNamePathAt = CCUtility.getDirectoryScan() + "/" + fileName
+            guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)), let image = UIImage(data: data) else { return }
 
-                let fileNamePathAt = CCUtility.getDirectoryScan() + "/" + fileName
-
-                guard let data = try? Data(contentsOf: URL(fileURLWithPath: fileNamePathAt)), let image = UIImage(data: data) else { return }
-
-                imagesDestination.append(image)
-                itemsDestination.append(fileName)
-            }
+            imagesDestination.append(image)
+            itemsDestination.append(fileName)
         }
 
         // Save button

iOSClient/Trash/NCTrash.swift

@@ -278,7 +278,7 @@ extension NCTrash {
 
         let options = NKRequestOptions(queue: NKCommon.shared.backgroundQueue)
 
-        NextcloudKit.shared.listingTrash(showHiddenFiles: false, options: options) { account, items, data, error in
+        NextcloudKit.shared.listingTrash(showHiddenFiles: false, options: options) { account, items, _, error in
 
             DispatchQueue.main.async { self.refreshControl.endRefreshing() }