From 38796aeb892379b8c2b7e4e1d7af00c4c050e8dc Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Thu, 23 Nov 2017 11:34:52 +0100
Subject: Add Splash StartActivity

* added Splash StartActivity to handle updates and initialization
* created global Constants
* renamed EIP Constants
---
 app/src/main/AndroidManifest.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8c6b25d5..16168e0f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,14 @@
             android:uiOptions="splitActionBarWhenNarrow"
             android:launchMode="singleTop"
             >
+        </activity>
+        <activity
+            android:name="se.leap.bitmaskclient.StartActivity"
+            android:label="@string/app_name"
+            android:launchMode="singleTop"
+            android:noHistory="true"
+            android:theme="@style/SplashTheme"
+            >
 
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.MAIN" />
-- 
cgit v1.2.3


From d835a9b8f38acf1970acc18ce2030f7d5f7377dd Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 28 Nov 2017 01:51:19 +0100
Subject: base for sidebar

---
 app/src/main/AndroidManifest.xml | 99 +++++++++++++++++++---------------------
 1 file changed, 47 insertions(+), 52 deletions(-)

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16168e0f..72d2ce54 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
      Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,38 +13,38 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
     android:versionCode="131"
-    android:versionName="0.9.7" >
+    android:versionName="0.9.7">
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="26" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-		     android:maxSdkVersion="18"/>
-
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="26"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="18" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".BitmaskApp"
         android:allowBackup="true"
         android:icon="@drawable/icon"
-        android:logo="@drawable/icon"
         android:label="@string/app_name"
-        android:theme="@style/blinkt">
-
+        android:logo="@drawable/icon"
+        android:theme="@style/AppTheme">
         <service
-            android:name="se.leap.bitmaskclient.eip.VoidVpnService"
+            android:name=".eip.VoidVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
             <intent-filter>
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-	
         <service
             android:name="de.blinkt.openvpn.core.OpenVPNService"
             android:permission="android.permission.BIND_VPN_SERVICE">
@@ -53,50 +52,42 @@
                 <action android:name="android.net.VpnService" />
             </intent-filter>
         </service>
-	<service android:name="se.leap.bitmaskclient.ProviderAPI" android:enabled="true"/>
-	
+        <service
+            android:name=".ProviderAPI"
+            android:enabled="true" />
+
         <receiver
-            android:name="se.leap.bitmaskclient.OnBootReceiver"
+            android:name=".OnBootReceiver"
             android:enabled="true"
-            android:permission="android.permission.RECEIVE_BOOT_COMPLETED" >
-          <intent-filter android:priority="999">
-            <action android:name="android.intent.action.BOOT_COMPLETED" />
-          </intent-filter>
+            android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
+            <intent-filter android:priority="999">
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
         </receiver>
 
-	<activity
-	    android:name="se.leap.bitmaskclient.eip.VoidVpnLauncher"
-	    android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-	
         <activity
-                android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
-	
+            android:name=".eip.VoidVpnLauncher"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
+        <activity android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
         <activity
             android:name="de.blinkt.openvpn.LaunchVPN"
-            android:label="@string/vpn_launch_title" >
-        </activity>
-	
+            android:label="@string/vpn_launch_title"></activity>
         <activity
             android:name="de.blinkt.openvpn.activities.LogWindow"
             android:allowTaskReparenting="true"
             android:label="@string/bitmask_log"
             android:launchMode="singleTask" />
-
         <activity
-            android:name="se.leap.bitmaskclient.Dashboard"
+            android:name=".Dashboard"
             android:label="@string/app_name"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:launchMode="singleTop"
-            >
-        </activity>
+            android:uiOptions="splitActionBarWhenNarrow"></activity>
         <activity
-            android:name="se.leap.bitmaskclient.StartActivity"
+            android:name=".StartActivity"
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:noHistory="true"
-            android:theme="@style/SplashTheme"
-            >
-
+            android:theme="@style/SplashTheme">
             <intent-filter android:label="@string/app_name">
                 <action android:name="android.intent.action.MAIN" />
 
@@ -104,22 +95,26 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="se.leap.bitmaskclient.ConfigurationWizard"
+            android:name=".ConfigurationWizard"
             android:label="@string/configuration_wizard_title"
-            android:uiOptions="splitActionBarWhenNarrow" >
-        </activity>
+            android:uiOptions="splitActionBarWhenNarrow"></activity>
         <activity
-            android:name="se.leap.bitmaskclient.AboutActivity"
-            android:label="@string/title_about_activity" >
-        </activity>
-        
-        <service android:name="se.leap.bitmaskclient.eip.EIP" android:exported="false">
+            android:name=".AboutActivity"
+            android:label="@string/title_about_activity"></activity>
+
+        <service
+            android:name=".eip.EIP"
+            android:exported="false">
             <intent-filter>
