keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix toast error message for scanning recovery password qrcode

Browse Source
pull/891/head
Ryan ZHAO 11 months ago
parent c342deb94e
commit 2301c75c08
46 changed files with 69 additions and 18 deletions
Show Stats Download Patch File Download Diff File

1
Session/Meta/Translations/ar.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/be.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/bg.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/bn.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/cs.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/da.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/de.lproj/Localizable.strings
Unescape Escape View File

@ -1100,6 +1100,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/el.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/eo.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/es-ES.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/fa.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/fi.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/fil.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/fr.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/hi.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/hr.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/hu.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/id.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/it.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ja.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ko.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ku.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/lt.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/lv.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ne-NP.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/nl.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/no.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/pl.lproj/Localizable.strings
Unescape Escape View File

@ -1100,6 +1100,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/pt-BR.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/pt-PT.lproj/Localizable.strings
Unescape Escape View File

@ -1105,6 +1105,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ro.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/ru.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/si-LK.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/sk.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/sl.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/sv-SE.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/th.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/tr.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/uk.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/vi.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/zh-CN.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

1
Session/Meta/Translations/zh-TW.lproj/Localizable.strings
Unescape Escape View File

@ -1099,6 +1099,7 @@ The point that a message will disappear in a disappearing message update message
"qrView" = "View QR";
"recoveryPasswordView" = "View Password";
"yes" = "Yes";
"qrNotRecoveryPassword" = "This QR code does not contain a Recovery Password";
//Settings
"view" = "View";

17
Session/Onboarding/LoadAccountScreen.swift
Unescape Escape View File

@ -50,9 +50,9 @@ struct LoadAccountScreen: View {
}
}
private func continueWithSeed(seed: Data, onError: (() -> ())?) {
private func continueWithSeed(seed: Data, from source: Onboarding.SeedSource, onError: (() -> ())?) {
if (seed.count != 16) {
errorString = "recoveryPasswordErrorMessageGeneric".localized()
errorString = source.genericErrorMessage
DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
onError?()
}
@ -75,7 +75,7 @@ struct LoadAccountScreen: View {
func continueWithhexEncodedSeed(onError: (() -> ())?) {
let seed = Data(hex: hexEncodedSeed)
continueWithSeed(seed: seed, onError: onError)
continueWithSeed(seed: seed, from: .qrCode, onError: onError)
}
func continueWithMnemonic() {
@ -85,21 +85,14 @@ struct LoadAccountScreen: View {
hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic)
} catch {
if let decodingError = error as? Mnemonic.DecodingError {
switch decodingError {
case .inputTooShort:
errorString = "recoveryPasswordErrorMessageShort".localized()
case .invalidWord:
errorString = "recoveryPasswordErrorMessageIncorrect".localized()
default:
errorString = "recoveryPasswordErrorMessageGeneric".localized()
}
errorString = decodingError.errorDescription
} else {
errorString = "recoveryPasswordErrorMessageGeneric".localized()
}
return
}
let seed = Data(hex: hexEncodedSeed)
continueWithSeed(seed: seed, onError: nil)
continueWithSeed(seed: seed, from: .mnemonic, onError: nil)
}
}

14
Session/Onboarding/Onboarding.swift
Unescape Escape View File

@ -58,6 +58,20 @@ enum Onboarding {
.eraseToAnyPublisher()
}
enum SeedSource {
case qrCode
case mnemonic
var genericErrorMessage: String {
switch self {
case .qrCode:
"qrNotRecoveryPassword".localized()
case .mnemonic:
"recoveryPasswordErrorMessageGeneric".localized()
}
}
}
enum State: CustomStringConvertible {
case newUser
case missingName

13
SessionUtilitiesKit/Crypto/Mnemonic.swift
Unescape Escape View File

@ -68,13 +68,14 @@ public enum Mnemonic {
public enum DecodingError : LocalizedError {
case generic, inputTooShort, missingLastWord, invalidWord, verificationFailed
public var errorDescription: String? {
public var errorDescription: String {
switch self {
case .generic: return "RECOVERY_PHASE_ERROR_GENERIC".localized()
case .inputTooShort: return "RECOVERY_PHASE_ERROR_LENGTH".localized()
case .missingLastWord: return "RECOVERY_PHASE_ERROR_LAST_WORD".localized()
case .invalidWord: return "RECOVERY_PHASE_ERROR_INVALID_WORD".localized()
case .verificationFailed: return "RECOVERY_PHASE_ERROR_FAILED".localized()
case .inputTooShort:
return "recoveryPasswordErrorMessageShort".localized()
case .invalidWord:
return "recoveryPasswordErrorMessageIncorrect".localized()
default:
return "recoveryPasswordErrorMessageGeneric".localized()
}
}
}

Write Preview
Loading…
Cancel
Save