summaryrefslogtreecommitdiff
path: root/app/src/main/java
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2020-07-23 17:03:15 +0200
committercyBerta <cyberta@riseup.net>2020-07-23 17:03:15 +0200
commit7b5ad7e802aae82b69ed8ecd916916e6545f01f2 (patch)
tree14376a364f72220ec86d5144d738d61d94c94b49 /app/src/main/java
parent49b18fcdc45433d34eefb46ab236144e19022dcb (diff)
always use provider from ProviderObservable if possible
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/StartActivity.java9
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/utils/PreferenceHelper.java3
2 files changed, 4 insertions, 8 deletions
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();