From ca1cad6ec5b175a85b361c45e8d2c0cac0b405ec Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 7 Dec 2017 12:49:15 +0100 Subject: #8742 basic always-on implementation with blocking vpn if no profile is configured --- .../java/se/leap/bitmaskclient/OnBootReceiver.java | 43 ++++++++++++++++------ 1 file changed, 32 insertions(+), 11 deletions(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java') diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java index 9171e816..943e877a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java +++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java @@ -1,25 +1,46 @@ package se.leap.bitmaskclient; -import android.content.*; +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.util.Log; -import se.leap.bitmaskclient.eip.*; +import static se.leap.bitmaskclient.eip.Constants.IS_ALWAYS_ON; +import static se.leap.bitmaskclient.eip.Constants.RESTART_ON_BOOT; +import static se.leap.bitmaskclient.eip.Constants.VPN_CERTIFICATE; public class OnBootReceiver extends BroadcastReceiver { SharedPreferences preferences; - // Debug: am broadcast -a android.intent.action.BOOT_COMPLETED + + // Debug: su && am broadcast -a android.intent.action.BOOT_COMPLETED @Override public void onReceive(Context context, Intent intent) { preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE); - boolean provider_configured = !preferences.getString(Provider.KEY, "").isEmpty(); - boolean start_on_boot = preferences.getBoolean(Dashboard.START_ON_BOOT, false); - if (provider_configured && start_on_boot) { - Intent dashboard_intent = new Intent(context, Dashboard.class); - dashboard_intent.setAction(Constants.ACTION_START_EIP); - dashboard_intent.putExtra(Dashboard.ON_BOOT, true); - dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - context.startActivity(dashboard_intent); + boolean provider_configured = !preferences.getString(VPN_CERTIFICATE, "").isEmpty(); + boolean start_on_boot = preferences.getBoolean(RESTART_ON_BOOT, false); + boolean isAlwaysOnConfigured = preferences.getBoolean(IS_ALWAYS_ON, false); + Log.d("OpenVPN", "OpenVPN onBoot intent received. Provider configured? " + provider_configured + " Start on boot? " + start_on_boot + " isAlwaysOn feature configured: " + isAlwaysOnConfigured); + if (provider_configured) { + if (isAlwaysOnConfigured) { + //exit because the app is already setting up the vpn + return; + } + if (start_on_boot) { + Intent dashboard_intent = new Intent(context, Dashboard.class); + dashboard_intent.putExtra(RESTART_ON_BOOT, true); + dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(dashboard_intent); + } + } else { + if (isAlwaysOnConfigured) { + Intent dashboard_intent = new Intent(context, Dashboard.class); + dashboard_intent.putExtra(Dashboard.ACTION_CONFIGURE_ALWAYS_ON_PROFILE, true); + dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + context.startActivity(dashboard_intent); + } } } } -- cgit v1.2.3 From 63d806d5e7de82526d9376925dcb17dac819aa45 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 14 Dec 2017 14:12:05 +0100 Subject: #8742 cleanup camelCase --- app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java') diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java index 943e877a..70358580 100644 --- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java +++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java @@ -19,16 +19,16 @@ public class OnBootReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE); - boolean provider_configured = !preferences.getString(VPN_CERTIFICATE, "").isEmpty(); - boolean start_on_boot = preferences.getBoolean(RESTART_ON_BOOT, false); + boolean providerConfigured = !preferences.getString(VPN_CERTIFICATE, "").isEmpty(); + boolean startOnBoot = preferences.getBoolean(RESTART_ON_BOOT, false); boolean isAlwaysOnConfigured = preferences.getBoolean(IS_ALWAYS_ON, false); - Log.d("OpenVPN", "OpenVPN onBoot intent received. Provider configured? " + provider_configured + " Start on boot? " + start_on_boot + " isAlwaysOn feature configured: " + isAlwaysOnConfigured); - if (provider_configured) { + Log.d("OpenVPN", "OpenVPN onBoot intent received. Provider configured? " + providerConfigured + " Start on boot? " + startOnBoot + " isAlwaysOn feature configured: " + isAlwaysOnConfigured); + if (providerConfigured) { if (isAlwaysOnConfigured) { //exit because the app is already setting up the vpn return; } - if (start_on_boot) { + if (startOnBoot) { Intent dashboard_intent = new Intent(context, Dashboard.class); dashboard_intent.putExtra(RESTART_ON_BOOT, true); dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); -- cgit v1.2.3 From b60de97967b7a252762640a8917c24e4211df7c1 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Thu, 14 Dec 2017 14:32:46 +0100 Subject: #8742 fix lint issue in OnBootReceiver --- app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java') diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java index 70358580..b151f40a 100644 --- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java +++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java @@ -6,6 +6,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.util.Log; +import static android.content.Intent.ACTION_BOOT_COMPLETED; import static se.leap.bitmaskclient.eip.Constants.IS_ALWAYS_ON; import static se.leap.bitmaskclient.eip.Constants.RESTART_ON_BOOT; import static se.leap.bitmaskclient.eip.Constants.VPN_CERTIFICATE; @@ -14,10 +15,13 @@ public class OnBootReceiver extends BroadcastReceiver { SharedPreferences preferences; - // Debug: su && am broadcast -a android.intent.action.BOOT_COMPLETED @Override public void onReceive(Context context, Intent intent) { + //Lint complains if we're not checking the intent action + if (intent == null || !ACTION_BOOT_COMPLETED.equals(intent.getAction())) { + return; + } preferences = context.getSharedPreferences(Dashboard.SHARED_PREFERENCES, Context.MODE_PRIVATE); boolean providerConfigured = !preferences.getString(VPN_CERTIFICATE, "").isEmpty(); boolean startOnBoot = preferences.getBoolean(RESTART_ON_BOOT, false); -- cgit v1.2.3