Merge branch 'develop' into release-0.5.2

1 files changed, 21 insertions, 2 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9aed1245..a4d32972 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.openvpn.OpenVpnService"
+            android:name="de.blinkt.openvpn.core.OpenVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE" >
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -52,11 +52,30 @@
             <action android:name="android.intent.action.BOOT_COMPLETED" />
           </intent-filter>
         </receiver>
+
+        <receiver
+            android:name="se.leap.bitmaskclient.EipStatusReceiver"
+            android:enabled="true"
+            android:permission="android.permission.ACCESS_NETWORK_STATE" >
+          <intent-filter>
+            <action android:name="de.blinkt.openvpn.VPN_STATUS" />
+          </intent-filter>
+        </receiver>
+	
+        <activity
+                android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
+                android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
 	
         <activity
-            android:name="se.leap.openvpn.LaunchVPN"
+            android:name="de.blinkt.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
         </activity>
+	
+        <activity
+            android:name="de.blinkt.openvpn.activities.LogWindow"
+            android:allowTaskReparenting="true"
+            android:label="@string/openvpn_log"
+            android:launchMode="singleTask" />
 
         <activity
             android:name="se.leap.bitmaskclient.Dashboard"