Version 5.5.4 (#3026)

Nextcloud.xcodeproj/project.pbxproj

@@ -5441,7 +5441,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.3;
+				MARKETING_VERSION = 5.5.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
@@ -5504,7 +5504,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.3;
+				MARKETING_VERSION = 5.5.4;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-v";
 				OTHER_LDFLAGS = "";
@@ -5779,7 +5779,7 @@
 			repositoryURL = "https://github.com/nextcloud/NextcloudKit";
 			requirement = {
 				kind = exactVersion;
-				version = 4.0.4;
+				version = 4.0.6;
 			};
 		};
 		F788ECC5263AAAF900ADC67F /* XCRemoteSwiftPackageReference "MarkdownKit" */ = {

iOSClient/AppDelegate.swift

@@ -356,7 +356,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                 window.makeKeyAndVisible()
             } else {
                 UIApplication.shared.allSceneSessionDestructionExceptFirst()
-                UIApplication.shared.firstWindow?.rootViewController?.present(navigationController, animated: true)
+
+                if let rootVC = UIApplication.shared.firstWindow?.rootViewController {
+                    if let presentedVC = rootVC.presentedViewController, !(presentedVC is NCLoginNavigationController) {
+                        presentedVC.dismiss(animated: false) {
+                            rootVC.present(navigationController, animated: true)
+                        }
+                    } else {
+                        rootVC.present(navigationController, animated: true)
+                    }
+                }
             }
         }
 
@@ -374,27 +383,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                     showLoginViewController(activeLogin)
                 }
             }
-
-        } else if NCBrandOptions.shared.disable_request_login_url {
-            if activeLogin?.view.window == nil {
-                activeLogin = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLogin") as? NCLogin
-                activeLogin?.urlBase = NCBrandOptions.shared.loginBaseUrl
-                showLoginViewController(activeLogin)
-            }
-        } else if openLoginWeb {
-            // Used also for reinsert the account (change passwd)
-            if activeLogin?.view.window == nil {
-                activeLogin = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLogin") as? NCLogin
-                activeLogin?.urlBase = urlBase
-                activeLogin?.disableUrlField = true
-                activeLogin?.disableCloseButton = true
-                showLoginViewController(activeLogin)
-            }
         } else {
             if activeLogin?.view.window == nil {
-                activeLogin?.disableCloseButton = true
-
                 activeLogin = UIStoryboard(name: "NCLogin", bundle: nil).instantiateViewController(withIdentifier: "NCLogin") as? NCLogin
+                activeLogin?.urlBase = NCBrandOptions.shared.disable_request_login_url ? NCBrandOptions.shared.loginBaseUrl : ""
                 showLoginViewController(activeLogin)
             }
         }
@@ -411,7 +403,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         guard !self.timerErrorNetworkingDisabled,
               !account.isEmpty,
               NCKeychain().getPassword(account: account).isEmpty else { return }
