From 5d47fde84a03acb1201f8650c55dc0cd981df679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 9 May 2014 09:19:03 +0200
Subject: Bump build number and version to 0.5.2RC1

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c6d0b3f..9aed1245 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="78"
+    android:versionName="0.5.2RC1" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3


From e50339824809da28beabfaf9ecea7414c131cbfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 29 May 2014 20:19:24 +0200
Subject: ics-openvpn receives ifconfig from the server.

Refactored AndroidManifest to include launchvpn and openvpnservice.

Imported changes from ics-openvpn-upstream
---
 app/src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c6d0b3f..ef26024d 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" />
@@ -54,7 +54,7 @@
         </receiver>
 	
         <activity
-            android:name="se.leap.openvpn.LaunchVPN"
+            android:name="de.blinkt.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
         </activity>
 
-- 
cgit v1.2.3


From c50b8ea6ed74e1313d888e366143a554ea1e73da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Wed, 4 Jun 2014 17:32:45 +0200
Subject: LogWindow declared in AndroidManifest.

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ef26024d..35a4cfcb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,6 +57,12 @@
             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"
-- 
cgit v1.2.3


From b1a7978a0a048321077fd8f0b0b65051ba498afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 12 Jun 2014 11:44:46 +0200
Subject: Disconnect from log window works.

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 35a4cfcb..51ce3e80 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -52,6 +52,10 @@
             <action android:name="android.intent.action.BOOT_COMPLETED" />
           </intent-filter>
         </receiver>
+
+        <activity
+                android:theme="@android:style/Theme.DeviceDefault.Light.Dialog"
+                android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
 	
         <activity
             android:name="de.blinkt.openvpn.LaunchVPN"
-- 
cgit v1.2.3


From 36247e71df88fa13c6c5a887de3b11d9a883615f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 13 Jun 2014 11:31:36 +0200
Subject: Disconnect works, eip status receiver.

Disconnect uses the ics-openvpn activity, and the dialog prompting the
user to confirm the disconnection is only shown when eip is connected or
is trying to connect.
---
 app/src/main/AndroidManifest.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 51ce3e80..860f0e1e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -53,6 +53,15 @@
           </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" />
-- 
cgit v1.2.3


From 3c0357f2b9f79a7e7f81a3d85e3b0cfe02c5477b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 13 Jun 2014 12:24:46 +0200
Subject: Bump build number and version - 0.5.2

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a4d32972..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="78"
-    android:versionName="0.5.2RC1" >
+    android:versionCode="79"
+    android:versionName="0.5.2" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-- 
cgit v1.2.3