improved code

iOSClient/Networking/NCService.swift

@@ -59,7 +59,7 @@ class NCService: NSObject {
         
         OCnetworking.sharedManager().getCapabilitiesWithAccount(appDelegate.activeAccount, completion: { (account, capabilities, message, errorCode) in
             
-            if (errorCode == 0 && self.appDelegate.activeAccount == account!) {
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 // Update capabilities db
                 NCManageDatabase.sharedInstance.addCapabilities(capabilities!, account: account!)
@@ -119,7 +119,7 @@ class NCService: NSObject {
                     
                     OCnetworking.sharedManager().getNotificationWithAccount(account!, completion: { (account, listOfNotifications, message, errorCode) in
                         
-                        if (errorCode == 0 && account! == self.appDelegate.activeAccount) {
+                        if errorCode == 0 && account == self.appDelegate.activeAccount {
                             
                             DispatchQueue.global(qos: .default).async {
                                 
@@ -194,7 +194,7 @@ class NCService: NSObject {
                     
                     OCnetworking.sharedManager().getExternalSites(withAccount: account!, completion: { (account, listOfExternalSites, message, errorCode) in
                         
-                        if (errorCode == 0 && account! == self.appDelegate.activeAccount) {
+                        if errorCode == 0 && account == self.appDelegate.activeAccount {
                             
                             NCManageDatabase.sharedInstance.deleteExternalSites(account: account!)
                             for externalSites in listOfExternalSites! {
@@ -226,7 +226,7 @@ class NCService: NSObject {
                     
                     OCnetworking.sharedManager().readShare(withAccount: account!, completion: { (account, items, message, errorCode) in
                         
-                        if errorCode == 0 && account! == self.appDelegate.activeAccount {
+                        if errorCode == 0 && account == self.appDelegate.activeAccount {
                             
                             if items != nil {
                                 for item in items! as! [OCSharedDto]  {
@@ -265,7 +265,7 @@ class NCService: NSObject {
         
         OCnetworking.sharedManager().getUserProfile(withAccount: appDelegate.activeAccount, completion: { (account, userProfile, message, errorCode) in
             
-            if (errorCode == 0 && account! == self.appDelegate.activeAccount) {
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 // Update User (+ userProfile.id) & active account & account network
                 guard let tableAccount = NCManageDatabase.sharedInstance.setAccountUserProfile(userProfile!) else {
@@ -333,7 +333,7 @@ class NCService: NSObject {
         }
         
         OCnetworking.sharedManager().getActivityWithAccount(appDelegate.activeAccount, completion: { (account, listOfActivity, message, errorCode) in
-            if errorCode == 0 {
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 NCManageDatabase.sharedInstance.addActivityServer(listOfActivity as! [OCActivity], account: account!)
                 if (self.appDelegate.activeActivity != nil) {
                     self.appDelegate.activeActivity.reloadDatasource()

iOSClient/Notification/CCNotification.swift

@@ -86,7 +86,7 @@ class CCNotification: UITableViewController {
 
                 OCnetworking.sharedManager().setNotificationWithAccount(self.appDelegate.activeAccount, serverUrl: "\(self.appDelegate.activeUrl!)/\(k_url_acces_remote_notification_api)/\(notification.idNotification)", type: "DELETE", completion: { (account, message, errorCode) in
                     
-                    if (errorCode == 0 && account! == self.appDelegate.activeAccount) {
+                    if errorCode == 0 && account == self.appDelegate.activeAccount {
                         
                         let listOfNotifications = self.appDelegate.listOfNotifications as NSArray as! [OCNotifications]
                         
@@ -100,7 +100,7 @@ class CCNotification: UITableViewController {
                             self.viewClose()
                         }
                         
-                    } 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)
                     }
                 })
@@ -127,7 +127,7 @@ class CCNotification: UITableViewController {
 
                             OCnetworking.sharedManager().setNotificationWithAccount(self.appDelegate.activeAccount, serverUrl: (actionNotification as! OCNotificationsAction).link, type: (actionNotification as! OCNotificationsAction).type, completion: { (account, message, errorCode) in
                                 
-                                if (errorCode == 0 && account! == self.appDelegate.activeAccount) {
+                                if errorCode == 0 && account == self.appDelegate.activeAccount {
                                     
                                     let listOfNotifications = self.appDelegate.listOfNotifications as NSArray as! [OCNotifications]
                                     
@@ -141,7 +141,7 @@ class CCNotification: UITableViewController {
                                         self.viewClose()
                                     }
                                     
-                                } 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)
                                 }
                             })

iOSClient/Trash/NCTrash.swift

@@ -461,10 +461,8 @@ class NCTrash: UIViewController ,UICollectionViewDataSource, UICollectionViewDel
             self.refreshControl.endRefreshing()
 
             if errorCode == 0 && account == self.appDelegate.activeAccount {
-                
                 NCManageDatabase.sharedInstance.deleteTrash(filePath: self.path, account: self.appDelegate.activeAccount)
-                NCManageDatabase.sharedInstance.addTrashs(item as! [tableTrash])
-                
+                NCManageDatabase.sharedInstance.addTrashs(item as! [tableTrash])                
             } else if errorCode != 0 {
                 self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
             }

iOSClient/Viewer/NCViewerRichdocument.swift

@@ -111,11 +111,10 @@ class NCViewerRichdocument: NSObject, WKNavigationDelegate, WKScriptMessageHandl
         if serverUrl != nil && metadata != nil {
             
             OCnetworking.sharedManager().createAssetRichdocuments(withAccount: metadata?.account, fileName: metadata?.fileName, serverUrl: serverUrl, completion: { (account, url, message, errorCode) in
-                
-                if (errorCode == 0) {
+                if errorCode == 0 && account == self.appDelegate.activeAccount {
                     let functionJS = "OCA.RichDocuments.documentsMain.postAsset('\(metadata!.fileNameView)', '\(url!)')"
                     self.webView.evaluateJavaScript(functionJS, completionHandler: { (result, error) in })
-                } else {
+                } else if errorCode != 0 {
                     self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
                 }
             })
@@ -125,11 +124,10 @@ class NCViewerRichdocument: NSObject, WKNavigationDelegate, WKScriptMessageHandl
     func select(_ metadata: tableMetadata!, serverUrl: String!) {
         
         OCnetworking.sharedManager().createAssetRichdocuments(withAccount: metadata?.account, fileName: metadata?.fileName, serverUrl: serverUrl, completion: { (account, url, message, errorCode) in
-            
-            if (errorCode == 0) {
+            if errorCode == 0 && account == self.appDelegate.activeAccount {
                 let functionJS = "OCA.RichDocuments.documentsMain.postAsset('\(metadata.fileNameView)', '\(url!)')"
                 self.webView.evaluateJavaScript(functionJS, completionHandler: { (result, error) in })
-            } else {
+            } else if errorCode != 0 {
                 self.appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: Int(k_CCErrorInternalError))
             }
         })