1 files changed, 35 insertions, 9 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
index 9394e1b1..f9aa2660 100644
--- a/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
+++ b/app/src/main/java/se/leap/bitmaskclient/OnBootReceiver.java
@@ -1,7 +1,15 @@
 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 static android.content.Intent.ACTION_BOOT_COMPLETED;
+import static se.leap.bitmaskclient.Constants.EIP_IS_ALWAYS_ON;
+import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
+import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE;
 
 public class OnBootReceiver extends BroadcastReceiver {
 
@@ -10,15 +18,33 @@ public class OnBootReceiver extends BroadcastReceiver {
     // Debug: 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(Constants.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.EIP_ACTION_START);
-            dashboard_intent.putExtra(Dashboard.ON_BOOT, true);
-            dashboard_intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            context.startActivity(dashboard_intent);
+        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);
+        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 (startOnBoot) {
+                Intent dashboard_intent = new Intent(context, Dashboard.class);
+                dashboard_intent.putExtra(EIP_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);
+            }
         }
     }
 }