Fixing crash in ignoreFCM for Android

coronalabs · Aug 20, 2021 · 56d27a1 · 56d27a1
1 parent 58165ed
commit 56d27a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/plugins/2020.3569/android/plugin.notifications.v2.jar b/plugins/2020.3569/android/plugin.notifications.v2.jar
diff --git a/src/android/plugin/src/main/java/plugin/notifications/v2/CoronaFirebaseMessagingService.java b/src/android/plugin/src/main/java/plugin/notifications/v2/CoronaFirebaseMessagingService.java
@@ -21,8 +21,7 @@
 // Class definition
 // -------------------------------------------------------
 
-public class CoronaFirebaseMessagingService extends FirebaseMessagingService
-{
+public class CoronaFirebaseMessagingService extends FirebaseMessagingService {
     public static String PREFERENCE_FILE = "fcm-notifications";
     public static String SKIP_FCM = "skipFCM";
 
@@ -31,20 +30,24 @@ public CoronaFirebaseMessagingService() {
     }
 
     private boolean ignoreFCM() {
-        SharedPreferences preferences = CoronaEnvironment.getApplicationContext().getSharedPreferences(PREFERENCE_FILE, Context.MODE_PRIVATE);
-        return preferences.getBoolean(SKIP_FCM, false);
+        try {
+            SharedPreferences preferences = getApplicationContext().getSharedPreferences(PREFERENCE_FILE, Context.MODE_PRIVATE);
+            return preferences.getBoolean(SKIP_FCM, false);
+        } catch (Throwable ignore) {
+        }
+        return false;
     }
 
     @Override
     public void onMessageReceived(RemoteMessage remoteMessage) {
-        if(ignoreFCM()) return;;
+        if (ignoreFCM()) return;
         super.onMessageReceived(remoteMessage);
         NotificationsV2Helper.processRemoteMessage(remoteMessage, getApplicationContext());
     }
 
     @Override
-    public void onNewToken( String deviceToken ) {
-        if(ignoreFCM()) return;;
+    public void onNewToken(String deviceToken) {
+        if (ignoreFCM()) return;
         super.onNewToken(deviceToken);
         NotificationRegistrationTask registrationTask = new NotificationRegistrationTask(deviceToken);
         for (com.ansca.corona.CoronaRuntime runtime : com.ansca.corona.CoronaRuntimeProvider.getAllCoronaRuntimes()) {