Handle firebase exceptions

BananoCoin · Nov 30, 2021 · 4471120 · 4471120
1 parent c30b3f2
commit 4471120
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 74 deletions.
diff --git a/android/fastlane/metadata/android/en-US/changelogs/94.txt b/android/fastlane/metadata/android/en-US/changelogs/94.txt
@@ -0,0 +1,4 @@
+- Add representative chooser powered by yellow spy glass
+- Add Bengali translation
+- Android 12 support
+- Misc. fixes and improvements
diff --git a/lib/appstate_container.dart b/lib/appstate_container.dart
@@ -599,9 +599,16 @@ class StateContainerState extends State<StateContainer> {
         wallet.address != null &&
         Address(wallet.address).isValid()) {
       String uuid = await sl.get<SharedPrefsUtil>().getUuid();
-      String fcmToken = await FirebaseMessaging.instance.getToken();
-      bool notificationsEnabled =
-          await sl.get<SharedPrefsUtil>().getNotificationsOn();
+      String fcmToken;
+      bool notificationsEnabled;
+      try {
+        fcmToken = await FirebaseMessaging.instance.getToken();
+        notificationsEnabled =
+            await sl.get<SharedPrefsUtil>().getNotificationsOn();
+      } catch (e) {
+        fcmToken = null;
+        notificationsEnabled = false;
+      }
       sl.get<AccountService>().clearQueue();
       sl.get<AccountService>().queueRequest(SubscribeRequest(
           account: wallet.address,
@@ -700,9 +707,16 @@ class StateContainerState extends State<StateContainer> {
         wallet.address != null &&
         Address(wallet.address).isValid()) {
       String uuid = await sl.get<SharedPrefsUtil>().getUuid();
-      String fcmToken = await FirebaseMessaging.instance.getToken();
-      bool notificationsEnabled =
-          await sl.get<SharedPrefsUtil>().getNotificationsOn();
+      String fcmToken;
+      bool notificationsEnabled;
+      try {
+        fcmToken = await FirebaseMessaging.instance.getToken();
+        notificationsEnabled =
+            await sl.get<SharedPrefsUtil>().getNotificationsOn();
+      } catch (e) {
+        fcmToken = null;
+        notificationsEnabled = false;
+      }
       sl.get<AccountService>().removeSubscribeHistoryPendingFromQueue();
       sl.get<AccountService>().queueRequest(SubscribeRequest(
           account: wallet.address,

diff --git a/lib/network/model/request/fcm_update_request.g.dart b/lib/network/model/request/fcm_update_request.g.dart
diff --git a/lib/network/model/request/subscribe_request.g.dart b/lib/network/model/request/subscribe_request.g.dart
diff --git a/lib/ui/home_page.dart b/lib/ui/home_page.dart
@@ -134,32 +134,36 @@ class _AppHomePageState extends State<AppHomePage>
   }
 
   void getNotificationPermissions() async {
-    NotificationSettings settings = await _firebaseMessaging.requestPermission(
-        sound: true, badge: true, alert: true);
-    if (settings.alert == AppleNotificationSetting.enabled ||
-        settings.badge == AppleNotificationSetting.enabled ||
-        settings.sound == AppleNotificationSetting.enabled ||
-        settings.authorizationStatus == AuthorizationStatus.authorized) {
-      sl.get<SharedPrefsUtil>().getNotificationsSet().then((beenSet) {
-        if (!beenSet) {
-          sl.get<SharedPrefsUtil>().setNotificationsOn(true);
-        }
-      });
-      _firebaseMessaging.getToken().then((String token) {
-        if (token != null) {
-          EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
-        }
-      });
-    } else {
-      sl.get<SharedPrefsUtil>().setNotificationsOn(false).then((_) {
+    try {
+      NotificationSettings settings = await _firebaseMessaging
+          .requestPermission(sound: true, badge: true, alert: true);
+      if (settings.alert == AppleNotificationSetting.enabled ||
+          settings.badge == AppleNotificationSetting.enabled ||
+          settings.sound == AppleNotificationSetting.enabled ||
+          settings.authorizationStatus == AuthorizationStatus.authorized) {
+        sl.get<SharedPrefsUtil>().getNotificationsSet().then((beenSet) {
+          if (!beenSet) {
+            sl.get<SharedPrefsUtil>().setNotificationsOn(true);
+          }
+        });
         _firebaseMessaging.getToken().then((String token) {
-          EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
+          if (token != null) {
+            EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
+          }
         });
-      });
-    }
-    String token = await _firebaseMessaging.getToken();
-    if (token != null) {
-      EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
+      } else {
+        sl.get<SharedPrefsUtil>().setNotificationsOn(false).then((_) {
+          _firebaseMessaging.getToken().then((String token) {
+            EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
+          });
+        });
+      }
+      String token = await _firebaseMessaging.getToken();
+      if (token != null) {
+        EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: token));
+      }
+    } catch (e) {
+      sl.get<SharedPrefsUtil>().setNotificationsOn(false);
     }
   }
 

diff --git a/lib/ui/settings/settings_drawer.dart b/lib/ui/settings/settings_drawer.dart
@@ -312,27 +312,31 @@ class _SettingsSheetState extends State<SettingsSheet>
           );
         })) {
       case NotificationOptions.ON:
-        sl.get<SharedPrefsUtil>().setNotificationsOn(true).then((result) {
+        sl.get<SharedPrefsUtil>().setNotificationsOn(true).then((result) async {
           setState(() {
             _curNotificiationSetting =
                 NotificationSetting(NotificationOptions.ON);
           });
           FirebaseMessaging.instance.requestPermission();
-          ;
-          FirebaseMessaging.instance.getToken().then((fcmToken) {
+          try {
+            String fcmToken = await FirebaseMessaging.instance.getToken();
             EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: fcmToken));
-          });
+          } catch (e) {}
         });
         break;
       case NotificationOptions.OFF:
-        sl.get<SharedPrefsUtil>().setNotificationsOn(false).then((result) {
+        sl
+            .get<SharedPrefsUtil>()
+            .setNotificationsOn(false)
+            .then((result) async {
           setState(() {
             _curNotificiationSetting =
                 NotificationSetting(NotificationOptions.OFF);
           });
-          FirebaseMessaging.instance.getToken().then((fcmToken) {
+          try {
+            String fcmToken = await FirebaseMessaging.instance.getToken();
             EventTaxiImpl.singleton().fire(FcmUpdateEvent(token: fcmToken));
-          });
+          } catch (e) {}
         });
         break;
     }
@@ -1192,10 +1196,12 @@ class _SettingsSheetState extends State<SettingsSheet>
                           sl
                               .get<SharedPrefsUtil>()
                               .setNotificationsOn(false)
-                              .then((_) {
-                            FirebaseMessaging.instance
-                                .getToken()
-                                .then((fcmToken) {
+                              .then((_) async {
+                            try {
+                              String fcmToken =
+                                  await FirebaseMessaging.instance.getToken();
+                              EventTaxiImpl.singleton()
+                                  .fire(FcmUpdateEvent(token: fcmToken));
                               EventTaxiImpl.singleton()
                                   .fire(FcmUpdateEvent(token: fcmToken));
                               // Delete all data
@@ -1209,7 +1215,7 @@ class _SettingsSheetState extends State<SettingsSheet>
                                       '/', (Route<dynamic> route) => false);
                                 });
                               });
-                            });
+                            } catch (e) {}
                           });
                         });
                       });

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,7 +7,7 @@ description: A new Flutter project.
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 2.3.4+93
+version: 2.3.5+94
 
 environment:
   sdk: ">=2.11.99 <3.0.0"