fix(android): Clear secure storage on exception

See flutter_secure_storage issue: juliansteenbakker/flutter_secure_storage#43 (comment)
Cavatina · Dec 16, 2022 · ffa32d1 · ffa32d1
1 parent 9f85714
commit ffa32d1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 6 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -9,6 +9,9 @@
         android:name="${applicationName}"
         android:label="Music'scool"
         android:icon="@mipmap/ic_launcher"
+        android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_rules"
+        android:dataExtractionRules="@xml/data_extraction_rules"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".MainActivity"

diff --git a/android/app/src/main/res/xml/backup_rules.xml b/android/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <exclude domain="sharedpref" path="FlutterSecureStorage"/>
+</full-backup-content>
diff --git a/android/app/src/main/res/xml/data_extraction_rules.xml b/android/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data-extraction-rules>
+ <cloud-backup>
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="FlutterSecureStorage"/>
+ </cloud-backup>
+</data-extraction-rules>
diff --git a/lib/viewmodels/auth.dart b/lib/viewmodels/auth.dart
@@ -42,11 +42,9 @@ class AuthModel extends ChangeNotifier {
     } else {
       print('token empty!');
     }
-    value = await storage.read(key: 'notificationsEnabled');
-    print('notificationsEnabled:${value}');
+    value = await readStorage('notificationsEnabled');
     if (value != null && value == 'false') _notificationsEnabled = false;
-    value = await storage.read(key: 'nextLesson');
-    print('nextLesson:${value}');
+    value = await readStorage('nextLesson');
     if (value != null && value != '') {
       try {
         _nextLesson = DateTime.parse(value);
@@ -70,9 +68,19 @@ class AuthModel extends ChangeNotifier {
     return this;
   }
 
+  Future<String?> readStorage(String key) async {
+    try {
+      return await storage.read(key: key);
+    }
+    catch(e) {
+      await storage.deleteAll();
+      return null;
+    }
+  }
+
   Future<String> get token async {
     if (_token == '') {
-      _token = (await storage.read(key: 'token')) ?? '';
+      _token = (await readStorage('token')) ?? '';
     }
     return _token;
   }
@@ -156,7 +164,7 @@ class AuthModel extends ChangeNotifier {
   }
 
   Future<String> get lastUsername async {
-    return await storage.read(key: 'lastUsername') ?? '';
+    return await readStorage('lastUsername') ?? '';
   }
 
   Future<List<Lesson>> getUpcomingLessons({required int page, required int perPage}) async {