Skip to content
Snippets Groups Projects
Commit 3c5dd573 authored by jakobsbode's avatar jakobsbode
Browse files

do not present connectionDetails, if the first time credentials failed in Onboarding.

parent 67adb6a2
No related branches found
No related tags found
No related merge requests found
......@@ -44,7 +44,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
func credentialsFailed(){
self.window?.rootViewController = Onboarding.detailOnboarding(self.credentialCheck)
Onboarding.credentialFails += 1
if Onboarding.credentialFails >= 3 {
self.window?.rootViewController = Onboarding.detailOnboarding(self.credentialCheck)
}
else {
let contr = (Onboarding.onboarding(self.credentialCheck) as! OnboardingViewController)
self.window?.rootViewController = contr
contr.gotoLastPage()
}
}
func credentialsWork() {
......
......@@ -45,6 +45,8 @@ class Onboarding: NSObject {
static var fail: () -> () = { Void in }
static var work: () -> () = { Void in }
static var credentialFails = 0
static var authenticationRows: [Int: String] = [MCOAuthType.saslLogin.rawValue: "Login", MCOAuthType.saslPlain.rawValue: NSLocalizedString("NormalPassword", comment: ""), MCOAuthType.SASLSRP.rawValue: "SRP", MCOAuthType.SASLCRAMMD5.rawValue: "CRAMMD5", MCOAuthType.SASLDIGESTMD5.rawValue: "DIGESTMD5", MCOAuthType.SASLNTLM.rawValue: "NTLM", MCOAuthType.SASLGSSAPI.rawValue: "GSSAPI", MCOAuthType.saslKerberosV4.rawValue: "KerberosV4"]
static var transportRows: [Int: String] = [MCOConnectionType.clear.rawValue: NSLocalizedString("Plaintext", comment: ""), MCOConnectionType.startTLS.rawValue: "StartTLS", MCOConnectionType.TLS.rawValue: "TLS"]
......@@ -151,8 +153,15 @@ class Onboarding: NSObject {
credentials.addSubview(password)
credentials.addSubview(passwordUnderline)
let page3 = OnboardingContentViewController.content(withTitle: nil, body: NSLocalizedString("InsertMailAddressAndPassword", comment: ""), videoURL: nil, inputView: credentials, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
var bodyText = NSLocalizedString("InsertMailAddressAndPassword", comment: "")
if self.credentialFails > 0 {
bodyText = NSLocalizedString("WrongMailAddressOrPassword", comment: "")
}
let page3 = OnboardingContentViewController.content(withTitle: nil, body: bodyText, videoURL: nil, inputView: credentials, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
page3.topPadding = 0
if self.credentialFails > 0 {
page3.bodyLabel.textColor = UIColor.orange
}
//page3.onlyInputView = true
//let page4 = OnboardingContentViewController.content(withTitle: NSLocalizedString("EverythingCorrect", comment: ""), body: nil, videoURL: nil, inputView: nil, buttonText: NSLocalizedString("next", comment: ""), actionBlock: callback)
......@@ -163,7 +172,7 @@ class Onboarding: NSObject {
//vc?.backgroundImage = postcardBg
vc?.shouldFadeTransitions = true
//vc?.shouldMaskBackground = false
let duration = 0.5
intro2.viewWillAppearBlock = {
......@@ -201,6 +210,10 @@ class Onboarding: NSObject {
})
}
if self.credentialFails > 0 {
//vc!.pageControl.currentPage = (vc?.pageControl.numberOfPages)!-1
}
return vc!
}
......@@ -609,6 +622,7 @@ class Onboarding: NSObject {
}
static func keyHandling() {
self.credentialFails = 0
for encType in iterateEnum(EncryptionType.self) {
if let enc = EnzevalosEncryptionHandler.getEncryption(encType) {
enc.removeAllKeys()
......
......@@ -99,6 +99,7 @@
"TwoDaysAgo" = "Vorgestern";
"Username" = "Nutzername";
"WhatAShame" = "Schade!";
"WrongMailAddressOrPassword" = "Die E-Mail-Adresse oder das Passwort waren falsch. Bitte probiere es erneut!";
"write" = "verfassen";
"Yesterday" = "Gestern";
"NoFurtherMessages" = "Keine weiteren Nachrichten...";
......
......@@ -98,6 +98,7 @@
"TwoDaysAgo" = "2 days ago";
"Username" = "Username";
"WhatAShame" = "What a shame!";
"WrongMailAddressOrPassword" = "Email address or password were wrong. Please try again!";
"write" = "write";
"Yesterday" = "yesterday";
"NoFurtherMessages" = "No further messages...";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment