From 3412255eb3073d72e98c40da5a1fe19464470b39 Mon Sep 17 00:00:00 2001 From: Stanislav Shakirov Date: Wed, 26 Jul 2017 14:24:27 +0300 Subject: [PATCH] save FirebaseInstanceId.getInstance() access. `FirebaseInstanceId.getInstance()` can throw exceptions. For example if Firebase was not initialized. --- .../java/com/evollu/react/fcm/FIRMessagingModule.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java index 1eed260..4822133 100644 --- a/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java +++ b/android/src/main/java/com/evollu/react/fcm/FIRMessagingModule.java @@ -70,8 +70,13 @@ public class FIRMessagingModule extends ReactContextBaseJavaModule implements Li @ReactMethod public void getFCMToken(Promise promise) { - Log.d(TAG, "Firebase token: " + FirebaseInstanceId.getInstance().getToken()); - promise.resolve(FirebaseInstanceId.getInstance().getToken()); + try { + Log.d(TAG, "Firebase token: " + FirebaseInstanceId.getInstance().getToken()); + promise.resolve(FirebaseInstanceId.getInstance().getToken()); + } catch (Throwable e) { + e.printStackTrace(); + promise.reject(null,e.getMessage()); + } } @ReactMethod -- 2.26.2