Merge branch 'post_release_work' into 'master'

post release tweaks and fixes

Closes #9150 and #8983

See merge request leap/bitmask_android!264

1 files changed, 2 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
index b258a100..9235daad 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/SetupActivity.java
@@ -3,7 +3,7 @@ package se.leap.bitmaskclient.providersetup.activities;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static androidx.appcompat.app.ActionBar.DISPLAY_SHOW_CUSTOM;
-import static se.leap.bitmaskclient.base.utils.ConfigHelper.isDefaultBitmask;
+import static se.leap.bitmaskclient.base.utils.BuildConfigHelper.isDefaultBitmask;
 import static se.leap.bitmaskclient.base.utils.PreferenceHelper.deleteProviderDetailsFromPreferences;
 import static se.leap.bitmaskclient.providersetup.fragments.SetupFragmentFactory.CONFIGURE_PROVIDER_FRAGMENT;
 import static se.leap.bitmaskclient.tor.TorStatusObservable.TorStatus.OFF;
@@ -100,7 +100,7 @@ public class SetupActivity extends AppCompatActivity implements SetupActivityCal
 
 
         // indicator views for VPN permission
-        Intent requestVpnPermission = VpnService.prepare(this);
+        Intent requestVpnPermission = VpnService.prepare(this.getApplicationContext());
         if (requestVpnPermission != null) {
             addIndicatorView(indicatorViews);
             addIndicatorView(indicatorViews);