Retrieve settings from ConnectionService context

Author: manuquentin

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

@@ -136,9 +136,9 @@ public static RNCallKeepModule getInstance(ReactApplicationContext reactContext,
         return instance;
     }
 
-    public static WritableMap getSettings() {
+    public static WritableMap getSettings(@Nullable Context context) {
         if (_settings == null) {
-            fetchStoredSettings();
+            fetchStoredSettings(context);
         }
 
         return _settings;
@@ -222,7 +222,7 @@ public void setSettings(ReadableMap options) {
         Log.d(TAG, "[RNCallKeepModule] setSettings: " + options);
         storeSettings(options);
 
-        _settings = getSettings();
+        _settings = getSettings(null);
     }
 
     @ReactMethod
@@ -770,7 +770,7 @@ public void setForegroundServiceSettings(ReadableMap foregroundServerSettings) {
         }
 
         // Retrieve settings and set the `foregroundService` value
-        WritableMap settings = getSettings();
+        WritableMap settings = getSettings(null);
         if (settings != null) {
             settings.putMap("foregroundService", MapUtils.readableToWritableMap(foregroundServerSettings));
         }
@@ -1036,11 +1036,12 @@ private void storeSettings(ReadableMap options) {
         }
     }
 
-    private static void fetchStoredSettings() {
-        if (instance == null) {
+    private static void fetchStoredSettings(@Nullable Context fromContext) {
+        if (instance == null && fromContext == null) {
+            Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no instance nor fromContext.");
             return;
         }
-        Context context = instance.getAppContext();
+        Context context = fromContext != null ? fromContext : instance.getAppContext();
         _settings = new WritableNativeMap();
         if (context == null) {
             Log.w(TAG, "[RNCallKeepModule][fetchStoredSettings] no react context found.");

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

@@ -117,13 +117,13 @@ public static void setAvailable(Boolean value) {
         isAvailable = value;
     }
 
-    public static WritableMap getSettings() {
-       WritableMap settings = RNCallKeepModule.getSettings();
+    public static WritableMap getSettings(@Nullable Context context) {
+       WritableMap settings = RNCallKeepModule.getSettings(context);
        return settings;
     }
 
-    public static ReadableMap getForegroundSettings() {
-       WritableMap settings = VoiceConnectionService.getSettings();
+    public static ReadableMap getForegroundSettings(@Nullable Context context) {
+       WritableMap settings = VoiceConnectionService.getSettings(context);
        if (settings == null) {
           return null;
        }
@@ -193,7 +193,7 @@ public Connection onCreateIncomingConnection(PhoneAccountHandle connectionManage
         String name = extra.getString(EXTRA_CALLER_NAME);
         String callUUID = extra.getString(EXTRA_CALL_UUID);
         Boolean isForeground = VoiceConnectionService.isRunning(this.getApplicationContext());
-        WritableMap settings = this.getSettings();
+        WritableMap settings = this.getSettings(this);
         Integer timeout = settings.hasKey("displayCallReachabilityTimeout") ? settings.getInt("displayCallReachabilityTimeout") : null;
 
         Log.d(TAG, "[VoiceConnectionService] onCreateIncomingConnection, name:" + name + ", number" + number +