coding

iOSClient/CCGlobal.h

@@ -338,10 +338,10 @@
 #define k_notificationCenter_progressTask               @"progressTask"
 
 #define k_notificationCenter_createFolder               @"createFolder"                     // userInfo: fileName, serverUrl, errorCode, errorDescription
-#define k_notificationCenter_deleteFile                 @"deleteFile"
+#define k_notificationCenter_deleteFile                 @"deleteFile"                       // userInfo: metadata, errorCode, errorDescription
 #define k_notificationCenter_renameFile                 @"renameFile"                       // userInfo: metadata, fileName, errorCode, errorDescription
 #define k_notificationCenter_moveFile                   @"moveFile"
-#define k_notificationCenter_favoriteFile               @"favoriteFile"                     // userInfo: metadata, errorCode, errorDescription
+#define k_notificationCenter_favoriteFile               @"favoriteFile"                     // userInfo: metadata, favorite, errorCode, errorDescription
 #define k_notificationCenter_menuSearchTextPDF          @"menuSearchTextPDF"
 #define k_notificationCenter_menuDownloadImage          @"menuDownloadImage"
 #define k_notificationCenter_menuSaveLivePhoto          @"menuSaveLivePhoto"

iOSClient/Favorites/CCFavorites.m

@@ -132,8 +132,13 @@
 
     NSDictionary *userInfo = notification.userInfo;
     tableMetadata *metadata = userInfo[@"metadata"];
-    if (metadata) {
+    NSInteger errorCode = [userInfo[@"errorCode"] integerValue];
+    NSString *errorDescription = userInfo[@"errorDescription"];
+    
+    if (errorCode == 0 && metadata) {
         [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:metadata.serverUrl ocId:metadata.ocId action:k_action_DEL];
+    } else {
+        [[NCContentPresenter shared] messageNotification:@"_error_" description:errorDescription delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
     }
 }
 

iOSClient/Main/CCMain.m

@@ -442,17 +442,23 @@
     
     NSDictionary *userInfo = notification.userInfo;
     tableMetadata *metadata = userInfo[@"metadata"];
+    NSInteger errorCode = [userInfo[@"errorCode"] integerValue];
+    NSString *errorDescription = userInfo[@"errorDescription"];
     
-    if ([metadata.serverUrl isEqualToString:self.serverUrl]) {
-        if ([metadata.fileNameView.lowercaseString isEqualToString:k_fileNameRichWorkspace.lowercaseString]) {
-            [self readFileReloadFolder];
-        } else {
-            if (self.searchController.isActive) {
-                [self readFolder:self.serverUrl];
+    if (errorCode == 0 && metadata) {
+        if ([metadata.serverUrl isEqualToString:self.serverUrl]) {
+            if ([metadata.fileNameView.lowercaseString isEqualToString:k_fileNameRichWorkspace.lowercaseString]) {
+                [self readFileReloadFolder];
             } else {
-                [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl ocId:nil action:k_action_NULL];
+                if (self.searchController.isActive) {
+                    [self readFolder:self.serverUrl];
+                } else {
+                    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl ocId:nil action:k_action_NULL];
+                }
             }
         }
+    } else {
+        [[NCContentPresenter shared] messageNotification:@"_error_" description:errorDescription delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
     }
 }
 
@@ -463,6 +469,7 @@
     NSDictionary *userInfo = notification.userInfo;
     tableMetadata *metadata = userInfo[@"metadata"];
     NSInteger errorCode = [userInfo[@"errorCode"] integerValue];
+    NSString *errorDescription = userInfo[@"errorDescription"];
     BOOL favorite = [userInfo[@"favorite"] boolValue];
     
     if (errorCode == 0) {
@@ -499,6 +506,8 @@
                     
             [appDelegate startLoadAutoDownloadUpload];
         }
+    } else {
+        [[NCContentPresenter shared] messageNotification:@"_error_" description:errorDescription delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
     }
 }
 
@@ -511,9 +520,12 @@
     
     NSDictionary *userInfo = notification.userInfo;
     NSInteger errorCode = [userInfo[@"errorCode"] integerValue];
+    NSString *errorDescription = userInfo[@"errorDescription"];
     
     if (errorCode == 0) {
         [self readFolder:self.serverUrl];
+    } else {
+        [[NCContentPresenter shared] messageNotification:@"_error_" description:errorDescription delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
     }
 }
 

iOSClient/Networking/NCNetworking.swift

@@ -341,7 +341,7 @@ import NCCommunication
                 NCManageDatabase.sharedInstance.setMetadataFavorite(ocId: metadata.ocId, favorite: favorite)
             }
             
-            self.NotificationPost(name: k_notificationCenter_favoriteFile, userInfo: ["metadata": metadata, "errorCode": errorCode], errorDescription: errorDescription, completion: completion)
+            self.NotificationPost(name: k_notificationCenter_favoriteFile, userInfo: ["metadata": metadata, "favorite": favorite, "errorCode": errorCode], errorDescription: errorDescription, completion: completion)
         }
     }
     

iOSClient/Offline/NCOffline.swift

@@ -145,7 +145,15 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
     @objc func deleteFile(_ notification: NSNotification) {
         if self.view?.window == nil { return }
         
-        self.loadDatasource()
+        if let userInfo = notification.userInfo as NSDictionary? {
+            if let errorCode = userInfo["errorCode"] as? Int, let errorDescription = userInfo["errorDescription"] as? String {
+                if errorCode == 0 {
+                    self.loadDatasource()
+                } else {
+                    NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
+                }
+            }
+        }
     }
     
     @objc func changeTheming() {