new view share

iOSClient/Networking/NCService.swift

@@ -271,8 +271,8 @@ class NCService: NSObject {
                             let itemsOCSharedDto = items as! [OCSharedDto]
                             NCManageDatabase.sharedInstance.deleteTableShare(account: account!)
                             self.appDelegate.shares = NCManageDatabase.sharedInstance.addShare(account: account!, activeUrl: self.appDelegate.activeUrl, items: itemsOCSharedDto)
-                            self.appDelegate.activeMain.tableView.reloadData()
-                            self.appDelegate.activeFavorites.tableView.reloadData()
+                            self.appDelegate.activeMain?.tableView?.reloadData()
+                            self.appDelegate.activeFavorites?.tableView?.reloadData()
                         } else {
                             self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                         }

iOSClient/Share/NCShareNetworking.swift

@@ -47,8 +47,8 @@ class NCShareNetworking: NSObject {
             if errorCode == 0 {
                 let itemsOCSharedDto = items as! [OCSharedDto]
                 self.appDelegate.shares = NCManageDatabase.sharedInstance.addShare(account: self.metadata.account, activeUrl: self.activeUrl, items: itemsOCSharedDto)
-                self.appDelegate.activeMain.tableView.reloadData()
-                self.appDelegate.activeFavorites.tableView.reloadData()
+                self.appDelegate.activeMain?.tableView?.reloadData()
+                self.appDelegate.activeFavorites?.tableView?.reloadData()
             } else {
                 self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
             }
@@ -66,8 +66,8 @@ class NCShareNetworking: NSObject {
                     if errorCode == 0 {
                         let itemsOCSharedDto = items as! [OCSharedDto]
                         self.appDelegate.shares = NCManageDatabase.sharedInstance.addShare(account: self.metadata.account, activeUrl: self.activeUrl, items: itemsOCSharedDto)
-                        self.appDelegate.activeMain.tableView.reloadData()
-                        self.appDelegate.activeFavorites.tableView.reloadData()
+                        self.appDelegate.activeMain?.tableView?.reloadData()
+                        self.appDelegate.activeFavorites?.tableView?.reloadData()
                     } else {
                         self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                     }
@@ -132,8 +132,8 @@ class NCShareNetworking: NSObject {
                     if errorCode == 0 {
                         let itemsOCSharedDto = items as! [OCSharedDto]
                         self.appDelegate.shares = NCManageDatabase.sharedInstance.addShare(account: self.metadata.account, activeUrl: self.activeUrl, items: itemsOCSharedDto)
-                        self.appDelegate.activeMain.tableView.reloadData()
-                        self.appDelegate.activeFavorites.tableView.reloadData()
+                        self.appDelegate.activeMain?.tableView?.reloadData()
+                        self.appDelegate.activeFavorites?.tableView?.reloadData()
                     } else {
                         self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
                     }

iOSClient/Shares/NCShares.m

@@ -177,32 +177,12 @@
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)removeShares:(tableMetadata *)metadata tableShare:(tableShare *)tableShare
-{
-    NSString *shareString;
-    
-      /*
-    // Unshare Link
-    if (tableShare.shareLink.length > 0) {
-        
-        shareString = tableShare.shareLink;
-    }
-    
-  
-    // Unshare User&Group
-    NSArray *shareUserAndGroup = [tableShare.shareUserAndGroup componentsSeparatedByString:@","];
-    for (NSString *share in shareUserAndGroup) {
-        shareString = [share stringByReplacingOccurrencesOfString:@" " withString:@""];
-    }
-    
-    [[OCNetworking sharedManager] unshareAccount:appDelegate.activeAccount shareID:[shareString integerValue] completion:^(NSString *account, NSString *message, NSInteger errorCode) {
+{    
+    [[OCNetworking sharedManager] unshareAccount:appDelegate.activeAccount shareID:tableShare.idRemoteShared completion:^(NSString *account, NSString *message, NSInteger errorCode) {
         
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
             
-            NSArray *result = [[NCManageDatabase sharedInstance] unShare:shareString fileName:metadata.fileName serverUrl:metadata.serverUrl sharesLink:appDelegate.sharesLink sharesUserAndGroup:appDelegate.sharesUserAndGroup account:account];
-            
-            appDelegate.sharesLink = result[0];
-            appDelegate.sharesUserAndGroup = result[1];
-            
+            [[NCManageDatabase sharedInstance] deleteTableShareWithAccount:account idRemoteShared:tableShare.idRemoteShared];
             [self reloadDatasource];
             
         } else if (errorCode != 0) {
@@ -211,7 +191,6 @@
             NSLog(@"[LOG] It has been changed user during networking process, error.");
         }
     }];
-    */
 }
 
 #pragma mark -