android: remove local authentication error toasts, rename Retry -> Unlock (#1339)

apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt

@@ -14,7 +14,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Surface
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Replay
+import androidx.compose.material.icons.outlined.Lock
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
@@ -144,17 +144,10 @@ class MainActivity: FragmentActivity() {
         this@MainActivity,
         completed = { laResult ->
           when (laResult) {
-            LAResult.Success -> {
+            LAResult.Success ->
               userAuthorized.value = true
-            }
-            is LAResult.Error -> {
+            is LAResult.Error, LAResult.Failed ->
               laFailed.value = true
-              laErrorToast(applicationContext, laResult.errString)
-            }
-            LAResult.Failed -> {
-              laFailed.value = true
-              laFailedToast(applicationContext)
-            }
             LAResult.Unavailable -> {
               userAuthorized.value = true
               m.performLA.value = false
@@ -190,15 +183,9 @@ class MainActivity: FragmentActivity() {
             prefPerformLA.set(true)
             laTurnedOnAlert()
           }
-          is LAResult.Error -> {
+          is LAResult.Error, LAResult.Failed -> {
             m.performLA.value = false
             prefPerformLA.set(false)
-            laErrorToast(applicationContext, laResult.errString)
-          }
-          LAResult.Failed -> {
-            m.performLA.value = false
-            prefPerformLA.set(false)
-            laFailedToast(applicationContext)
           }
           LAResult.Unavailable -> {
             m.performLA.value = false
@@ -223,15 +210,9 @@ class MainActivity: FragmentActivity() {
             m.performLA.value = false
             prefPerformLA.set(false)
           }
-          is LAResult.Error -> {
+          is LAResult.Error, LAResult.Failed -> {
             m.performLA.value = true
             prefPerformLA.set(true)
-            laErrorToast(applicationContext, laResult.errString)
-          }
-          LAResult.Failed -> {
-            m.performLA.value = true
-            prefPerformLA.set(true)
-            laFailedToast(applicationContext)
           }
           LAResult.Unavailable -> {
             m.performLA.value = false
@@ -298,14 +279,14 @@ fun MainPage(
   }
 
   @Composable
-  fun retryAuthView() {
+  fun authView() {
     Box(
       Modifier.fillMaxSize(),
       contentAlignment = Alignment.Center
     ) {
       SimpleButton(
-        stringResource(R.string.auth_retry),
-        icon = Icons.Outlined.Replay,
+        stringResource(R.string.auth_unlock),
+        icon = Icons.Outlined.Lock,
         click = {
           laFailed.value = false
           runAuthenticate()
@@ -326,7 +307,7 @@ fun MainPage(
       onboarding == null || userCreated == null -> SplashView()
       !chatsAccessAuthorized -> {
         if (chatModel.controller.appPrefs.performLA.get() && laFailed.value) {
-          retryAuthView()
+          authView()
         } else {
           SplashView()
         }

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -1347,15 +1347,9 @@ open class ChatController(var ctrl: ChatCtrl?, val ntfManager: NtfManager, val a
                   appPrefs.performLA.set(true)
                   laTurnedOnAlert()
                 }
-                is LAResult.Error -> {
+                is LAResult.Error, LAResult.Failed -> {
                   chatModel.performLA.value = false
                   appPrefs.performLA.set(false)
-                  laErrorToast(appContext, laResult.errString)
-                }
-                LAResult.Failed -> {
-                  chatModel.performLA.value = false
-                  appPrefs.performLA.set(false)
-                  laFailedToast(appContext)
                 }
                 LAResult.Unavailable -> {
                   chatModel.performLA.value = false

apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt

@@ -89,18 +89,6 @@ fun laTurnedOnAlert() = AlertManager.shared.showAlertMsg(
   generalGetString(R.string.auth_you_will_be_required_to_authenticate_when_you_start_or_resume)
 )
 
-fun laErrorToast(context: Context, errString: CharSequence) = Toast.makeText(
-  context,
-  if (errString.isNotEmpty()) String.format(generalGetString(R.string.auth_error_w_desc), errString) else generalGetString(R.string.auth_error),
-  Toast.LENGTH_SHORT
-).show()
-
-fun laFailedToast(context: Context) = Toast.makeText(
-  context,
-  generalGetString(R.string.auth_failed),
-  Toast.LENGTH_SHORT
-).show()
-
 fun laUnavailableInstructionAlert() = AlertManager.shared.showAlertMsg(
   generalGetString(R.string.auth_unavailable),
   generalGetString(R.string.auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled)

apps/android/app/src/main/res/values-de/strings.xml

@@ -131,13 +131,9 @@
   <string name="auth_enable_simplex_lock">SimpleX Sperre aktivieren</string>
   <string name="auth_disable_simplex_lock">SimpleX Sperre deaktivieren</string>
   <string name="auth_confirm_credential">Bestätigen Sie Ihre Zugangsdaten</string>
-  <string name="auth_error">Authentifizierungsfehler</string>
-  <string name="auth_error_w_desc">Authentifizierungsfehler: <xliff:g id="desc">%1$s</xliff:g></string>
-  <string name="auth_failed">Authentifizierung fehlgeschlagen</string>
   <string name="auth_unavailable">Authentifizierung nicht verfügbar</string>
   <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Geräteauthentifizierung ist nicht aktiviert. Sie können die SimpleX Sperre über die Einstellungen aktivieren, sobald Sie die Geräteauthentifizierung aktiviert haben.</string>
   <string name="auth_device_authentication_is_disabled_turning_off">Geräteauthentifizierung ist deaktiviert. SimpleX Sperre ist abgeschaltet.</string>
-  <string name="auth_retry">Wiederholen</string>
   <string name="auth_stop_chat">Chat beenden</string>
   <string name="auth_open_chat_console">Chat-Konsole öffnen</string>
 

apps/android/app/src/main/res/values-ru/strings.xml

@@ -131,13 +131,9 @@
     <string name="auth_enable_simplex_lock">Включить блокировку SimpleX</string>
     <string name="auth_disable_simplex_lock">Отключить блокировку SimpleX</string>
     <string name="auth_confirm_credential">Пройдите аутентификацию</string>
-    <string name="auth_error">Ошибка аутентификации</string>
-    <string name="auth_error_w_desc">Ошибка аутентификации: <xliff:g id="desc">%1$s</xliff:g></string>
-    <string name="auth_failed">Ошибка аутентификации</string>
     <string name="auth_unavailable">Аутентификация недоступна</string>
     <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Аутентификация устройства не включена. Вы можете включить блокировку SimpleX в Настройках после включения аутентификации.</string>
     <string name="auth_device_authentication_is_disabled_turning_off">Аутентификация устройства выключена. Отключение блокировки SimpleX Chat.</string>
-    <string name="auth_retry">Повторить</string>
     <string name="auth_stop_chat">Остановить чат</string>
     <string name="auth_open_chat_console">Открыть консоль</string>
 

apps/android/app/src/main/res/values/strings.xml

@@ -131,13 +131,9 @@
   <string name="auth_enable_simplex_lock">Enable SimpleX Lock</string>
   <string name="auth_disable_simplex_lock">Disable SimpleX Lock</string>
   <string name="auth_confirm_credential">Confirm your credential</string>
-  <string name="auth_error">Authentication error</string>
-  <string name="auth_error_w_desc">Authentication error: <xliff:g id="desc">%1$s</xliff:g></string>
-  <string name="auth_failed">Authentication failed</string>
   <string name="auth_unavailable">Authentication unavailable</string>
   <string name="auth_device_authentication_is_not_enabled_you_can_turn_on_in_settings_once_enabled">Device authentication is not enabled. You can turn on SimpleX Lock via Settings, once you enable device authentication.</string>
   <string name="auth_device_authentication_is_disabled_turning_off">Device authentication is disabled. Turning off SimpleX Lock.</string>
-  <string name="auth_retry">Retry</string>
   <string name="auth_stop_chat">Stop chat</string>
   <string name="auth_open_chat_console">Open chat console</string>