-        openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: true)
+
+        let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""))
+        let error = NKError(errorCode: NCKeychain().getPassword(account: account).isEmpty ? NCGlobal.shared.errorUnauthorized997 : NCGlobal.shared.errorInternalServerError, errorDescription: description)
+        NCContentPresenter().showError(error: error, priority: .max)
+
+        deleteAccount(account)
+
+        let accounts = NCManageDatabase.shared.getAccounts()
+
+        if accounts?.count ?? 0 > 0, let newAccount = accounts?.first {
+            changeAccount(newAccount, userProfile: nil) { }
+        } else {
+            openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
+        }
     }
 
     func trustCertificateError(host: String) {
@@ -545,12 +550,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
         self.user = ""
         self.userId = ""
         self.password = ""
-
-        /*
-        NextcloudKit.shared.deleteAppPassword(serverUrl: urlBase, username: userId, password: password) { _, error in
-            print(error)
-        }
-        */
     }
 
     func deleteAllAccounts() {

iOSClient/Login/NCLogin.swift

@@ -51,8 +51,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
 
     /// The URL that will show up on the URL field when this screen appears
     var urlBase = ""
-    var disableUrlField = false
-    var disableCloseButton = false
 
     // Used for MDM
     var configServerUrl: String?
@@ -95,7 +93,8 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         baseUrl.rightViewMode = .always
         baseUrl.attributedPlaceholder = NSAttributedString(string: NSLocalizedString("_login_url_", comment: ""), attributes: [NSAttributedString.Key.foregroundColor: textColor.withAlphaComponent(0.5)])
         baseUrl.delegate = self
-        baseUrl.isEnabled = !disableUrlField
+
+        baseUrl.isEnabled = !NCBrandOptions.shared.disable_request_login_url
 
         // Login button
         loginAddressDetail.textColor = textColor
@@ -106,7 +105,6 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
 
         // brand
         if NCBrandOptions.shared.disable_request_login_url {
-            baseUrl.text = NCBrandOptions.shared.loginBaseUrl
             baseUrl.isEnabled = false
             baseUrl.isUserInteractionEnabled = false
             baseUrl.alpha = 0.5
@@ -131,7 +129,7 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate {
         self.navigationController?.view.backgroundColor = NCBrandColor.shared.customer
         self.navigationController?.navigationBar.tintColor = textColor
 
-        if !NCManageDatabase.shared.getAllAccount().isEmpty && !disableCloseButton {
+        if !NCManageDatabase.shared.getAllAccount().isEmpty {
             let navigationItemCancel = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(self.actionCancel))
             navigationItemCancel.tintColor = textColor
             navigationItem.leftBarButtonItem = navigationItemCancel

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -776,7 +776,7 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
                 }
             ])
 
-            let viewStyleSubmenu = UIMenu(title: "", options: .displayInline, children: [list, grid, UIMenu(title: NSLocalizedString("_photo_", comment: ""), children: [menuPhoto, menuZoom])])
+            let viewStyleSubmenu = UIMenu(title: "", options: .displayInline, children: [list, grid, UIMenu(title: NSLocalizedString("_additional_view_options_", comment: ""), children: [menuPhoto, menuZoom])])
 
             let ascending = layoutForView.ascending
             let ascendingChevronImage = utility.loadImage(named: ascending ? "chevron.up" : "chevron.down")

iOSClient/Networking/NCNetworkingCheckRemoteUser.swift

@@ -33,37 +33,29 @@ class NCNetworkingCheckRemoteUser {
 
         NCNetworking.shared.cancelAllTask()
 
-        if NCGlobal.shared.capabilityServerVersionMajor >= NCGlobal.shared.nextcloudVersion17 {
-            NextcloudKit.shared.getRemoteWipeStatus(serverUrl: tableAccount.urlBase, token: token, account: tableAccount.account) { account, wipe, _, error in
-                if wipe {
-                    appDelegate.deleteAccount(account)
-                    let error = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_wipe_account_")
-                    NCContentPresenter().messageNotification(tableAccount.user, error: error, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
-                    NextcloudKit.shared.setRemoteWipeCompletition(serverUrl: tableAccount.urlBase, token: token, account: tableAccount.account) { _, _ in print("wipe") }
-                    let accounts = NCManageDatabase.shared.getAccounts()
-                    if accounts?.count ?? 0 > 0 {
-                        if let newAccount = accounts?.first {
-                            appDelegate.changeAccount(newAccount, userProfile: nil) { }
-                        } else {
-                            appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
-                        }
-                    }
-                } else {
-                    if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() {
-                        let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
-                        let error = NKError(errorCode: error.errorCode, errorDescription: description)
-                        NCContentPresenter().showError(error: error, priority: .max)
-                        NCKeychain().setPassword(account: account, password: nil)
-                        NextcloudKit.shared.nkCommonInstance.writeLog("[INFO] Password removed.")
-                    }
-                }
+        NextcloudKit.shared.getRemoteWipeStatus(serverUrl: tableAccount.urlBase, token: token, account: tableAccount.account) { account, wipe, _, error in
+            var finalError: NKError?
+
+            if wipe {
+                appDelegate.deleteAccount(account) // delete account, don't delete database
+                finalError = NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_wipe_account_")
+            } else if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() {
+                appDelegate.deleteAccount(account) // delete account, delete database
+                finalError = NKError(errorCode: error.errorCode, errorDescription: "_error_check_remote_user_")
+            }
+
+            if let finalError {
+                NCContentPresenter().messageNotification(tableAccount.user, error: finalError, delay: NCGlobal.shared.dismissAfterSecondLong, type: NCContentPresenter.messageType.error, priority: .max)
             }
-        } else {
-            if UIApplication.shared.applicationState == .active && NextcloudKit.shared.isNetworkReachable() {
-                let description = String.localizedStringWithFormat(NSLocalizedString("_error_check_remote_user_", comment: ""), tableAccount.user, tableAccount.urlBase)
-                let error = NKError(errorCode: error.errorCode, errorDescription: description)
-                NCContentPresenter().showError(error: error, priority: .max)
-                NCKeychain().setPassword(account: account, password: nil)
+
+            NextcloudKit.shared.setRemoteWipeCompletition(serverUrl: tableAccount.urlBase, token: token, account: tableAccount.account) { _, _ in print("wipe") }
+
+            let accounts = NCManageDatabase.shared.getAccounts()
+
+            if accounts?.count ?? 0 > 0, let newAccount = accounts?.first {
+                appDelegate.changeAccount(newAccount, userProfile: nil) { }
+            } else {
+                appDelegate.openLogin(selector: NCGlobal.shared.introLogin, openLoginWeb: false)
             }
         }
     }

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -91,6 +91,7 @@
 "_photo_"                   = "Photo";
 "_audio_"                   = "Audio";
 "_unknown_"                 = "Unknown";
+"_additional_view_options_" = "Additional view options";
 "_next_"                    = "Next";
 "_success_"                 = "Success";
 "_initialization_"          = "Initialization";
@@ -123,7 +124,7 @@
 "_dark_mode_"               = "Dark mode";
 "_dark_mode_detect_"        = "Detect iOS dark mode";
 "_screen_"                  = "Screen";
-"_wipe_account_"            = "Account wiped from server";
+"_wipe_account_"            = "Account is wiped from server";
 "_appconfig_view_title_"    = "Account configuration in progress …";
 "_no_permission_add_file_"  = "You don't have permission to add files";
 "_no_permission_delete_file_" = "You don't have permission to delete files";
@@ -828,7 +829,7 @@
 "_no_nextcloud_found_"                  = "Server not found";
 "_error_decompressing_"                 = "Error during decompressing. Unknown compression method or the file is corrupt";
 "_error_json_decoding_"                 = "Serious internal error in decoding metadata (The data couldn't be read because it isn't in the correct format.)";
-"_error_check_remote_user_"             = "Server responded with error, password re-entry is required";
+"_error_check_remote_user_"             = "Server responded with an error. Please log in again";
 "_request_entity_too_large_"            = "The file is too large";
 "_not_possible_download_"               = "It is not possible to download the file";
 "_not_possible_upload_"                 = "It is not possible to upload the file";
@@ -982,7 +983,7 @@
 "_selected_photo_"          = "selected photo";
 "_selected_photos_"         = "selected photos";
 "_delete_selected_photos_"  = "Delete selected photos";
-"_media_square_"            = "Square photo grid";
+"_media_square_"            = "Square grid";
 "_media_ratio_"             = "Aspect ratio grid";
 "_autoupload_notice_"       = "To ensure the proper functioning of the application, it is necessary to enable Background App Refresh. Otherwise, new photos or videos will not be detected when the application is in the background.\n\nAdditionally, please note that the application will not be able to detect new photos and videos if it is manually terminated. When the app is in the background, data transfer may be slower, and new photos and/or videos will generally be detected every 10 minutes, depending on the device’s battery level.\n\nTo verify that the app is functioning correctly, you can use the log file available in Advanced.";
 "_display_"                 = "Display";