Version 6.1.6 (#3185)

marinofaggiana · web-flow · commit 84f792276640 · 2024-11-12T09:59:43.000+01:00
diff --git a/Brand/Intro/NCIntroViewController.swift b/Brand/Intro/NCIntroViewController.swift
@@ -110,8 +110,14 @@ class NCIntroViewController: UIViewController, UICollectionViewDataSource, UICol
                         controller.account = account
                         controller.modalPresentationStyle = .fullScreen
                         controller.view.alpha = 0
+
                         window?.rootViewController = controller
                         window?.makeKeyAndVisible()
+
+                        if let scene = window?.windowScene {
+                            SceneManager.shared.register(scene: scene, withRootViewController: controller)
+                        }
+
                         UIView.animate(withDuration: 0.5) {
                             controller.view.alpha = 1
                         }
diff --git a/File Provider Extension/FileProviderEnumerator.swift b/File Provider Extension/FileProviderEnumerator.swift
@@ -40,7 +40,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
             serverUrl = NCUtilityFileSystem().getHomeServer(session: fileProviderData.shared.session)
         } else {
             if let metadata = providerUtility.getTableMetadataFromItemIdentifier(enumeratedItemIdentifier),
-               let directorySource = self.database.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND NOT (status IN %@)", metadata.account, metadata.serverUrl, NCGlobal.shared.metadataStatusHideInFileExtension)) {
+               let directorySource = self.database.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {
                 serverUrl = directorySource.serverUrl + "/" + metadata.fileName
 
             }
@@ -158,7 +158,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {
     }
 
     func fetchItemsForPage(serverUrl: String, pageNumber: Int, completionHandler: @escaping (_ metadatas: Results<tableMetadata>?) -> Void) {
-        let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND NOT (status IN %@)", fileProviderData.shared.session.account, serverUrl, NCGlobal.shared.metadataStatusHideInFileExtension)
+        let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@", fileProviderData.shared.session.account, serverUrl)
 
         if pageNumber == 1 {
             NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: NCKeychain().showHiddenFiles, account: fileProviderData.shared.session.account) { _, files, _, error in
diff --git a/Nextcloud.xcodeproj/project.pbxproj b/Nextcloud.xcodeproj/project.pbxproj
@@ -5501,7 +5501,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 6.1.5;
+				MARKETING_VERSION = 6.1.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
@@ -5564,7 +5564,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 6.1.5;
+				MARKETING_VERSION = 6.1.6;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift
@@ -308,7 +308,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 
     // MARK: - Login
 
-    func openLogin(selector: Int) {
+    func openLogin(selector: Int, window: UIWindow? = nil) {
         UIApplication.shared.allSceneSessionDestructionExceptFirst()
 
         func showLoginViewController(_ viewController: UIViewController?) {
@@ -329,6 +329,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 } else {
                     controller.present(navigationController, animated: true)
                 }
+            } else {
+                window?.rootViewController = navigationController
+                window?.makeKeyAndVisible()
             }
         }
 
diff --git a/iOSClient/Login/NCLogin.swift b/iOSClient/Login/NCLogin.swift
@@ -428,8 +428,14 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
                         controller.account = account
                         controller.modalPresentationStyle = .fullScreen
                         controller.view.alpha = 0
+
                         window?.rootViewController = controller
                         window?.makeKeyAndVisible()
+
+                        if let scene = window?.windowScene {
+                            SceneManager.shared.register(scene: scene, withRootViewController: controller)
+                        }
+
                         UIView.animate(withDuration: 0.5) {
                             controller.view.alpha = 1
                         }
diff --git a/iOSClient/Login/NCLoginPoll.swift b/iOSClient/Login/NCLoginPoll.swift
@@ -75,8 +75,14 @@ struct NCLoginPoll: View {
                         controller.account = loginManager.account
                         controller.modalPresentationStyle = .fullScreen
                         controller.view.alpha = 0
+
                         window?.rootViewController = controller
                         window?.makeKeyAndVisible()
+
+                        if let scene = window?.windowScene {
+                            SceneManager.shared.register(scene: scene, withRootViewController: controller)
+                        }
+
                         UIView.animate(withDuration: 0.5) {
                             controller.view.alpha = 1
                         }
diff --git a/iOSClient/Login/NCLoginProvider.swift b/iOSClient/Login/NCLoginProvider.swift
@@ -181,8 +181,14 @@ extension NCLoginProvider: WKNavigationDelegate {
                         controller.account = account
                         controller.modalPresentationStyle = .fullScreen
                         controller.view.alpha = 0
+
                         window?.rootViewController = controller
                         window?.makeKeyAndVisible()
+
+                        if let scene = window?.windowScene {
+                            SceneManager.shared.register(scene: scene, withRootViewController: controller)
+                        }
+
                         UIView.animate(withDuration: 0.5) {
                             controller.view.alpha = 1
                         }
diff --git a/iOSClient/SceneDelegate.swift b/iOSClient/SceneDelegate.swift
@@ -71,7 +71,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                 UserDefaults.standard.removePersistentDomain(forName: bundleID)
             }
             if NCBrandOptions.shared.disable_intro {
-                appDelegate.openLogin(selector: NCGlobal.shared.introLogin)
+                appDelegate.openLogin(selector: NCGlobal.shared.introLogin, window: window)
             } else {
                 if let viewController = UIStoryboard(name: "NCIntro", bundle: nil).instantiateInitialViewController() as? NCIntroViewController {
                     let navigationController = NCLoginNavigationController(rootViewController: viewController)
diff --git a/iOSClient/Supporting Files/it.lproj/Localizable.strings b/iOSClient/Supporting Files/it.lproj/Localizable.strings
diff --git a/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings b/iOSClient/Supporting Files/zh-Hans.lproj/Localizable.strings

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {`
`40`	`40`	`serverUrl = NCUtilityFileSystem().getHomeServer(session: fileProviderData.shared.session)`
`41`	`41`	`} else {`
`42`	`42`	`if let metadata = providerUtility.getTableMetadataFromItemIdentifier(enumeratedItemIdentifier),`
`43`		`- let directorySource = self.database.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND NOT (status IN %@)", metadata.account, metadata.serverUrl, NCGlobal.shared.metadataStatusHideInFileExtension)) {`
	`43`	`+ let directorySource = self.database.getTableDirectory(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@", metadata.account, metadata.serverUrl)) {`
`44`	`44`	`serverUrl = directorySource.serverUrl + "/" + metadata.fileName`
`45`	`45`
`46`	`46`	`}`
`@@ -158,7 +158,7 @@ class FileProviderEnumerator: NSObject, NSFileProviderEnumerator {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`func fetchItemsForPage(serverUrl: String, pageNumber: Int, completionHandler: @escaping (_ metadatas: Results<tableMetadata>?) -> Void) {`
`161`		`- let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@ AND NOT (status IN %@)", fileProviderData.shared.session.account, serverUrl, NCGlobal.shared.metadataStatusHideInFileExtension)`
	`161`	`+ let predicate = NSPredicate(format: "account == %@ AND serverUrl == %@", fileProviderData.shared.session.account, serverUrl)`
`162`	`162`
`163`	`163`	`if pageNumber == 1 {`
`164`	`164`	`NextcloudKit.shared.readFileOrFolder(serverUrlFileName: serverUrl, depth: "1", showHiddenFiles: NCKeychain().showHiddenFiles, account: fileProviderData.shared.session.account) { _, files, _, error in`
Original file line number	Diff line number	Diff line change
`@@ -308,7 +308,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD`
`308`	`308`
`309`	`309`	`// MARK: - Login`
`310`	`310`
`311`		`- func openLogin(selector: Int) {`
	`311`	`+ func openLogin(selector: Int, window: UIWindow? = nil) {`
`312`	`312`	`UIApplication.shared.allSceneSessionDestructionExceptFirst()`
`313`	`313`
`314`	`314`	`func showLoginViewController(_ viewController: UIViewController?) {`
`@@ -329,6 +329,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD`
`329`	`329`	`} else {`
`330`	`330`	`controller.present(navigationController, animated: true)`
`331`	`331`	`}`
	`332`	`+ } else {`
	`333`	`+ window?.rootViewController = navigationController`
	`334`	`+ window?.makeKeyAndVisible()`
`332`	`335`	`}`
`333`	`336`	`}`
`334`	`337`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {`
`71`	`71`	`UserDefaults.standard.removePersistentDomain(forName: bundleID)`
`72`	`72`	`}`
`73`	`73`	`if NCBrandOptions.shared.disable_intro {`
`74`		`- appDelegate.openLogin(selector: NCGlobal.shared.introLogin)`
	`74`	`+ appDelegate.openLogin(selector: NCGlobal.shared.introLogin, window: window)`
`75`	`75`	`} else {`
`76`	`76`	`if let viewController = UIStoryboard(name: "NCIntro", bundle: nil).instantiateInitialViewController() as? NCIntroViewController {`
`77`	`77`	`let navigationController = NCLoginNavigationController(rootViewController: viewController)`