preselect plain vpn/cirucmvention selection from shared preferences

2 files changed, 5 insertions, 7 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
index 1168f957..b35a04cd 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/utils/PreferenceHelper.java
@@ -404,12 +404,6 @@ public class PreferenceHelper {
         }
     }
 
-    /**
-     * hasSnowflakePrefs should return always true with the new provider setup flow. We keep this preference
-     * only as long as we haven't ported the provider setup flow to the custom branded version
-     * @return
-     */
-    @Deprecated
     public static boolean hasSnowflakePrefs() {
         return hasKey(USE_SNOWFLAKE);
     }
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 2709fd0b..4a08bc4e 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
@@ -43,7 +43,11 @@ public class CircumventionSetupFragment extends BaseSetupFragment {
             binding.rbPlainVpn.setTypeface(Typeface.DEFAULT, Typeface.BOLD);
             binding.rbCircumvention.setTypeface(Typeface.DEFAULT, Typeface.NORMAL);
         });
-        binding.circumventionRadioGroup.check(binding.rbPlainVpn.getId());
+
+        int id = (PreferenceHelper.hasSnowflakePrefs() && PreferenceHelper.getUseSnowflake()) ?
+                binding.rbCircumvention.getId() :
+                binding.rbPlainVpn.getId();
+        binding.circumventionRadioGroup.check(id);
         return binding.getRoot();
     }