summaryrefslogtreecommitdiff
path: root/app/src/main/AndroidManifest.xml
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-06-13 13:24:13 +0200
committerParménides GV <parmegv@sdf.org>2014-06-13 13:24:13 +0200
commit69b10487fcd63dfe1e94fa97c9f3fd9b035646b4 (patch)
treed4960893a4444634d404c7fbe4fa3e8778d30179 /app/src/main/AndroidManifest.xml
parent9f6cfff38ae87922adc022300e1e2fd1c0d4c3e4 (diff)
parente45929e220fe49e30235a1d4d36c1a413547f8bf (diff)
Merge branch 'develop'
Diffstat (limited to 'app/src/main/AndroidManifest.xml')
-rw-r--r--app/src/main/AndroidManifest.xml27
1 files changed, 23 insertions, 4 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c6d0b3f..a2c2a82f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="se.leap.bitmaskclient"
- android:versionCode="77"
- android:versionName="0.5.1" >
+ android:versionCode="79"
+ android:versionName="0.5.2" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -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"