Merge pull request #674 from react-native-webrtc/lighten_module_constructor

Move fetchStoredSettings outside of the RNCallKeepModule constructor to avoid race condition with singleton

Author: manuquentin

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

@@ -130,6 +130,8 @@ public static RNCallKeepModule getInstance(ReactApplicationContext reactContext,
         if (instance == null) {
             Log.d(TAG, "[RNCallKeepModule] getInstance : " + (reactContext == null ? "null" : "ok"));
             instance = new RNCallKeepModule(reactContext);
+            instance.registerReceiver();
+            instance.fetchStoredSettings(reactContext);
         }
         if (realContext) {
             instance.setContext(reactContext);
@@ -151,8 +153,6 @@ private RNCallKeepModule(ReactApplicationContext reactContext) {
 
         this.reactContext = reactContext;
         delayedEvents = new WritableNativeArray();
-        this.registerReceiver();
-        this.fetchStoredSettings(reactContext);
     }
 
     private boolean isSelfManaged() {
@@ -1024,7 +1024,7 @@ private boolean hasPhoneAccount() {
             telecomManager.getPhoneAccount(handle).isEnabled();
     }
 
-    private void registerReceiver() {
+    protected void registerReceiver() {
         if (!isReceiverRegistered) {
             isReceiverRegistered = true;
             voiceBroadcastReceiver = new VoiceBroadcastReceiver();
@@ -1078,7 +1078,7 @@ private WritableMap storeSettings(ReadableMap options) {
         return MapUtils.readableToWritableMap(options);
     }
 
-    private static void fetchStoredSettings(@Nullable Context fromContext) {
+    protected static void fetchStoredSettings(@Nullable Context fromContext) {
         Context context = fromContext != null ? fromContext : instance.getAppContext();
         if (instance == null && context == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no instance nor fromContext.");