From 7b5ad7e802aae82b69ed8ecd916916e6545f01f2 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 23 Jul 2020 17:03:15 +0200
Subject: always use provider from ProviderObservable if possible

---
 app/src/main/java/se/leap/bitmaskclient/StartActivity.java       | 9 ++++-----
 .../main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java  | 3 ---
 2 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'app/src/main/java/se')

diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
index b6ace6db..dd4878f3 100644
--- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
@@ -21,9 +21,10 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.util.Log;
+
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import android.util.Log;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -40,8 +41,6 @@ import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP;
 import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES;
 import static se.leap.bitmaskclient.MainActivity.ACTION_SHOW_VPN_FRAGMENT;
 import static se.leap.bitmaskclient.utils.ConfigHelper.isDefaultBitmask;
-import static se.leap.bitmaskclient.utils.PreferenceHelper.getSavedProviderFromSharedPreferences;
-import static se.leap.bitmaskclient.utils.PreferenceHelper.providerInSharedPreferences;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.storeProviderInPreferences;
 
 /**
@@ -162,9 +161,9 @@ public class StartActivity extends Activity{
     }
 
     private void prepareEIP() {
-        boolean providerExists = providerInSharedPreferences(preferences);
+        boolean providerExists = ProviderObservable.getInstance().getCurrentProvider() != null;
         if (providerExists) {
-            Provider provider = getSavedProviderFromSharedPreferences(preferences);
+            Provider provider =  ProviderObservable.getInstance().getCurrentProvider();
             if(!provider.isConfigured()) {
                 configureLeapProvider();
             } else {
diff --git a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
index 87bd5f93..cb2aeb26 100644
--- a/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java
@@ -37,9 +37,6 @@ import static se.leap.bitmaskclient.Constants.USE_PLUGGABLE_TRANSPORTS;
  */
 
 public class PreferenceHelper {
-    public static boolean providerInSharedPreferences(@NonNull SharedPreferences preferences) {
-        return preferences.getBoolean(PROVIDER_CONFIGURED, false);
-    }
 
     public static Provider getSavedProviderFromSharedPreferences(@NonNull SharedPreferences preferences) {
         Provider provider = new Provider();
-- 
cgit v1.2.3