Browse Source

Fix refresh control

Signed-off-by: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Philippe Weidmann 4 years ago
parent
commit
06a85b0f06
1 changed files with 2 additions and 10 deletions
  1. 2 10
      iOSClient/Main/CCMain.m

+ 2 - 10
iOSClient/Main/CCMain.m

@@ -700,12 +700,7 @@
 - (void)deleteRefreshControl
 {
     [refreshControl endRefreshing];
-    
-    for (UIView *subview in [_tableView subviews]) {
-        if (subview == refreshControl)
-            [subview removeFromSuperview];
-    }
-    
+    [refreshControl removeFromSuperview];
     refreshControl = nil;
 }
 
@@ -1168,13 +1163,11 @@
     }
     
     _loadingFolder = YES;
-
+    [refreshControl endRefreshing];
     [self tableViewReloadData];
     
     [[NCNetworking sharedInstance] readFolderWithServerUrl:serverUrl account:appDelegate.activeAccount completion:^(NSString *account, tableMetadata *metadataFolder, NSArray *metadatas, NSInteger errorCode, NSString *errorDescription) {
         
-        [refreshControl endRefreshing];
-
         if (errorCode == 0 ) {
             
             _metadataFolder = metadataFolder;
@@ -1215,7 +1208,6 @@
             
             if ([serverUrl isEqualToString:_serverUrl]) {
                 [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl ocId:nil action:k_action_NULL];
-                [self tableViewReloadData];
             }
         
         } else {