cod

Signed-off-by: Marino Faggiana <[email protected]>

Author: marinofaggiana

Share/NCShareExtension+DataSource.swift

@@ -26,9 +26,12 @@ extension NCShareExtension: UICollectionViewDelegate {
                 self.present(UIAlertController.warning(message: "\(fileNameError.errorDescription) \(NSLocalizedString("_please_rename_file_", comment: ""))"), animated: true)
                 return
             }
+
             self.serverUrl = serverUrl
-            await self.reloadDatasource(withLoadFolder: true)
             self.setNavigationBar(navigationTitle: metadata.fileNameView)
+
+            await self.reloadData()
+            await self.loadFolder()
         }
     }
 

Share/NCShareExtension+Files.swift

@@ -9,19 +9,14 @@ import UniformTypeIdentifiers
 import NextcloudKit
 
 extension NCShareExtension {
-    func reloadDatasource(withLoadFolder: Bool) async {
+    func reloadData() async {
         let session = self.extensionData.getSession()
         let layoutForView = await NCManageDatabase.shared.getLayoutForViewAsync(account: session.account, key: keyLayout, serverUrl: serverUrl)
         let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND directory == true", session.account, serverUrl)
         let metadatas = await self.database.getMetadatasAsync(predicate: predicate,
                                                               layoutForView: layoutForView,
                                                               account: session.account)
         self.dataSource = NCCollectionViewDataSource(metadatas: metadatas, layoutForView: layoutForView, account: session.account)
-
-        if withLoadFolder {
-            await self.loadFolder()
-        }
-
         self.collectionView.reloadData()
     }
 
@@ -33,7 +28,7 @@ extension NCShareExtension {
             else { return }
 
             self.serverUrl += "/" + metadata.fileName
-            await self.reloadDatasource(withLoadFolder: true)
+            await self.loadFolder()
             self.setNavigationBar(navigationTitle: metadata.fileNameView)
         }
     }
@@ -47,10 +42,9 @@ extension NCShareExtension {
 
         if resultsReadFolder.error == .success {
             self.metadataFolder = resultsReadFolder.metadataFolder
-            await self.reloadDatasource(withLoadFolder: false)
+            await self.reloadData()
         } else {
             self.showAlert(description: resultsReadFolder.error.errorDescription)
-
         }
     }
 }

Share/NCShareExtension+NCAccountRequestDelegate.swift

@@ -57,7 +57,6 @@ extension NCShareExtension: NCAccountRequestDelegate {
 
             // COLORS
             NCBrandColor.shared.settingThemingColor(account: account)
-            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterChangeTheming, userInfo: ["account": account])
 
             // NETWORKING
             NextcloudKit.shared.setup(groupIdentifier: NCBrandOptions.shared.capabilitiesGroup, delegate: NCNetworking.shared)
@@ -78,8 +77,10 @@ extension NCShareExtension: NCAccountRequestDelegate {
 
             serverUrl = utilityFileSystem.getHomeServer(session: session)
 
-            await reloadDatasource(withLoadFolder: true)
             setNavigationBar(navigationTitle: NCBrandOptions.shared.brand)
+
+            await reloadData()
+            await loadFolder()
         }
     }
 }

Share/NCShareExtension.swift

@@ -178,7 +178,7 @@ class NCShareExtension: UIViewController {
                 while self.serverUrl.last != "/" { self.serverUrl.removeLast() }
                 self.serverUrl.removeLast()
                 Task {
-                    await self.reloadDatasource(withLoadFolder: true)
+                    await self.reloadData()
                 }
                 var navigationTitle = (self.serverUrl as NSString).lastPathComponent
                 if self.utilityFileSystem.getHomeServer(session: session) == self.serverUrl {
@@ -246,7 +246,7 @@ class NCShareExtension: UIViewController {
         let alertController = UIAlertController.createFolder(serverUrl: serverUrl, session: session) { error in
             if error == .success {
                 Task {
-                    await self.reloadDatasource(withLoadFolder: true)
+                    await self.loadFolder()
                 }
             } else {
                 self.showAlert(title: "_error_createsubfolders_upload_", description: error.errorDescription)

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -603,17 +603,13 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
             spinner.centerYAnchor.constraint(equalTo: container.centerYAnchor)
         ])
 
-        UIView.transition(with: navigationController!.navigationBar, duration: 0.25, options: .transitionCrossDissolve) {
-            self.navigationItem.titleView = container
-        }
+        self.navigationItem.titleView = container
     }
 
     @MainActor
     func restoreDefaultTitle() {
-        UIView.transition(with: navigationController!.navigationBar, duration: 0.25, options: .transitionCrossDissolve) {
-            self.navigationItem.titleView = nil
-            self.navigationItem.title = self.titleCurrentFolder
-        }
+        self.navigationItem.titleView = nil
+        self.navigationItem.title = self.titleCurrentFolder
     }
 
     // MARK: - SEARCH