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

recovery password input error handling

Browse Source
pull/891/head
ryanzhao 2 years ago
parent d0771cb4b7
commit cd7c78fc7b
23 changed files with 92 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/es.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/id-ID.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/pt_BR.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/si.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/sv.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

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

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/vi-VN.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/zh-Hant.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

3
Session/Meta/Translations/zh_CN.lproj/Localizable.strings
Unescape Escape View File

@ -681,3 +681,6 @@
"onboarding_load_account_title" = "Load Account";
"onboarding_load_account_waiting" = "One moment please..";
"onboarding_loading_account" = "Loading your account";
"recovery_password_error_length" = "The Recovery Password you entered is not long enough. Please check and try again.";
"recovery_password_error_invalid" = "Some of the words in your Recovery Password are incorrect. Please check and try again.";
"recovery_password_error_generic" = "Please check your Recovery Password and try again.";

35
Session/Onboarding/LoadAccountView.swift
Unescape Escape View File

@ -10,7 +10,7 @@ struct LoadAccountView: View {
@State var tabIndex = 0
@State private var recoveryPassword: String = ""
@State private var error: String? = nil
@State private var errorString: String? = nil
var body: some View {
NavigationView {
@ -29,8 +29,8 @@ struct LoadAccountView: View {
if tabIndex == 0 {
EnterRecoveryPasswordView(
$recoveryPassword,
error: $error,
continueWithSeed: continueWithSeed
error: $errorString,
continueWithMnemonic: continueWithMnemonic
)
}
else {
@ -41,9 +41,26 @@ struct LoadAccountView: View {
}
}
func continueWithSeed() {
func continueWithMnemonic() {
let mnemonic = recoveryPassword.lowercased()
guard let hexEncodedSeed = try? Mnemonic.decode(mnemonic: mnemonic) else { return }
let hexEncodedSeed: String
do {
hexEncodedSeed = try Mnemonic.decode(mnemonic: mnemonic)
} catch {
if let decodingError = error as? Mnemonic.DecodingError {
switch decodingError {
case .inputTooShort:
errorString = "recovery_password_error_length".localized()
case .invalidWord:
errorString = "recovery_password_error_invalid".localized()
default:
errorString = "recovery_password_error_generic".localized()
}
} else {
errorString = "recovery_password_error_generic".localized()
}
return
}
let seed = Data(hex: hexEncodedSeed)
if (seed.count != 16) {
//TODO: show error
@ -134,16 +151,16 @@ struct EnterRecoveryPasswordView: View{
@Binding var recoveryPassword: String
@Binding var error: String?
var continueWithSeed: (() -> Void)?
var continueWithMnemonic: (() -> Void)?
init(
_ recoveryPassword: Binding<String>,
error: Binding<String?>,
continueWithSeed: (() -> Void)?
continueWithMnemonic: (() -> Void)?
) {
self._recoveryPassword = recoveryPassword
self._error = error
self.continueWithSeed = continueWithSeed
self.continueWithMnemonic = continueWithMnemonic
}
var body: some View{
@ -179,7 +196,7 @@ struct EnterRecoveryPasswordView: View{
Spacer()
Button {
continueWithSeed?()
continueWithMnemonic?()
} label: {
Text("continue_2".localized())
.bold()

Write Preview
Loading…
Cancel
Save