Merge pull request #693 from kasperkberg/patch-1

Null-check instance prior to being called in fetchStoredSettings

Author: manuquentin

android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java

@@ -1079,11 +1079,11 @@ private WritableMap storeSettings(ReadableMap options) {
     }
 
     protected static void fetchStoredSettings(@Nullable Context fromContext) {
-        Context context = fromContext != null ? fromContext : instance.getAppContext();
-        if (instance == null && context == null) {
+        if (instance == null && fromContext == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no instance nor fromContext.");
             return;
         }
+        Context context = fromContext != null ? fromContext : instance.getAppContext();
         _settings = new WritableNativeMap();
         if (context == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no react context found.");