improved code

iOSClient/Main/Create cloud/NCCreateFormUploadRichdocuments.swift

@@ -321,7 +321,7 @@ class NCCreateFormUploadRichdocuments: XLFormViewController, NCSelectDelegate, U
             
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 self.collectionView.reloadItems(at: [indexPath])
-            } else {
+            } else if errorCode != 0 {
                 print("\(errorCode)")
             }
         })

iOSClient/Main/NCMainCommon.swift

@@ -858,7 +858,7 @@ class NCMainCommon: NSObject {
                     
                     count += 1
 
-                    if errorCode == 0 || errorCode == 404 {
+                    if errorCode == 0 || errorCode == kOCErrorServerPathNotFound {
                         
                         do {
                             try FileManager.default.removeItem(atPath: CCUtility.getDirectoryProviderStorageFileID(metadata.fileID))

iOSClient/Networking/NCService.swift

@@ -159,15 +159,18 @@ class NCService: NSObject {
                             
                         } else {
                             
-                            var error = ""
-                            if let message = message {
-                                error = "Get Notification Server failure error \(errorCode) \(message)"
-                            } else {
-                                error = "Get Notification Server failure error \(errorCode)"
+                            if errorCode != 0 {
+                                
+                                var error = ""
+                                if let message = message {
+                                    error = "Get Notification Server failure error \(errorCode) \(message)"
+                                } else {
+                                    error = "Get Notification Server failure error \(errorCode)"
+                                }
+                                
+                                NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Notification Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: self.appDelegate.activeUrl)
                             }
                             
-                            NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Notification Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: self.appDelegate.activeUrl)
-                            
                             // Update Main NavigationBar
                             if (self.appDelegate.activeMain.isSelectedMode == false && self.appDelegate.activeMain != nil) {
                                 self.appDelegate.activeMain.setUINavigationBarDefault()
@@ -198,7 +201,7 @@ class NCService: NSObject {
                                 NCManageDatabase.sharedInstance.addExternalSites(externalSites as! OCExternalSites, account: account!)
                             }
                             
-                        } else {
+                        } else if errorCode != 0 {
                             
                             var error = ""
                             if let message = message {
@@ -206,7 +209,7 @@ class NCService: NSObject {
                             } else {
                                 error = "Get external site failure error \(errorCode)"
                             }
-                            
+                                
                             NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get external site Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
                         }
                     })
@@ -236,9 +239,8 @@ class NCService: NSObject {
                     })
                 }
                 
-            } else {
+            } else if errorCode != 0 {
                 
-                // Change Theming color
                 self.appDelegate.settingThemingColorBrand()
                 
                 var error = ""
@@ -247,8 +249,10 @@ class NCService: NSObject {
                 } else {
                     error = "Get Capabilities failure error \(errorCode)"
                 }
-                
                 NCManageDatabase.sharedInstance.addActivityClient("", fileID: "", action: k_activityDebugActionCapabilities, selector: "Get Capabilities of Server", note: error, type: k_activityTypeFailure, verbose: true, activeUrl: "")
+            } else {
+                // Change Theming color
+                self.appDelegate.settingThemingColorBrand()
             }
         })
     }
@@ -307,7 +311,7 @@ class NCService: NSObject {
                     }
                 }
                 
-            } else {
+            } else if errorCode != 0 {
                 
                 var error = ""
                 if let message = message {
@@ -334,7 +338,7 @@ class NCService: NSObject {
                 if (self.appDelegate.activeActivity != nil) {
                     self.appDelegate.activeActivity.reloadDatasource()
                 }
-            } else {
+            } else if errorCode != 0 {
                 var error = ""
                 if let message = message {
                     error = "Get Activity Server failure error \(errorCode) \(message)"

iOSClient/Notification/CCNotification.swift

@@ -100,11 +100,8 @@ class CCNotification: UITableViewController {
                             self.viewClose()
                         }
                         
-                    } else {
-                        
-                        if (errorCode != 0) {
-                            self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
-                        }
+                    } else if (errorCode != 0) {
+                        self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                     }
                 })
             }
@@ -144,11 +141,8 @@ class CCNotification: UITableViewController {
                                         self.viewClose()
                                     }
                                     
-                                } else {
-                                    
-                                    if (errorCode != 0) {
-                                        self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
-                                    }
+                                } else if (errorCode != 0) {
+                                    self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                                 }
                             })
                         }

iOSClient/Trash/NCTrash.swift

@@ -460,12 +460,12 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
             
             self.refreshControl.endRefreshing()
 
-            if (errorCode == 0 && account == self.appDelegate.activeAccount) {
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 NCManageDatabase.sharedInstance.deleteTrash(filePath: self.path, account: self.appDelegate.activeAccount)
                 NCManageDatabase.sharedInstance.addTrashs(item as! [tableTrash])
                 
-            } else if (errorCode != 0) {
+            } else if errorCode != 0 {
                 self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
             }
             
@@ -513,15 +513,10 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
         let path = appDelegate.activeUrl + tableTrash.filePath + tableTrash.fileName
 
         OCnetworking.sharedManager().deleteFileOrFolder(withAccount: appDelegate.activeAccount, path: path, completion: { (account, message, errorCode) in
-            
-            if errorCode == 0 {
-                
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID, account: account!)
-                
                 self.loadDatasource()
-                
-            } else {
-                
+            } else if errorCode != 0 {
                 self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
             }
         })