Merge pull request #1761 from SatoshiPortal/moar-fixes

Update to latest Flutter Secure Storage

Author: i5hi

lib/core/storage/storage_locator.dart

@@ -19,8 +19,11 @@ import 'package:get_it/get_it.dart';
 class StorageLocator {
   static Future<void> registerDatasources(GetIt locator) async {
     const secureStorage = FlutterSecureStorage(
-      aOptions: AndroidOptions(encryptedSharedPreferences: true),
-      // iOptions: IOSOptions(accessibility: KeychainAccessibility.first_unlock),
+      aOptions: AndroidOptions(),
+      iOptions: IOSOptions(
+        accessibility: KeychainAccessibility.first_unlock_this_device,
+        // This will ensure that secure storage can be used by background tasks while the phone is locked.
+      ),
     );
     locator.registerLazySingleton<KeyValueStorageDatasource<String>>(
       () => SecureStorageDatasourceImpl(secureStorage),

lib/features/app_startup/ui/app_startup_widget.dart

@@ -1,4 +1,3 @@
-import 'package:bb_mobile/core/seed/data/datasources/seed_datasource.dart';
 import 'package:bb_mobile/core/themes/app_theme.dart';
 import 'package:bb_mobile/core/utils/build_context_x.dart';
 import 'package:bb_mobile/core/utils/constants.dart';
@@ -127,11 +126,7 @@ class AppStartupFailureScreen extends StatelessWidget {
                 subtitle: Padding(
                   padding: const EdgeInsets.only(top: 8.0),
                   child: Text(
-                    e is SeedNotFoundException
-                        ? hasBackup
-                            ? context.loc.appStartupErrorMessageWithBackup
-                            : context.loc.appStartupErrorMessageNoBackup
-                        : e.toString(),
+                    context.loc.appStartupErrorMessage,
                     style: context.font.bodyMedium?.copyWith(
                       color: context.appColors.secondary.withValues(
                         alpha: 0.7,

localization/app_de.arb

@@ -489,6 +489,7 @@
   "paySelectRecipient": "Wählen Sie Empfänger",
   "payNoActiveWallet": "Keine aktive Brieftasche",
   "importQrDeviceKruxStep4": "Klicken Sie auf die Schaltfläche \"Kamera öffnen\"",
+  "appStartupErrorMessage": "App konnte nicht gestartet werden. Versuchen Sie, die App vollständig zu stoppen und neu zu starten. Wenn der Fehler weiterhin besteht, melden Sie das Problem an den Support und teilen Sie Ihre Protokolle.",
   "appStartupErrorMessageWithBackup": "Konnte nicht initialisiert werden. Löschen und neu installieren, um zu beheben.",
   "payPasteInvoice": "Paste Invoice",
   "labelErrorUnexpected": "Unerwartete Fehler: {message}",

localization/app_en.arb

@@ -11212,6 +11212,10 @@
   "@appStartupErrorTitle": {
     "description": "Title shown when the app fails to start up properly"
   },
+  "appStartupErrorMessage": "App failed to startup. Try completely stop the app and restart. If the error persists, report the issue to support and share your logs.",
+  "@appStartupErrorMessage": {
+    "description": "Error message shown when app startup fails"
+  },
   "appStartupErrorMessageWithBackup": "Could not initialize. Delete and reinstall to fix.",
   "@appStartupErrorMessageWithBackup": {
     "description": "Error message shown when app startup fails due to seed storage issue and user has a backup"

localization/app_es.arb

@@ -3763,6 +3763,7 @@
   "addressViewChangeAddressesComingSoon": "Direcciones de cambio próximamente",
   "addressViewChangeAddressesDescription": "Mostrar direcciones de cambio de la billetera",
   "appStartupErrorTitle": "Error de inicio",
+  "appStartupErrorMessage": "La aplicación no pudo iniciarse. Intente detener completamente la aplicación y reiniciar. Si el error persiste, informe el problema al soporte y comparta sus registros.",
   "appStartupErrorMessageWithBackup": "No se pudo inicializar. Elimine y reinstale para solucionar.",
   "appStartupErrorMessageNoBackup": "No se pudo inicializar. Elimine y reinstale para solucionar. Si su frase de recuperación no está respaldada, puede verla en Configuración->Configuración de Bitcoin->Ver frases después de reinstalar.",
   "appStartupContactSupportButton": "Contactar Soporte",

localization/app_fi.arb

@@ -3709,6 +3709,7 @@
   "addressViewChangeAddressesComingSoon": "Vaihtoraha-osoitteet tulossa pian",
   "addressViewChangeAddressesDescription": "Näytä lompakon vaihtoraha-osoitteet",
   "appStartupErrorTitle": "Käynnistysvirhe",
+  "appStartupErrorMessage": "Sovelluksen käynnistys epäonnistui. Yritä pysäyttää sovellus kokonaan ja käynnistä uudelleen. Jos virhe jatkuu, ilmoita ongelma tukeen ja jaa lokisi.",
   "appStartupErrorMessageWithBackup": "Alustus epäonnistui. Poista ja asenna uudelleen korjataksesi.",
   "appStartupErrorMessageNoBackup": "Alustus epäonnistui. Poista ja asenna uudelleen korjataksesi. Jos siemeniäsi ei ole varmuuskopioitu, voit tarkastella sitä kohdassa Asetukset->Bitcoin-asetukset->Näytä siemenet uudelleenasennuksen jälkeen.",
   "appStartupContactSupportButton": "Ota yhteyttä tukeen",

localization/app_fr.arb

@@ -3763,6 +3763,7 @@
   "addressViewChangeAddressesComingSoon": "Adresses de change à venir",
   "addressViewChangeAddressesDescription": "Afficher les adresses de change du portefeuille",
   "appStartupErrorTitle": "Erreur de démarrage",
+  "appStartupErrorMessage": "Le démarrage de l'application a échoué. Essayez d'arrêter complètement l'application et de redémarrer. Si l'erreur persiste, signalez le problème au support et partagez vos journaux.",
   "appStartupErrorMessageWithBackup": "Impossible d'initialiser. Supprimez et réinstallez pour corriger.",
   "appStartupErrorMessageNoBackup": "Impossible d'initialiser. Supprimez et réinstallez pour corriger. Si votre phrase de récupération n'est pas sauvegardée, vous pouvez la consulter dans Paramètres->Paramètres Bitcoin->Voir les phrases après la réinstallation.",
   "appStartupContactSupportButton": "Contacter le support",

localization/app_it.arb

@@ -498,6 +498,7 @@
   "paySelectRecipient": "Seleziona il destinatario",
   "payNoActiveWallet": "Nessun portafoglio attivo",
   "importQrDeviceKruxStep4": "Fare clic sul pulsante \"open camera\"",
+  "appStartupErrorMessage": "Impossibile avviare l'app. Prova a fermare completamente l'app e riavviare. Se l'errore persiste, segnala il problema al supporto e condividi i tuoi log.",
   "appStartupErrorMessageWithBackup": "Impossibile inizializzare. Elimina e reinstalla per risolvere.",
   "payPasteInvoice": "Fatturato",
   "labelErrorUnexpected": "Errore inaspettato: {message}",

localization/app_pt.arb

@@ -496,6 +496,7 @@
   "paySelectRecipient": "Selecione o destinatário",
   "payNoActiveWallet": "Sem carteira ativa",
   "importQrDeviceKruxStep4": "Clique no botão \"Câmera aberta\"",
+  "appStartupErrorMessage": "Falha ao iniciar o aplicativo. Tente parar completamente o aplicativo e reiniciar. Se o erro persistir, relate o problema ao suporte e compartilhe seus registros.",
   "appStartupErrorMessageWithBackup": "Não foi possível inicializar. Exclua e reinstale para corrigir.",
   "payPasteInvoice": "Fatura de pasta",
   "labelErrorUnexpected": "Erro inesperado: {message}",

localization/app_ru.arb

@@ -496,6 +496,7 @@
   "paySelectRecipient": "Выберите получателя",
   "payNoActiveWallet": "Нет активного кошелька",
   "importQrDeviceKruxStep4": "Нажмите кнопку «открытая камера»",
+  "appStartupErrorMessage": "Приложение не удалось запустить. Попробуйте полностью остановить приложение и перезапустить. Если ошибка сохраняется, сообщите о проблеме в службу поддержки и поделитесь своими журналами.",
   "appStartupErrorMessageWithBackup": "Не удалось инициализировать. Удалите и переустановите, чтобы исправить.",
   "payPasteInvoice": "Счет-фактура",
   "labelErrorUnexpected": "Неожиданная ошибка: {message}",