never update ProviderOberservable with a null provider, use a default provider object instead

2 files changed, 16 insertions, 19 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
index 80056925..2ccbe514 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/StartActivity.java
@@ -153,7 +153,7 @@ public class StartActivity extends Activity{
             Provider provider = ProviderObservable.getInstance().getCurrentProvider();
             if (provider != null && !provider.isDefault()) {
                 PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain());
-                ProviderObservable.getInstance().updateProvider(null);
+                ProviderObservable.getInstance().updateProvider(new Provider());
             }
         }
 
@@ -192,24 +192,19 @@ public class StartActivity extends Activity{
     }
 
     private void prepareEIP() {
-        boolean providerExists = ProviderObservable.getInstance().getCurrentProvider() != null;
-        if (providerExists) {
-            Provider provider =  ProviderObservable.getInstance().getCurrentProvider();
-            if(!provider.isConfigured()) {
-                configureLeapProvider();
+        Provider provider =  ProviderObservable.getInstance().getCurrentProvider();
+        if (provider.isConfigured()) {
+            Log.d(TAG, "vpn provider is configured");
+            if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) {
+                EipCommand.startVPN(this, true);
+                finish();
+            } else if (PreferenceHelper.getRestartOnUpdate(this.getApplicationContext())) {
+                PreferenceHelper.restartOnUpdate(this.getApplicationContext(), false);
+                EipCommand.startVPN(this, false);
+                showMainActivity();
+                finish();
             } else {
-                Log.d(TAG, "vpn provider is configured");
-                if (getIntent() != null && getIntent().getBooleanExtra(EIP_RESTART_ON_BOOT, false)) {
-                    EipCommand.startVPN(this, true);
-                    finish();
-                } else if (PreferenceHelper.getRestartOnUpdate(this.getApplicationContext())) {
-                    PreferenceHelper.restartOnUpdate(this.getApplicationContext(), false);
-                    EipCommand.startVPN(this, false);
-                    showMainActivity();
-                    finish();
-                } else {
-                    showMainActivity();
-                }
+                showMainActivity();
             }
         } else {
             configureLeapProvider();
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java b/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
index 19555504..3e1e1fcc 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/models/ProviderObservable.java
@@ -1,5 +1,7 @@
 package se.leap.bitmaskclient.base.models;
 
+import androidx.annotation.NonNull;
+
 import java.util.Observable;
 
 /**
@@ -17,7 +19,7 @@ public class ProviderObservable extends Observable {
         return instance;
     }
 
-    public synchronized void updateProvider(Provider provider) {
+    public synchronized void updateProvider(@NonNull Provider provider) {
         instance.currentProvider = provider;
         instance.providerForDns = null;
         instance.setChanged();