-                <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"/>
+                <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>
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main"></activity>
     </application>
 
-</manifest>
+</manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From 08ec840de9657085d9a0baaab54f6b33e16a12d0 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Thu, 14 Dec 2017 21:21:22 +0100
Subject: add LogFragment

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 72d2ce54..bf49b152 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,15 +68,9 @@
         <activity
             android:name=".eip.VoidVpnLauncher"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-        <activity android:name="de.blinkt.openvpn.activities.DisconnectVPN" />
         <activity
             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/bitmask_log"
-            android:launchMode="singleTask" />
         <activity
             android:name=".Dashboard"
             android:label="@string/app_name"
-- 
cgit v1.2.3


From 245982bdb6fda879827ab3c89617b8dd591fb7f4 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Mon, 8 Jan 2018 16:11:23 +0100
Subject: AboutActivity to AboutFragment

---
 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 cb4ceedd..43c31a88 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -94,8 +94,8 @@
             android:label="@string/configuration_wizard_title"
             android:uiOptions="splitActionBarWhenNarrow"></activity>
         <activity
-            android:name=".AboutActivity"
-            android:label="@string/title_about_activity"></activity>
+            android:name=".fragments.AboutFragment"
+            android:label="@string/about_fragment_title"></activity>
 
         <service
             android:name=".eip.EIP"
-- 
cgit v1.2.3


From 3addd20598f7fee2d41a24d64b375a2f63874457 Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 9 Jan 2018 14:02:57 +0100
Subject: create ProviderDetail Activity

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 43c31a88..8407d76d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -91,11 +91,11 @@
         </activity>
         <activity
             android:name=".ConfigurationWizard"
-            android:label="@string/configuration_wizard_title"
-            android:uiOptions="splitActionBarWhenNarrow"></activity>
+            android:label="@string/configuration_wizard_title" />
+
         <activity
-            android:name=".fragments.AboutFragment"
-            android:label="@string/about_fragment_title"></activity>
+            android:name=".ProviderDetailActivity"
+            android:label="@string/provider_details_title" />
 
         <service
             android:name=".eip.EIP"
-- 
cgit v1.2.3


From 8806e6ae477e0b20806851f5f8f3c0141a63ad9d Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 9 Jan 2018 19:54:57 +0100
Subject: create LoginActivity and SignUpActivity

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

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

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8407d76d..14ac77ef 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:logo="@drawable/icon"
-        android:theme="@style/AppTheme">
+        android:theme="@style/BitmaskTheme">
         <service
             android:name=".eip.VoidVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE">
@@ -71,12 +71,12 @@
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name="de.blinkt.openvpn.LaunchVPN"
-            android:label="@string/vpn_launch_title"></activity>
+            android:label="@string/vpn_launch_title" />
         <activity
             android:name=".Dashboard"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:uiOptions="splitActionBarWhenNarrow"></activity>
+            android:uiOptions="splitActionBarWhenNarrow" />
         <activity
             android:name=".StartActivity"
             android:label="@string/app_name"
@@ -89,6 +89,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main" />
+
         <activity
             android:name=".ConfigurationWizard"
             android:label="@string/configuration_wizard_title" />
@@ -97,6 +102,10 @@
             android:name=".ProviderDetailActivity"
             android:label="@string/provider_details_title" />
 
+        <activity android:name=".LoginActivity" />
+        <activity android:name=".SignupActivity"
+            android:theme="@style/BitmaskTheme"/>
+
         <service
             android:name=".eip.EIP"
             android:exported="false">
@@ -111,10 +120,6 @@
                 <action android:name="se.leap.bitmaskclient.EIP.IS_RUNNING"/>
             </intent-filter>
         </service>
-
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
-- 
cgit v1.2.3


From 4f536f457da8bb7ab0316f6de7703437ad0ce58f Mon Sep 17 00:00:00 2001
From: Fup Duck <fupduck@sacknagel.com>
Date: Tue, 16 Jan 2018 17:41:47 +0100
Subject: resolve commented issues

* recreate activity correctly after changing orientation
* replace getApplicationActivity
---
 app/src/main/AndroidManifest.xml | 3 ++-
 1 file changed, 2 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 279181cf..0a10b13c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -99,7 +99,8 @@
 
         <activity
             android:name=".ProviderDetailActivity"
-            android:label="@string/provider_details_title" />
+            android:label="@string/provider_details_title"
+            android:launchMode="singleTop" />
 
         <activity android:name=".LoginActivity" />
         <activity android:name=".SignupActivity"
-- 
cgit v1.2.3