marinofaggiana преди 4 години
родител
ревизия
ed38861c78

+ 4 - 2
iOSClient/Favorites/NCFavorite.swift

@@ -90,7 +90,8 @@ class NCFavorite: NCCollectionViewCommon  {
                 } else {
                     NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: TimeInterval(k_dismissAfterSecond), type: NCContentPresenter.messageType.error, errorCode: errorCode)
                 }
-                self.searchController?.isActive = false
+                
+                self.refreshControl.endRefreshing()
                 self.isReloadDataSourceNetworkInProgress = false
                 self.reloadDataSource()
             }
@@ -108,7 +109,8 @@ class NCFavorite: NCCollectionViewCommon  {
                         }
                     }
                 }
-                self.searchController?.isActive = false
+                
+                self.refreshControl.endRefreshing()
                 self.isReloadDataSourceNetworkInProgress = false
                 if metadatasUpdate?.count ?? 0 > 0 {
                     self.reloadDataSource()

+ 2 - 1
iOSClient/Files/NCFiles.swift

@@ -102,7 +102,8 @@ class NCFiles: NCCollectionViewCommon  {
                     }
                 }
             }
-            self.searchController?.isActive = false
+            
+            self.refreshControl.endRefreshing()
             self.isReloadDataSourceNetworkInProgress = false
             if metadatasUpdate?.count ?? 0 > 0 {
                 self.reloadDataSource()

+ 1 - 1
iOSClient/Main/Collection/NCCollectionViewCommon.swift

@@ -944,7 +944,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 
                 let directory = NCManageDatabase.sharedInstance.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", self.appDelegate.account, self.serverUrl))
                 
-                if forced || directory?.etag != metadata?.etag {
+                if forced || directory?.etag != metadata?.etag || directory?.e2eEncrypted ?? false {
                     
                     NCNetworking.shared.readFolder(serverUrl: self.serverUrl, account: self.appDelegate.account) { (account, metadataFolder, metadatas, metadatasUpdate, metadatasLocalUpdate, errorCode, errorDescription) in
                         

+ 2 - 1
iOSClient/Offline/NCOffline.swift

@@ -107,7 +107,8 @@ class NCOffline: NCCollectionViewCommon  {
                         }
                     }
                 }
-                self.searchController?.isActive = false
+                
+                self.refreshControl.endRefreshing()
                 self.isReloadDataSourceNetworkInProgress = false
                 if metadatasUpdate?.count ?? 0 > 0 {
                     self.reloadDataSource()