diff options
author | cyberta <cyberta@riseup.net> | 2020-07-25 11:24:39 -0700 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-07-25 11:24:39 -0700 |
commit | 32c0ca9f843f80fb3a6541fe1938a2cab1047483 (patch) | |
tree | fe2ad75030582894790be433dcc7f219e02f07b7 /app/src/main/java/se/leap/bitmaskclient/StartActivity.java | |
parent | e0123c8c5cd5f5def76810170b3d1202f5d8dbb3 (diff) | |
parent | c070390d6eca9b185ca8c409712c64d10bd68118 (diff) |
Merge branch 'upgrade_to_1.0.4' into 'master'
Upgrade to 1.0.4
See merge request leap/bitmask_android!111
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/StartActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/StartActivity.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java index dd4878f3..9937eeeb 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -31,6 +31,7 @@ import java.lang.annotation.RetentionPolicy; import de.blinkt.openvpn.core.VpnStatus; import se.leap.bitmaskclient.eip.EipCommand; +import se.leap.bitmaskclient.utils.PreferenceHelper; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT; @@ -143,6 +144,17 @@ public class StartActivity extends Activity{ } } + if (hasNewFeature(FeatureVersionCode.GEOIP_SERVICE)) { + // deletion of current configured provider so that the geoip url will picked out + // from the preseeded *.url file / geoipUrl buildconfigfield (build.gradle) during + // next setup + Provider provider = ProviderObservable.getInstance().getCurrentProvider(); + if (provider != null && !provider.isDefault()) { + PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain()); + ProviderObservable.getInstance().updateProvider(null); + } + } + // ensure all upgrades have passed before storing new information storeAppVersion(); } |