From b8087831f7db9fbc7806c58e632bda448b3b9e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 12 Nov 2014 03:44:14 +0100
Subject: More refactoring, fixed problems from previous commit.

---
 app/src/main/AndroidManifest.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d5081b8d..61f2a63b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         android:label="@string/app" >
 
         <service
-            android:name="se.leap.bitmaskclient.VoidVpnService"
+            android:name="se.leap.bitmaskclient.eip.VoidVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -62,7 +62,7 @@
         </receiver>
 
 	<activity
-	    android:name="se.leap.bitmaskclient.VoidVpnLauncher" />
+	    android:name="se.leap.bitmaskclient.eip.VoidVpnLauncher" />
         <activity
                 android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
                 android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
@@ -99,11 +99,11 @@
             android:label="@string/title_about_activity" >
         </activity>
         
-        <service android:name="se.leap.bitmaskclient.EIP" android:exported="false">
+        <service android:name="se.leap.bitmaskclient.eip.EIP" android:exported="false">
             <intent-filter>
-                <action android:name="se.leap.bitmaskclient.UPDATE_EIP_SERVICE"/>
-                <action android:name="se.leap.bitmaskclient.START_EIP"/>
-                <action android:name="se.leap.bitmaskclient.STOP_EIP"/>
+                <action android:name="se.leap.bitmaskclient.eip.UPDATE_EIP_SERVICE"/>
+                <action android:name="se.leap.bitmaskclient.eip.START_EIP"/>
+                <action android:name="se.leap.bitmaskclient.eip.STOP_EIP"/>
             </intent-filter>
         </service>
     </application>
-- 
cgit v1.2.3


From e4d4c07be386f809a8ac028df8146916fc0f7597 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 22 Nov 2014 00:10:46 +0100
Subject: EipStatus detects and notifies changes by itself.

Initial status message is "not connected", rather than "unknown".
---
 app/src/main/AndroidManifest.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/AndroidManifest.xml')

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 61f2a63b..7d1063ef 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -62,7 +62,9 @@
         </receiver>
 
 	<activity
-	    android:name="se.leap.bitmaskclient.eip.VoidVpnLauncher" />
+	    android:name="se.leap.bitmaskclient.eip.VoidVpnLauncher"
+	    android:theme="@android:style/Theme.NoDisplay" />
+	
         <activity
                 android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
                 android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
-- 
cgit v1.2.3