chore: Various fixes and improvements.

Author: Skyost

lib/i18n/de/error.json

@@ -38,6 +38,7 @@
     "noPasswordVerificationMethodAvailable": "Die App kann nicht mit Ihrem Passwort entsperrt werden, da die Integrität der App-Daten verändert wurde. Bitte ändern Sie Ihr Master-Passwort, um fortzufahren.\nBeachten Sie, dass Ihre TOTP-Codes weiterhin manuell entschlüsselt werden müssen."
   },
   "backend": {
+    "invalidJsonResponse": "Ungültige Antwort vom $route (HTTP $statusCode) : $body.",
     "noEmailToConfirm": "Keine E-Mail zum Bestätigen.",
     "invalidSession": "Ihre Sitzung ist ungültig. Bitte versuchen Sie sich erneut einzuloggen.",
     "noSession": "Sie müssen sich einloggen, um fortzufahren.",

lib/i18n/en/error.json

@@ -38,6 +38,7 @@
     "noPasswordVerificationMethodAvailable": "Cannot unlock the app with your password because the app data integrity has been altered. Please change your master password to continue.\nNote that your TOTPs will still need to be decrypted manually."
   },
   "backend": {
+    "invalidJsonResponse": "Invalid response from $route (HTTP $statusCode) : $body.",
     "noEmailToConfirm": "No email to confirm.",
     "invalidSession": "Your session is invalid. Please try to log-in again.",
     "noSession": "You must be logged-in to proceed.",

lib/i18n/fr/error.json

@@ -38,6 +38,7 @@
     "noPasswordVerificationMethodAvailable": "Impossible de déverrouiller l'application avec votre mot de passe car les données de l'application ont été altérées. Veuillez changer votre mot de passe maître pour continuer.\nVeuillez noter que vos TOTPs devront être déchiffrés manuellement."
   },
   "backend": {
+    "invalidJsonResponse": "Réponse invalide du $route (HTTP $statusCode) : $body.",
     "noEmailToConfirm": "Aucun email à confirmer.",
     "invalidSession": "Votre session est invalide. Veuillez réessayer de vous connecter.",
     "noSession": "Vous devez être connecté pour continuer.",

lib/i18n/it/error.json

@@ -38,6 +38,7 @@
     "noPasswordVerificationMethodAvailable": "Impossibile sbloccare l'applicazione con la tua password perché le informazioni sull'applicazione sono state alterate. Cambia la tua password principale per continuare.\nNota che i tuoi TOTPs dovranno essere decifrati manualmente."
   },
   "backend": {
+    "invalidJsonResponse": "Risposta non valida dal $route (HTTP $statusCode) : $body.",
     "noEmailToConfirm": "Nessun email da confermare.",
     "invalidSession": "La tua sessione non è valida. Riprova a effettuare il login.",
     "noSession": "Devi effettuare il login per continuare.",

lib/i18n/pt/error.json

@@ -38,6 +38,7 @@
     "noPasswordVerificationMethodAvailable": "Falha ao desbloquear a aplicação com sua senha porque as informações da aplicação foram alteradas. Altere sua senha mestra para continuar.\nNota que seus TOTPs serão descriptografados manualmente."
   },
   "backend": {
+    "invalidJsonResponse": "Resposta inválida do $route (HTTP $statusCode) : $body.",
     "noEmailToConfirm": "Nenhum e-mail para confirmar.",
     "invalidSession": "Sua sessão é inválida. Tente novamente para fazer login.",
     "noSession": "Você deve estar logado para prosseguir.",

lib/model/backend/request/request.dart

@@ -1,6 +1,8 @@
 import 'dart:convert';
 
 import 'package:http/http.dart' as http;
+import 'package:open_authenticator/i18n/localizable_exception.dart';
+import 'package:open_authenticator/i18n/translations.g.dart';
 import 'package:open_authenticator/model/backend/authentication/providers/provider.dart';
 import 'package:open_authenticator/model/backend/request/error.dart';
 import 'package:open_authenticator/model/backend/request/response.dart';
@@ -25,21 +27,52 @@ sealed class BackendRequest<T extends BackendResponse> {
 
   /// Converts the response to a backend response.
   T toResponse(http.Response response) {
-    Map<String, dynamic> json = jsonDecode(response.body);
-    if (!json['success']) {
-      throw BackendRequestError.fromJson(
+    try {
+      Map<String, dynamic> json = jsonDecode(response.body);
+      if (!json.containsKey('success') || !json.containsKey('data')) {
+        throw InvalidJsonResponse(
+          route: route,
+          statusCode: response.statusCode,
+          body: response.body,
+        );
+      }
+      if (json['success'] != true) {
+        throw BackendRequestError.fromJson(
+          route: route,
+          statusCode: response.statusCode,
+          json: json,
+        );
+      }
+      return _toResponseIfNoError(json['data']);
+    } on FormatException {
+      throw InvalidJsonResponse(
         route: route,
         statusCode: response.statusCode,
-        json: json,
+        body: response.body,
       );
     }
-    return _toResponseIfNoError(json['data']);
   }
 
   /// Converts the response to a backend response.
   T _toResponseIfNoError(dynamic data);
 }
 
+/// Thrown when the response is invalid.
+class InvalidJsonResponse extends LocalizableException {
+  /// Creates a new invalid JSON response exception instance.
+  InvalidJsonResponse({
+    required String route,
+    required int statusCode,
+    required String body,
+  }) : super(
+         localizedErrorMessage: translations.error.backend.invalidJsonResponse(
+           route: route,
+           statusCode: statusCode,
+           body: body,
+         ),
+       );
+}
+
 /// Represents a backend request with a body.
 mixin BackendWithBodyRequest<T extends BackendResponse> on BackendRequest<T> {
   /// The body.

lib/model/backup.dart

@@ -23,7 +23,7 @@ final backupStoreProvider = AsyncNotifierProvider.autoDispose<BackupStore, List<
 /// Contains all backups.
 class BackupStore extends AsyncNotifier<List<Backup>> {
   /// The backup filename regex.
-  static const String _kBackupFilenameRegex = r'\d{10}\.bak';
+  static const String _kBackupFilenameRegex = r'\d{13}\.bak';
 
   @override
   FutureOr<List<Backup>> build() => _listBackups();
@@ -36,7 +36,7 @@ class BackupStore extends AsyncNotifier<List<Backup>> {
     DateTime? dateTime = _fromBackupFilename(backupFile);
     Backup backup = Backup._(ref: ref, dateTime: dateTime ?? DateTime.now());
     List<Backup> backups = [...(await future), backup]..sort();
-    Directory directory = await getBackupsDirectory();
+    Directory directory = await getBackupsDirectory(create: true);
     backupFile.copySync(join(directory.path, backup.filename));
     if (!ref.mounted) {
       return const ResultCancelled();
@@ -167,7 +167,7 @@ class Backup implements Comparable<Backup> {
           totps.add(decryptedTotp ?? totp);
         }
       }
-      if (totps.isEmpty) {
+      if (totps.isEmpty && jsonTotps.isNotEmpty) {
         throw InvalidPasswordException();
       }
       return await _ref.read(totpRepositoryProvider.notifier).replaceBy(totps);

lib/widgets/blur.dart

@@ -35,25 +35,28 @@ class Blur extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) => ClipRRect(
-    borderRadius: borderRadius ?? BorderRadius.zero,
-    child: Stack(
-      children: [
-        ?below,
-        Positioned.fill(
-          child: BackdropFilter(
-            filter: context.theme.dialogRouteStyle.barrierFilter?.call(1) ?? ImageFilter.blur(sigmaX: 5, sigmaY: 5),
-            child: Container(
-              decoration: BoxDecoration(
-                color: context.theme.colors.background.withValues(alpha: colorOpacity),
+  Widget build(BuildContext context) => PopScope(
+    canPop: above == null || below == null,
+    child: ClipRRect(
+      borderRadius: borderRadius ?? BorderRadius.zero,
+      child: Stack(
+        children: [
+          ?below,
+          Positioned.fill(
+            child: BackdropFilter(
+              filter: context.theme.dialogRouteStyle.barrierFilter?.call(1) ?? ImageFilter.blur(sigmaX: 5, sigmaY: 5),
+              child: Container(
+                decoration: BoxDecoration(
+                  color: context.theme.colors.background.withValues(alpha: colorOpacity),
+                ),
+                alignment: alignment,
+                child: overlay,
               ),
-              alignment: alignment,
-              child: overlay,
             ),
           ),
-        ),
-        ?above,
-      ],
+          ?above,
+        ],
+      ),
     ),
   );
 }

lib/widgets/dialog/text_input_dialog.dart

@@ -109,62 +109,73 @@ class _TextInputDialogState extends State<TextInputDialog> {
     });
 
   /// Whether the input is valid.
-  late bool valid = widget.validator == null ? true : (widget.validator!.call(value) != null);
+  late bool valid = widget.validator == null ? true : (widget.validator!(value) == null);
 
   @override
-  Widget build(BuildContext context) => AppDialog(
-    title: Text(widget.title),
-    actions: [
-      ClickableButton(
-        onPress: valid ? (() => Navigator.pop(context, value)) : null,
-        child: ButtonText(MaterialLocalizations.of(context).okButtonLabel),
-      ),
-      ClickableButton(
-        variant: .secondary,
-        onPress: () => Navigator.pop(context),
-        child: ButtonText(MaterialLocalizations.of(context).cancelButtonLabel),
-      ),
-    ],
-    children: [
-      Text(
-        widget.message,
-        textAlign: TextAlign.left,
-      ),
-      if (widget.children != null) ...widget.children!,
-      if (widget.password)
-        PasswordFormField(
-          control: .managed(controller: valueController),
-          autofocus: true,
-          onSubmit: (value) => Navigator.pop(context, value),
-          textInputAction: TextInputAction.go,
-          validator: widget.validator,
-          keyboardType: widget.keyboardType,
-          autovalidateMode: AutovalidateMode.always,
-          inputFormatters: widget.inputFormatters,
-          textCapitalization: widget.textCapitalization ?? .none,
-        )
-      else
-        FTextFormField(
-          control: .managed(controller: valueController),
-          autofocus: true,
-          onSubmit: (value) => Navigator.pop(context, value),
-          textInputAction: TextInputAction.go,
-          validator: widget.validator,
-          keyboardType: widget.keyboardType,
-          autovalidateMode: AutovalidateMode.always,
-          inputFormatters: widget.inputFormatters,
-          textCapitalization: widget.textCapitalization ?? .none,
+  Widget build(BuildContext context) {
+    void onSubmit(String value) {
+      bool valid = onChanged(value);
+      if (valid) {
+        Navigator.pop(context, value);
+      }
+    }
+
+    return AppDialog(
+      title: Text(widget.title),
+      actions: [
+        ClickableButton(
+          onPress: valid ? (() => Navigator.pop(context, value)) : null,
+          child: ButtonText(MaterialLocalizations.of(context).okButtonLabel),
         ),
-    ],
-  );
+        ClickableButton(
+          variant: .secondary,
+          onPress: () => Navigator.pop(context),
+          child: ButtonText(MaterialLocalizations.of(context).cancelButtonLabel),
+        ),
+      ],
+      children: [
+        Text(
+          widget.message,
+          textAlign: TextAlign.left,
+        ),
+        if (widget.children != null) ...widget.children!,
+        if (widget.password)
+          PasswordFormField(
+            control: .managed(controller: valueController),
+            autofocus: true,
+            onSubmit: onSubmit,
+            textInputAction: TextInputAction.go,
+            validator: widget.validator,
+            keyboardType: widget.keyboardType,
+            autovalidateMode: AutovalidateMode.always,
+            inputFormatters: widget.inputFormatters,
+            textCapitalization: widget.textCapitalization ?? .none,
+          )
+        else
+          FTextFormField(
+            control: .managed(controller: valueController),
+            autofocus: true,
+            onSubmit: onSubmit,
+            textInputAction: TextInputAction.go,
+            validator: widget.validator,
+            keyboardType: widget.keyboardType,
+            autovalidateMode: AutovalidateMode.always,
+            inputFormatters: widget.inputFormatters,
+            textCapitalization: widget.textCapitalization ?? .none,
+          ),
+      ],
+    );
+  }
 
   /// Triggered when changed.
-  void onChanged(String newValue) {
+  bool onChanged(String newValue) {
     value = newValue;
     if (widget.validator != null) {
       bool result = widget.validator!(newValue) == null;
       setState(() => valid = result);
+      return result;
     }
+    return true;
   }
 }