1 files changed, 22 insertions, 7 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
index 23b4f2de..cec917f7 100644
--- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java
@@ -32,6 +32,9 @@ import java.lang.ref.WeakReference;
 import de.blinkt.openvpn.LaunchVPN;
 import se.leap.bitmaskclient.OnBootReceiver;
 
+import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT;
+import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE;
+import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY;
 import static se.leap.bitmaskclient.Constants.EIP_ACTION_CHECK_CERT_VALIDITY;
 import static se.leap.bitmaskclient.Constants.EIP_ACTION_IS_RUNNING;
 import static se.leap.bitmaskclient.Constants.EIP_ACTION_START;
@@ -127,9 +130,9 @@ public final class EIP extends IntentService {
         gateway = gatewaysManager.select();
         if (gateway != null && gateway.getProfile() != null) {
             launchActiveGateway();
-            tellToReceiver(EIP_ACTION_START, Activity.RESULT_OK);
+            tellToReceiverOrBroadcast(EIP_ACTION_START, Activity.RESULT_OK);
         } else
-            tellToReceiver(EIP_ACTION_START, Activity.RESULT_CANCELED);
+            tellToReceiverOrBroadcast(EIP_ACTION_START, Activity.RESULT_CANCELED);
     }
 
     /**
@@ -177,7 +180,7 @@ public final class EIP extends IntentService {
         if (eipStatus.isConnected() || eipStatus.isConnecting())
             resultCode = Activity.RESULT_OK;
 
-        tellToReceiver(EIP_ACTION_STOP, resultCode);
+        tellToReceiverOrBroadcast(EIP_ACTION_STOP, resultCode);
     }
 
     /**
@@ -190,7 +193,7 @@ public final class EIP extends IntentService {
         int resultCode = (eipStatus.isConnected()) ?
                 Activity.RESULT_OK :
                 Activity.RESULT_CANCELED;
-        tellToReceiver(EIP_ACTION_IS_RUNNING, resultCode);
+        tellToReceiverOrBroadcast(EIP_ACTION_IS_RUNNING, resultCode);
     }
 
     /**
@@ -201,7 +204,7 @@ public final class EIP extends IntentService {
         eipDefinition = eipDefinitionFromPreferences();
         if (eipDefinition.length() > 0)
             updateGateways();
-        tellToReceiver(EIP_ACTION_UPDATE, Activity.RESULT_OK);
+        tellToReceiverOrBroadcast(EIP_ACTION_UPDATE, Activity.RESULT_OK);
     }
 
     private JSONObject eipDefinitionFromPreferences() {
@@ -241,14 +244,26 @@ public final class EIP extends IntentService {
         int resultCode = validator.isValid() ?
                 Activity.RESULT_OK :
                 Activity.RESULT_CANCELED;
-        tellToReceiver(EIP_ACTION_CHECK_CERT_VALIDITY, resultCode);
+        tellToReceiverOrBroadcast(EIP_ACTION_CHECK_CERT_VALIDITY, resultCode);
     }
 
-    private void tellToReceiver(String action, int resultCode) {
+    private void tellToReceiverOrBroadcast(String action, int resultCode) {
         Bundle resultData = new Bundle();
         resultData.putString(EIP_REQUEST, action);
         if (mReceiverRef.get() != null) {
             mReceiverRef.get().send(resultCode, resultData);
+        } else {
+            broadcastEvent(resultCode, resultData);
         }
     }
+
+    private void broadcastEvent(int resultCode , Bundle resultData) {
+        Intent intentUpdate = new Intent(BROADCAST_EIP_EVENT);
+        intentUpdate.addCategory(Intent.CATEGORY_DEFAULT);
+        intentUpdate.putExtra(BROADCAST_RESULT_CODE, resultCode);
+        intentUpdate.putExtra(BROADCAST_RESULT_KEY, resultData);
+        Log.d(TAG, "sending broadcast");
+        sendBroadcast(intentUpdate);
+    }
+
 }