diff --git a/iOSClient/AppDelegate.swift b/iOSClient/AppDelegate.swift index 9b55094910..5d1afabd3d 100644 --- a/iOSClient/AppDelegate.swift +++ b/iOSClient/AppDelegate.swift @@ -360,22 +360,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - // [WEBPersonalized] [AppConfig] - if NCBrandOptions.shared.use_AppConfig { - if activeLogin?.view.window == nil { - urlBase = NCBrandOptions.shared.loginBaseUrl - NextcloudKit.shared.getLoginFlowV2(serverUrl: urlBase) { token, endpoint, login, _, error in - // Login Flow V2 - if error == .success, let token, let endpoint, let login { - let vc = UIHostingController(rootView: NCLoginPoll(loginFlowV2Token: token, loginFlowV2Endpoint: endpoint, loginFlowV2Login: login, cancelButtonDisabled: NCManageDatabase.shared.getAccounts().isEmptyOrNil)) - UIApplication.shared.firstWindow?.rootViewController?.present(vc, animated: true) - } - } - - return - } - } - // Nextcloud standard login if selector == NCGlobal.shared.introSignup { if activeLogin?.view.window == nil { @@ -391,7 +375,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD } } - } else if NCBrandOptions.shared.disable_intro && NCBrandOptions.shared.disable_request_login_url { + } 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 diff --git a/iOSClient/Images.xcassets/qrcode.imageset/Contents.json b/iOSClient/Images.xcassets/qrcode.imageset/Contents.json deleted file mode 100644 index 3d370c566d..0000000000 --- a/iOSClient/Images.xcassets/qrcode.imageset/Contents.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "images" : [ - { - "filename" : "qrcode.pdf", - "idiom" : "universal" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - }, - "properties" : { - "preserves-vector-representation" : true - } -} diff --git a/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf b/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf deleted file mode 100644 index d2c7194a64..0000000000 Binary files a/iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf and /dev/null differ diff --git a/iOSClient/Login/NCLogin.swift b/iOSClient/Login/NCLogin.swift index 22a445ab24..5f7b45f28e 100644 --- a/iOSClient/Login/NCLogin.swift +++ b/iOSClient/Login/NCLogin.swift @@ -107,11 +107,13 @@ class NCLogin: UIViewController, UITextFieldDelegate, NCLoginQRCodeDelegate { // brand if NCBrandOptions.shared.disable_request_login_url { baseUrl.text = NCBrandOptions.shared.loginBaseUrl - baseUrl.isHidden = true + baseUrl.isEnabled = false + baseUrl.isUserInteractionEnabled = false + baseUrl.alpha = 0.5 } // qrcode - qrCode.setImage(UIImage(named: "qrcode")?.image(color: textColor, size: 100), for: .normal) + qrCode.setImage(UIImage(systemName: "qrcode.viewfinder")?.image(color: textColor, size: 100), for: .normal) // certificate certificate.setImage(UIImage(named: "certificate")?.image(color: textColor, size: 100), for: .normal)