use single instance of shared prefernces across the app, this reduces the laggyness of the UI noticably

6 files changed, 27 insertions, 34 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
index 0e7e1f4a..07ea4691 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderAPI.java
@@ -178,7 +178,7 @@ public class ProviderAPI extends JobIntentService implements ProviderApiManagerB
 
     private ProviderApiManager initApiManager() {
         OkHttpClientGenerator clientGenerator = new OkHttpClientGenerator(getResources());
-        return new ProviderApiManager(PreferenceHelper.getSharedPreferences(this), getResources(), clientGenerator, this);
+        return new ProviderApiManager(getResources(), clientGenerator, this);
     }
 
 }
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
index fdaef28b..fbb0d507 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderApiManagerBase.java
@@ -101,7 +101,6 @@ import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.ON;
 import static se.leap.bitmaskclient.tor.TorStatusObservable.getProxyPort;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.ResultReceiver;
@@ -172,12 +171,10 @@ public abstract class ProviderApiManagerBase {
 
     private final ProviderApiServiceCallback serviceCallback;
 
-    protected SharedPreferences preferences;
     protected Resources resources;
     OkHttpClientGenerator clientGenerator;
 
-    ProviderApiManagerBase(SharedPreferences preferences, Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
-        this.preferences = preferences;
+    ProviderApiManagerBase(Resources resources, OkHttpClientGenerator clientGenerator, ProviderApiServiceCallback callback) {
         this.resources = resources;
         this.serviceCallback = callback;
         this.clientGenerator = clientGenerator;
@@ -221,7 +218,7 @@ public abstract class ProviderApiManagerBase {
         }
 
          try {
-             if (PreferenceHelper.hasSnowflakePrefs(preferences) && !VpnStatus.isVPNActive()) {
+             if (PreferenceHelper.hasSnowflakePrefs() && !VpnStatus.isVPNActive()) {
                  startTorProxy();
              }
         } catch (InterruptedException | IllegalStateException e) {
@@ -303,7 +300,7 @@ public abstract class ProviderApiManagerBase {
                 if (result.getBoolean(BROADCAST_RESULT_KEY)) {
                     Log.d(TAG, "successfully downloaded VPN certificate");
                     provider.setShouldUpdateVpnCertificate(false);
-                    PreferenceHelper.storeProviderInPreferences(preferences, provider);
+                    PreferenceHelper.storeProviderInPreferences(provider);
                     ProviderObservable.getInstance().updateProvider(provider);
                 }
                 ProviderObservable.getInstance().setProviderForDns(null);
@@ -315,7 +312,7 @@ public abstract class ProviderApiManagerBase {
                     provider.setMotdJson(motd);
                     provider.setLastMotdUpdate(System.currentTimeMillis());
                 }
-                PreferenceHelper.storeProviderInPreferences(preferences, provider);
+                PreferenceHelper.storeProviderInPreferences(provider);
                 ProviderObservable.getInstance().updateProvider(provider);
                 break;
 
@@ -359,7 +356,7 @@ public abstract class ProviderApiManagerBase {
 
     protected boolean startTorProxy() throws InterruptedException, IllegalStateException, TimeoutException {
         if (EipStatus.getInstance().isDisconnected() &&
-                PreferenceHelper.getUseSnowflake(preferences) &&
+                PreferenceHelper.getUseSnowflake() &&
             serviceCallback.startTorService()) {
             waitForTorCircuits();
             if (TorStatusObservable.isCancelled()) {
@@ -385,7 +382,7 @@ public abstract class ProviderApiManagerBase {
 
     void resetProviderDetails(Provider provider) {
         provider.reset();
-        deleteProviderDetailsFromPreferences(preferences, provider.getDomain());
+        deleteProviderDetailsFromPreferences(provider.getDomain());
     }
 
     String formatErrorMessage(final int errorStringId) {
@@ -1037,16 +1034,16 @@ public abstract class ProviderApiManagerBase {
     }
 
     protected String getPersistedPrivateKey(String providerDomain) {
-        return getFromPersistedProvider(PROVIDER_PRIVATE_KEY, providerDomain, preferences);
+        return getFromPersistedProvider(PROVIDER_PRIVATE_KEY, providerDomain);
     }
 
     protected String getPersistedVPNCertificate(String providerDomain) {
-        return getFromPersistedProvider(PROVIDER_VPN_CERTIFICATE, providerDomain, preferences);
+        return getFromPersistedProvider(PROVIDER_VPN_CERTIFICATE, providerDomain);
     }
 
     protected JSONObject getPersistedProviderDefinition(String providerDomain) {
         try {
-            return new JSONObject(getFromPersistedProvider(Provider.KEY, providerDomain, preferences));
+            return new JSONObject(getFromPersistedProvider(Provider.KEY, providerDomain));
         } catch (JSONException e) {
             e.printStackTrace();
             return new JSONObject();
@@ -1054,44 +1051,44 @@ public abstract class ProviderApiManagerBase {
     }
 
     protected String getPersistedProviderCA(String providerDomain) {
-        return getFromPersistedProvider(CA_CERT, providerDomain, preferences);
+        return getFromPersistedProvider(CA_CERT, providerDomain);
     }
 
     protected String getPersistedProviderApiIp(String providerDomain) {
-        return getFromPersistedProvider(PROVIDER_API_IP, providerDomain, preferences);
+        return getFromPersistedProvider(PROVIDER_API_IP, providerDomain);
     }
 
     protected String getPersistedProviderIp(String providerDomain) {
-        return getFromPersistedProvider(PROVIDER_IP, providerDomain, preferences);
+        return getFromPersistedProvider(PROVIDER_IP, providerDomain);
     }
 
     protected String getPersistedGeoIp(String providerDomain) {
-        return getFromPersistedProvider(GEOIP_URL, providerDomain, preferences);
+        return getFromPersistedProvider(GEOIP_URL, providerDomain);
     }
 
     protected JSONObject getPersistedMotd(String providerDomain) {
         try {
-            return new JSONObject(getFromPersistedProvider(PROVIDER_MOTD, providerDomain, preferences));
+            return new JSONObject(getFromPersistedProvider(PROVIDER_MOTD, providerDomain));
         } catch (JSONException e) {
             return new JSONObject();
         }
     }
 
     protected long getPersistedMotdLastSeen(String providerDomain) {
-        return getLongFromPersistedProvider(PROVIDER_MOTD_LAST_SEEN, providerDomain, preferences);
+        return getLongFromPersistedProvider(PROVIDER_MOTD_LAST_SEEN, providerDomain);
     }
 
     protected long getPersistedMotdLastUpdate(String providerDomain) {
-        return getLongFromPersistedProvider(PROVIDER_MOTD_LAST_UPDATED, providerDomain, preferences);
+        return getLongFromPersistedProvider(PROVIDER_MOTD_LAST_UPDATED, providerDomain);
     }
 
     protected Set<String> getPersistedMotdHashes(String providerDomain) {
-        return getStringSetFromPersistedProvider(PROVIDER_MOTD_HASHES, providerDomain, preferences);
+        return getStringSetFromPersistedProvider(PROVIDER_MOTD_HASHES, providerDomain);
     }
 
 
     protected boolean hasUpdatedProviderDetails(String domain) {
-        return preferences.contains(Provider.KEY + "." + domain) && preferences.contains(CA_CERT + "." + domain);
+        return PreferenceHelper.hasKey(Provider.KEY + "." + domain) && PreferenceHelper.hasKey(CA_CERT + "." + domain);
     }
 
     /**
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupFailedDialog.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupFailedDialog.java
index 0d5f903f..338a60e9 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupFailedDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/ProviderSetupFailedDialog.java
@@ -143,7 +143,7 @@ public class ProviderSetupFailedDialog extends DialogFragment {
                     handleTorTimeoutError();
                 });
                 builder.setNeutralButton(R.string.retry_unobfuscated, ((dialog, id) -> {
-                    PreferenceHelper.useSnowflake(getContext(), false);
+                    PreferenceHelper.useSnowflake(false);
                     handleTorTimeoutError();
                 }));
             default:
@@ -189,7 +189,7 @@ public class ProviderSetupFailedDialog extends DialogFragment {
             interfaceWithConfigurationWizard = (DownloadFailedDialogInterface) context;
         } catch (ClassCastException e) {
             throw new ClassCastException(context.toString()
-                    + " must implement NoticeDialogListener");
+                    + " must implement DownloadFailedDialogInterface");
         }
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
index fdc482fd..1bf66d7d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
@@ -11,7 +11,6 @@ import static se.leap.bitmaskclient.tor.TorStatusObservable.getLastSnowflakeLog;
 import static se.leap.bitmaskclient.tor.TorStatusObservable.getLastTorLog;
 import static se.leap.bitmaskclient.tor.TorStatusObservable.getStringForCurrentStatus;
 
-import android.content.SharedPreferences;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
@@ -39,7 +38,6 @@ import java.util.Observer;
 import butterknife.BindView;
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.base.models.Provider;
-import se.leap.bitmaskclient.base.utils.PreferenceHelper;
 import se.leap.bitmaskclient.base.views.ProviderHeaderView;
 import se.leap.bitmaskclient.providersetup.TorLogAdapter;
 import se.leap.bitmaskclient.tor.TorStatusObservable;
@@ -54,7 +52,6 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity imple
 
     private static final String TAG = ConfigWizardBaseActivity.class.getName();
     public static final float GUIDE_LINE_COMPACT_DELTA = 0.1f;
-    protected SharedPreferences preferences;
 
     @BindView(R.id.header)
     ProviderHeaderView providerHeaderView;
@@ -133,7 +130,6 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity imple
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        preferences = PreferenceHelper.getSharedPreferences(this);
         provider = getIntent().getParcelableExtra(PROVIDER_KEY);
     }
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/CircumventionSetupFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/CircumventionSetupFragment.java
index 1bc12f57..2709fd0b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/CircumventionSetupFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/CircumventionSetupFragment.java
@@ -29,16 +29,16 @@ public class CircumventionSetupFragment extends BaseSetupFragment {
 
         binding.circumventionRadioGroup.setOnCheckedChangeListener((group, checkedId) -> {
             if (binding.rbCircumvention.getId() == checkedId) {
-                PreferenceHelper.useBridges(getContext(), true);
-                PreferenceHelper.useSnowflake(getContext(), true);
+                PreferenceHelper.useBridges(true);
+                PreferenceHelper.useSnowflake(true);
                 binding.tvCircumventionDetailDescription.setVisibility(View.VISIBLE);
                 binding.rbCircumvention.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
                 binding.rbPlainVpn.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
                 return;
             }
 
-            PreferenceHelper.useBridges(getContext(), false);
-            PreferenceHelper.useSnowflake(getContext(), false);
+            PreferenceHelper.useBridges(false);
+            PreferenceHelper.useSnowflake(false);
             binding.tvCircumventionDetailDescription.setVisibility(View.GONE);
             binding.rbPlainVpn.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
             binding.rbCircumvention.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
index 41e7cb8e..26f62042 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/fragments/ConfigureProviderFragment.java
@@ -72,7 +72,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Obse
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
         binding = FConfigureProviderBinding.inflate(inflater, container, false);
-        binding.detailContainer.setVisibility(PreferenceHelper.getUseSnowflake(getContext()) ? VISIBLE : GONE);
+        binding.detailContainer.setVisibility(PreferenceHelper.getUseSnowflake() ? VISIBLE : GONE);
         binding.detailHeaderContainer.setOnClickListener(v -> {
             binding.ivExpand.animate().setDuration(250).rotation(isExpanded ? -90 : 0);
             showConnectionDetails();
@@ -99,7 +99,7 @@ public class ConfigureProviderFragment extends BaseSetupFragment implements Obse
     public void onFragmentSelected() {
         super.onFragmentSelected();
         ignoreProviderAPIUpdates = false;
-        binding.detailContainer.setVisibility(PreferenceHelper.getUseSnowflake(getContext()) ? VISIBLE : GONE);
+        binding.detailContainer.setVisibility(PreferenceHelper.getUseSnowflake() ? VISIBLE : GONE);
         setupActivityCallback.setNavigationButtonHidden(true);
         setupActivityCallback.setCancelButtonHidden(false);
         ProviderAPICommand.execute(getContext(), SET_UP_PROVIDER, setupActivityCallback.getSelectedProvider());