refactor: Added an AppUnlockInteraction mixin to avoid using BuildContext in lib/model.

Author: Skyost

lib/i18n/de/app_unlock.json

@@ -11,6 +11,7 @@
   "button": {
     "disable": "Deaktivieren",
     "changeMasterPassword": "Master-Passwort ändern",
-    "unlock": "Entsperren"
+    "unlock": "Entsperren",
+    "cancel": "Abbrechen"
   }
 }

lib/i18n/en/app_unlock.json

@@ -11,6 +11,7 @@
   "button": {
     "disable": "Disable",
     "changeMasterPassword": "Change master password",
-    "unlock": "Unlock"
+    "unlock": "Unlock",
+    "cancel": "Cancel"
   }
 }

lib/i18n/fr/app_unlock.json

@@ -11,6 +11,7 @@
   "button": {
     "disable": "Désactiver",
     "changeMasterPassword": "Changer le mot de passe maître",
-    "unlock": "Déverrouiller"
+    "unlock": "Déverrouiller",
+    "cancel": "Annuler"
   }
 }

lib/i18n/it/app_unlock.json

@@ -11,6 +11,7 @@
   "button": {
     "disable": "Disabilitare",
     "changeMasterPassword": "Cambiare la password principale",
-    "unlock": "Sbloccare"
+    "unlock": "Sbloccare",
+    "cancel": "Annulla"
   }
 }

lib/i18n/pt/app_unlock.json

@@ -11,6 +11,7 @@
   "button": {
     "disable": "Desativar",
     "changeMasterPassword": "Alterar a senha mestra",
-    "unlock": "Desbloquear"
+    "unlock": "Desbloquear",
+    "cancel": "Cancelar"
   }
 }

lib/model/app_unlock/interaction.dart

@@ -0,0 +1,8 @@
+/// Allows to interact with the app unlock.
+mixin AppUnlockInteraction {
+  /// Prompts the user for a master password.
+  Future<String?> promptMasterPassword({String? message});
+
+  /// Whether the app can be unlocked.
+  bool get canInteract;
+}

lib/model/app_unlock/methods/local_auth.dart

@@ -13,8 +13,8 @@ class LocalAuthenticationAppUnlockMethod extends AppUnlockMethod {
        );
 
   @override
-  Future<Result> _tryUnlock(BuildContext context, UnlockReason reason) async {
-    bool result = await LocalAuthentication.instance.authenticate(context, reason);
+  Future<Result> _tryUnlock(AppUnlockInteraction interaction, UnlockReason reason) async {
+    bool result = await LocalAuthentication.instance.authenticate(reason);
     return result ? const ResultSuccess() : const ResultCancelled();
   }
 

lib/model/app_unlock/methods/master_password.dart

@@ -13,18 +13,18 @@ class MasterPasswordAppUnlockMethod extends AppUnlockMethod<String> {
        );
 
   @override
-  Future<Result<String>> _tryUnlock(BuildContext context, UnlockReason reason) async {
+  Future<Result<String>> _tryUnlock(AppUnlockInteraction interaction, UnlockReason reason) async {
     if (reason != .openApp && reason != .sensibleAction) {
       List<Totp> totps = await _ref.read(totpRepositoryProvider.future);
       if (totps.isEmpty) {
         return const ResultSuccess();
       }
     }
-    if (!context.mounted) {
+    if (!interaction.canInteract) {
       return const ResultCancelled();
     }
 
-    Result<String> result = await _promptMasterPasswordForUnlock(context, reason == .openApp ? translations.appUnlock.masterPasswordDialogMessage : null);
+    Result<String> result = await _promptMasterPasswordForUnlock(interaction, reason == .openApp ? translations.appUnlock.masterPasswordDialogMessage : null);
     if (result is! ResultSuccess<String>) {
       return result;
     }
@@ -73,9 +73,8 @@ class MasterPasswordAppUnlockMethod extends AppUnlockMethod<String> {
   }
 
   /// Prompts master password for unlock.
-  Future<Result<String>> _promptMasterPasswordForUnlock(BuildContext context, String? message) async {
-    String? password = await MasterPasswordInputDialog.prompt(
-      context,
+  Future<Result<String>> _promptMasterPasswordForUnlock(AppUnlockInteraction interaction, String? message) async {
+    String? password = await interaction.promptMasterPassword(
       message: message,
     );
     if (password == null) {

lib/model/app_unlock/methods/method.dart

@@ -1,8 +1,8 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:local_auth/local_auth.dart' hide LocalAuthentication;
 import 'package:open_authenticator/i18n/localizable_exception.dart';
 import 'package:open_authenticator/i18n/translations.g.dart';
+import 'package:open_authenticator/model/app_unlock/interaction.dart';
 import 'package:open_authenticator/model/app_unlock/reason.dart';
 import 'package:open_authenticator/model/crypto/derived_key.dart';
 import 'package:open_authenticator/model/crypto/salt.dart';
@@ -13,7 +13,6 @@ import 'package:open_authenticator/model/totp/repository.dart';
 import 'package:open_authenticator/model/totp/totp.dart';
 import 'package:open_authenticator/utils/local_authentication/local_authentication.dart';
 import 'package:open_authenticator/utils/result/result.dart';
-import 'package:open_authenticator/widgets/dialog/text_input_dialog.dart';
 
 part 'local_auth.dart';
 part 'master_password.dart';
@@ -44,17 +43,16 @@ sealed class AppUnlockMethod<T> {
   }) : _ref = ref;
 
   /// Unlock the app, handling errors.
-  /// [context] is required so that we can interact with the user.
-  Future<Result<T>> unlock(BuildContext context, UnlockReason reason) async {
+  Future<Result<T>> unlock(AppUnlockInteraction interaction, UnlockReason reason) async {
     try {
       CannotUnlockException? cannotUnlockException = await canUnlock(reason);
       if (cannotUnlockException != null) {
         throw cannotUnlockException;
       }
-      if (!context.mounted) {
+      if (!interaction.canInteract) {
         return const ResultCancelled();
       }
-      return await _tryUnlock(context, reason);
+      return await _tryUnlock(interaction, reason);
     } catch (ex, stackTrace) {
       if (ex is LocalAuthException) {
         if (ex.code == LocalAuthExceptionCode.userCanceled || ex.code == LocalAuthExceptionCode.systemCanceled) {
@@ -69,8 +67,7 @@ sealed class AppUnlockMethod<T> {
   }
 
   /// Tries to unlock the app.
-  /// [context] is required so that we can interact with the user.
-  Future<Result<T>> _tryUnlock(BuildContext context, UnlockReason reason);
+  Future<Result<T>> _tryUnlock(AppUnlockInteraction interaction, UnlockReason reason);
 
   /// The default app lock state.
   AppLockState get defaultAppLockState => AppLockState.locked;

lib/model/app_unlock/methods/none.dart

@@ -13,7 +13,7 @@ class NoneAppUnlockMethod extends AppUnlockMethod {
        );
 
   @override
-  Future<Result> _tryUnlock(BuildContext context, UnlockReason reason) => Future.value(const ResultSuccess());
+  Future<Result> _tryUnlock(AppUnlockInteraction interaction, UnlockReason reason) => Future.value(const ResultSuccess());
 
   @override
   AppLockState get defaultAppLockState => AppLockState.unlocked;