persist v5 provider on successful provider setup, ensure introducer is also saved

2 files changed, 7 insertions, 3 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
index 9af14eda..2e2497d5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerV5.java
@@ -66,6 +66,7 @@ public class ProviderApiManagerV5 extends ProviderApiManagerBase implements IPro
             case SET_UP_PROVIDER:
                 result = setupProvider(provider, parameters);
                 if (result.getBoolean(BROADCAST_RESULT_KEY)) {
+                    serviceCallback.saveProvider(provider);
                     eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_OK, result, provider);
                 } else {
                     eventSender.sendToReceiverOrBroadcast(receiver, PROVIDER_NOK, result, provider);
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderManager.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderManager.java
index 63fbde09..bcb177e2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderManager.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderManager.java
@@ -45,8 +45,11 @@ public class ProviderManager {
     private boolean addDummyEntry = false;
 
     public static ProviderManager getInstance(AssetManager assetsManager) {
-        if (instance == null)
+        if (instance == null) {
             instance = new ProviderManager(assetsManager);
+        } else {
+            instance.updateCustomProviders();
+        }
 
         return instance;
     }
@@ -63,7 +66,7 @@ public class ProviderManager {
     private ProviderManager(AssetManager assetManager) {
         this.assetsManager = assetManager;
         addDefaultProviders(assetManager);
-        addCustomProviders();
+        updateCustomProviders();
     }
 
     private void addDefaultProviders(AssetManager assetManager) {
@@ -117,7 +120,7 @@ public class ProviderManager {
     }
 
 
-    private void addCustomProviders() {
+    public void updateCustomProviders() {
         customProviders = PreferenceHelper.getCustomProviders();
     }