diff options
author | cyberta <cyberta@riseup.net> | 2019-07-12 10:38:00 -0700 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2019-07-12 10:38:00 -0700 |
commit | 6c9a29082a8543991b8485c8613e7c586fed636f (patch) | |
tree | 3e6730b27eff129a54f6104c2dd2f487ffea2887 /app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java | |
parent | 144244cab15014d495985f396c618729209a8f8a (diff) | |
parent | 50667074dd6729eb47400273f4275ceba2457575 (diff) |
Merge branch 'improve_blocking_vpn' into 'master'
Improve blocking vpn
See merge request leap/bitmask_android!91
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java index f33bc27e..2efce9e4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java +++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java @@ -6,6 +6,9 @@ import android.content.Intent; import android.content.SharedPreferences; import android.util.Log; +import de.blinkt.openvpn.core.VpnStatus; +import se.leap.bitmaskclient.utils.PreferenceHelper; + import static android.content.Intent.ACTION_BOOT_COMPLETED; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; import static se.leap.bitmaskclient.Constants.EIP_IS_ALWAYS_ON; @@ -27,7 +30,7 @@ public class OnBootReceiver extends BroadcastReceiver { preferences = context.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE); boolean providerConfigured = !preferences.getString(PROVIDER_VPN_CERTIFICATE, "").isEmpty(); boolean startOnBoot = preferences.getBoolean(EIP_RESTART_ON_BOOT, false); - boolean isAlwaysOnConfigured = preferences.getBoolean(EIP_IS_ALWAYS_ON, false); + boolean isAlwaysOnConfigured = VpnStatus.isAlwaysOn(); Log.d("OpenVPN", "OpenVPN onBoot intent received. Provider configured? " + providerConfigured + " Start on boot? " + startOnBoot + " isAlwaysOn feature configured: " + isAlwaysOnConfigured); if (providerConfigured) { if (isAlwaysOnConfigured) { |