Skip to content

Fix black screen when use_AppConfig and disable_intro are true #2993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Fix black screen when use_AppConfig and disable_intro are true #2993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions iOSClient/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
15 changes: 0 additions & 15 deletions iOSClient/Images.xcassets/qrcode.imageset/Contents.json
View file
Open in desktop

This file was deleted.

Binary file removed iOSClient/Images.xcassets/qrcode.imageset/qrcode.pdf
View file
Open in desktop
Binary file not shown.
6 changes: 4 additions & 2 deletions iOSClient/Login/NCLogin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down