Browse Source

coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana 2 years ago
parent
commit
37b68effb9

+ 1 - 1
iOSClient/Files/NCFiles.swift

@@ -85,7 +85,7 @@ class NCFiles: NCCollectionViewCommon {
         }
         }
         let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", appDelegate.account, serverUrl))
         let directory = NCManageDatabase.shared.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", appDelegate.account, serverUrl))
 
 
-        // FORCED false: yes, test the directory.etag
+        // FORCED false: test the directory.etag
         if !forced, let directory = directory, directory.etag == dataSource.directory?.etag {
         if !forced, let directory = directory, directory.etag == dataSource.directory?.etag {
             return
             return
         }
         }

+ 1 - 2
iOSClient/Main/NCMainTabBar.swift

@@ -209,8 +209,7 @@ class NCMainTabBar: UITabBar {
     }
     }
 
 
     @objc func updateBadgeNumber() {
     @objc func updateBadgeNumber() {
-
-        if appDelegate.account == "" { return }
+        guard !appDelegate.account.isEmpty else { return }
 
 
         let counterDownload = NCOperationQueue.shared.downloadCount()
         let counterDownload = NCOperationQueue.shared.downloadCount()
         let counterUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status == %d OR status == %d OR status == %d", NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading)).count
         let counterUpload = NCManageDatabase.shared.getMetadatas(predicate: NSPredicate(format: "status == %d OR status == %d OR status == %d", NCGlobal.shared.metadataStatusWaitUpload, NCGlobal.shared.metadataStatusInUpload, NCGlobal.shared.metadataStatusUploading)).count

+ 1 - 2
iOSClient/Media/NCMedia.swift

@@ -471,8 +471,7 @@ extension NCMedia {
     // MARK: - Datasource
     // MARK: - Datasource
 
 
     @objc func reloadDataSourceWithCompletion(_ completion: @escaping (_ metadatas: [tableMetadata]) -> Void) {
     @objc func reloadDataSourceWithCompletion(_ completion: @escaping (_ metadatas: [tableMetadata]) -> Void) {
-
-        if appDelegate.account == "" { return }
+        guard !appDelegate.account.isEmpty else { return }
 
 
         if account != appDelegate.account {
         if account != appDelegate.account {
             self.metadatas = []
             self.metadatas = []

+ 4 - 2
iOSClient/Networking/NCAutoUpload.swift

@@ -74,8 +74,10 @@ class NCAutoUpload: NSObject {
     }
     }
 
 
     private func uploadAssetsNewAndFull(viewController: UIViewController?, selector: String, log: String, completion: @escaping (_ items: Int) -> Void) {
     private func uploadAssetsNewAndFull(viewController: UIViewController?, selector: String, log: String, completion: @escaping (_ items: Int) -> Void) {
-
-        if appDelegate.account == "" { return }
+        guard !appDelegate.account.isEmpty else {
+            completion(0)
+            return
+        }
 
 
         guard let account = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", appDelegate.account)) else { return }
         guard let account = NCManageDatabase.shared.getAccount(predicate: NSPredicate(format: "account == %@", appDelegate.account)) else { return }
         let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: account.urlBase, account: account.account)
         let autoUploadPath = NCManageDatabase.shared.getAccountAutoUploadPath(urlBase: account.urlBase, account: account.account)

+ 1 - 2
iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -53,8 +53,7 @@ class NCNetworkingProcessUpload: NSObject {
     }
     }
 
 
     @objc private func process() {
     @objc private func process() {
-
-        if appDelegate.account == "" { return }
+        guard !appDelegate.account.isEmpty else { return }
 
 
         var counterUpload: Int = 0
         var counterUpload: Int = 0
         let sessionSelectors = [NCGlobal.shared.selectorUploadFile, NCGlobal.shared.selectorUploadAutoUpload, NCGlobal.shared.selectorUploadAutoUploadAll]
         let sessionSelectors = [NCGlobal.shared.selectorUploadFile, NCGlobal.shared.selectorUploadAutoUpload, NCGlobal.shared.selectorUploadAutoUploadAll]