dev

iOSClient/Main/CCMain.h

@@ -75,11 +75,14 @@
 
 - (void)readFolder:(NSString *)serverUrl;
 - (void)readFileReloadFolder;
+- (void)tableViewReloadData;
 
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl useSubFolder:(BOOL)useSubFolder session:(NSString *)session;
 
 - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID action:(NSInteger)action;
 
+- (void)readShareWithAccount:(NSString *)account openWindow:(BOOL)openWindow metadata:(tableMetadata *)metadata;
+
 - (void)openWindowShare:(tableMetadata *)metadata;
 - (void)clearDateReadDataSource:(NSNotification *)notification;
 - (void)cancelSearchBar;

iOSClient/Main/CCMain.m

@@ -1885,52 +1885,55 @@
 #pragma mark ===== Shared =====
 #pragma --------------------------------------------------------------------------------------------
 
-/*
-- (void)readSharedSuccess:(CCMetadataNet *)metadataNet items:(NSDictionary *)items openWindow:(BOOL)openWindow
+- (void)readShareWithAccount:(NSString *)account openWindow:(BOOL)openWindow metadata:(tableMetadata *)metadata
 {
-    [_hud hideHud];
-    
-    // Check Active Account
-    if (![metadataNet.account isEqualToString:appDelegate.activeAccount])
-        return;
-    
-    NSArray *result = [[NCManageDatabase sharedInstance] updateShare:items activeUrl:appDelegate.activeUrl account:metadataNet.account];
-    if (result) {
-        appDelegate.sharesLink = result[0];
-        appDelegate.sharesUserAndGroup = result[1];
-    }
-    
-    // Notify Shares View
-    [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"SharesReloadDatasource" object:nil userInfo:nil];
-    
-    if (openWindow) {
+    [[OCNetworking sharedManager] readShareWithAccount:account completion:^(NSString *account, NSArray *items, NSString *message, NSInteger errorCode) {
+        
+        [_hud hideHud];
+
+        if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
             
-        if (_shareOC) {
-                
-            [_shareOC reloadData];
-                
-        } else {
+            [appDelegate.sharesID removeAllObjects];
             
-            tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadataNet.fileID]];
+            for (OCSharedDto *item in items)
+                [appDelegate.sharesID setObject:item forKey:[@(item.idRemoteShared) stringValue]];
             
-            // Apriamo la view
-            _shareOC = [[UIStoryboard storyboardWithName:@"CCShare" bundle:nil] instantiateViewControllerWithIdentifier:@"CCShareOC"];
+            NSArray *result = [[NCManageDatabase sharedInstance] updateShare:appDelegate.sharesID activeUrl:appDelegate.activeUrl account:appDelegate.activeAccount];
+            if (result) {
+                appDelegate.sharesLink = result[0];
+                appDelegate.sharesUserAndGroup = result[1];
+            }
             
-            _shareOC.delegate = self;
-            _shareOC.metadata = metadata;
-            _shareOC.serverUrl = metadataNet.serverUrl;
+            // Notify Shares View
+            [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadName:@"SharesReloadDatasource" object:nil userInfo:nil];
             
-            _shareOC.shareLink = [appDelegate.sharesLink objectForKey:metadata.fileID];
-            _shareOC.shareUserAndGroup = [appDelegate.sharesUserAndGroup objectForKey:metadata.fileID];
+            if (openWindow) {
+                
+                if (_shareOC) {
+                    
+                    [_shareOC reloadData];
+                    
+                } else {
+                    
+                    // Apriamo la view
+                    _shareOC = [[UIStoryboard storyboardWithName:@"CCShare" bundle:nil] instantiateViewControllerWithIdentifier:@"CCShareOC"];
+                    
+                    _shareOC.delegate = self;
+                    _shareOC.metadata = metadata;
+                    _shareOC.serverUrl = metadata.serverUrl;
+                    
+                    _shareOC.shareLink = [appDelegate.sharesLink objectForKey:metadata.fileID];
+                    _shareOC.shareUserAndGroup = [appDelegate.sharesUserAndGroup objectForKey:metadata.fileID];
+                    
+                    [_shareOC setModalPresentationStyle:UIModalPresentationFormSheet];
+                    [self presentViewController:_shareOC animated:YES completion:nil];
+                }
+            }
             
-            [_shareOC setModalPresentationStyle:UIModalPresentationFormSheet];
-            [self presentViewController:_shareOC animated:YES completion:nil];
+            [self tableViewReloadData];
         }
-    }
-
-    [self tableViewReloadData];
+    }];
 }
-*/
 
 - (void)share:(tableMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password permission:(NSInteger)permission hideDownload:(BOOL)hideDownload
 {

iOSClient/Networking/NCService.swift

@@ -226,21 +226,7 @@ class NCService: NSObject {
                 // Read Share
                 if (capabilities!.isFilesSharingAPIEnabled && self.appDelegate.activeMain != nil) {
                     
-                    self.appDelegate.sharesID.removeAllObjects()
-                    
-                    OCNetworking.sharedManager().readShare(withAccount: account!, completion: { (account, items, message, errorCode) in
-                        
-                        if errorCode == 0 && account == self.appDelegate.activeAccount {
-                            
-                            if items != nil {
-                                for item in items! as! [OCSharedDto]  {
-                                    self.appDelegate.sharesID.setObject(item, forKey: NSString(string: String(item.idRemoteShared)))
-                                }
-                                
-                                self.appDelegate.activeMain.tableView.reloadData()
-                            }
-                        }
-                    })
+                    self.appDelegate.activeMain.readShare(withAccount: account, openWindow: false, metadata: nil)
                 }
                 
             } else if errorCode != 0 {