From 437183f283e61da878aded001fb78e8e62aa9da6 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 13:15:52 -0600
Subject: Use non-blocking logic for EIP switch Includes AlertDialog if the
 user attempts to stop EIP while a connection is being established

---
 res/values/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'res')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a178037..09819809 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,5 +314,9 @@
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    <string name="eip_cancel_connect_title">Cancel connection?</string>
+    <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
+    <string name="eip_cancel_connect_cancel">Yes</string>
+    <string name="eip_cancel_connect_false">No</string>
 
 </resources>
-- 
cgit v1.2.3


From f9131ce775b180cee3fa8ec1ac52290a7f58d1ef Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 18:26:31 -0600
Subject: Refactor EIP UI and control logic out of Dashboard into a Fragment

---
 res/layout/client_dashboard.xml     | 11 +-----
 res/layout/eip_overview.xml         | 76 -------------------------------------
 res/layout/eip_service_fragment.xml | 74 ++++++++++++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 86 deletions(-)
 delete mode 100644 res/layout/eip_overview.xml
 create mode 100644 res/layout/eip_service_fragment.xml

(limited to 'res')

diff --git a/res/layout/client_dashboard.xml b/res/layout/client_dashboard.xml
index 9d9b7a40..9f05cfbc 100644
--- a/res/layout/client_dashboard.xml
+++ b/res/layout/client_dashboard.xml
@@ -65,15 +65,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="0.11"
-        android:orientation="vertical" >
-
-        <ViewStub
-            android:id="@+id/eipOverviewStub"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:inflatedId="@+id/eipOverview"
-            android:layout="@layout/eip_overview" />
-
-    </LinearLayout>
+        android:orientation="vertical" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/eip_overview.xml b/res/layout/eip_overview.xml
deleted file mode 100644
index 738c82ef..00000000
--- a/res/layout/eip_overview.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="10dp" >
-
-    <TextView
-        android:id="@+id/eipLabel"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="10dp"
-        android:clickable="true"
-        android:onClick="toggleEipOverview"
-        android:text="@string/eip_service_label"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-    
-    <TextView
-        android:id="@+id/eipType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/eipLabel"
-        android:layout_marginLeft="10dp"
-        android:layout_marginBottom="10dp"
-        android:layout_toRightOf="@+id/eipLabel"
-        android:clickable="true"
-        android:onClick="toggleEipOverview"
-        android:text="@string/eip_type_active"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <Switch
-        android:id="@+id/eipSwitch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="10dp" />
-
-    <RelativeLayout
-        android:id="@+id/eipDetail"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/eipType"
-        android:paddingBottom="10dp"
-        android:paddingLeft="10dp"
-        android:paddingRight="10dp"
-        android:paddingTop="10dp"
-        android:visibility="gone" >
-
-        <ImageView
-            android:id="@+id/eipSettings"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_margin="10dp"
-            android:contentDescription="@string/eip_settings_button_description"
-            android:src="@drawable/ic_sysbar_quicksettings" />
-
-        <TextView
-            android:id="@+id/eipStatus"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:clickable="true"
-            android:onClick="showEIPLog"
-            android:text="@string/eip_status" />
-
-    </RelativeLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
new file mode 100644
index 00000000..8f7c1d22
--- /dev/null
+++ b/res/layout/eip_service_fragment.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/eipServiceFragment"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="10dp" >
+
+    <TextView
+        android:id="@+id/eipLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="10dp"
+        android:clickable="true"
+        android:text="@string/eip_service_label"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+    
+    <TextView
+        android:id="@+id/eipType"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/eipLabel"
+        android:layout_marginLeft="10dp"
+        android:layout_marginBottom="10dp"
+        android:layout_toRightOf="@+id/eipLabel"
+        android:clickable="true"
+        android:onClick="toggleEipOverview"
+        android:text="@string/eip_type_active"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+    <Switch
+        android:id="@+id/eipSwitch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="10dp" />
+
+    <RelativeLayout
+        android:id="@+id/eipDetail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/eipType"
+        android:paddingBottom="10dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="10dp"
+        android:visibility="gone" >
+
+        <ImageView
+            android:id="@+id/eipSettings"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_margin="10dp"
+            android:contentDescription="@string/eip_settings_button_description"
+            android:src="@drawable/ic_sysbar_quicksettings" />
+
+        <TextView
+            android:id="@+id/eipStatus"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:clickable="true"
+            android:text="@string/eip_status" />
+
+    </RelativeLayout>
+
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b19dc954b381c1e266395fdc1f19a1246096d4ab Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 10 Jul 2013 21:57:43 -0600
Subject: Add a progress bar while VPN connection is being established

---
 res/layout/eip_service_fragment.xml | 11 +++++++++++
 res/values/strings.xml              |  1 +
 2 files changed, 12 insertions(+)

(limited to 'res')

diff --git a/res/layout/eip_service_fragment.xml b/res/layout/eip_service_fragment.xml
index 8f7c1d22..885c78a3 100644
--- a/res/layout/eip_service_fragment.xml
+++ b/res/layout/eip_service_fragment.xml
@@ -36,6 +36,17 @@
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
         android:layout_marginRight="10dp" />
+    
+    <ProgressBar 
+        android:id="@+id/eipProgress"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@android:style/Widget.Holo.ProgressBar.Horizontal"
+        android:indeterminate="true"
+        android:visibility="gone"
+        android:layout_below="@id/eipLabel"
+        android:layout_marginLeft="15dp"
+        android:layout_marginRight="15dp" />
 
     <RelativeLayout
         android:id="@+id/eipDetail"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 09819809..cef7de1e 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -314,6 +314,7 @@
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="successful_authed_cert_downloaded_message">Your own cert has been correctly downloaded.</string>
     <string name="authed_cert_download_failed_message">Your own cert has incorrectly been downloaded.</string>
+    <string name="eip_status_start_pending">Initiating connection</string>
     <string name="eip_cancel_connect_title">Cancel connection?</string>
     <string name="eip_cancel_connect_text">There is a connection attempt in progress.  Do you wish to cancel it?</string>
     <string name="eip_cancel_connect_cancel">Yes</string>
-- 
cgit v1.2.3