From c849913fba3f5b692309570415f85e9bdb8cceeb Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 22:54:56 -0700
Subject: Beginnings of a Dashboard Activity Matching layout and menu XML And
 don't forget strings

---
 res/menu/client_dashboard.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 res/menu/client_dashboard.xml

(limited to 'res/menu/client_dashboard.xml')

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
new file mode 100644
index 00000000..cafeb15e
--- /dev/null
+++ b/res/menu/client_dashboard.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/menu_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/menu_settings"/>
+    <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
+
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 4bcb53cff01cb13530e1011fb6d5ac105be1ba25 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Wed, 30 Jan 2013 23:10:26 -0700
Subject: Put some About love in the menu Needs attention, as the AboutFragment
 does not fill the layout You can still see providerLine Creates Issue #1592

---
 res/menu/client_dashboard.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/menu/client_dashboard.xml')

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index cafeb15e..87e7ae62 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -5,6 +5,7 @@
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/menu_settings"/>
+    <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
     <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 75728462433b19567710f54a9d4767681b10be95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 22 Apr 2013 18:07:07 +0200
Subject: Coded dialog (now there is a button in the Dashboard), time to test.

I need to implement bypass for dev.bitmask.net, because bitmask.net is
down.
---
 res/menu/client_dashboard.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/menu/client_dashboard.xml')

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index 87e7ae62..fffd4e23 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -7,5 +7,6 @@
         android:title="@string/menu_settings"/>
     <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
     <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
+    <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="true"></item>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 84a11bb1620d2b9080992427c847b58007f2304a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 9 May 2013 17:29:38 +0200
Subject: Log in and Log out options are shown only if allow registration is
 true.

Allow registration is present in provider.json.

Provider.json is downloaded from both preseeded and custom providers.

Authentication success or fail is notified correctly to the user.
---
 res/menu/client_dashboard.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'res/menu/client_dashboard.xml')

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index fffd4e23..a8eaf795 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -7,6 +7,7 @@
         android:title="@string/menu_settings"/>
     <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
     <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
-    <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="true"></item>
+    <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="false"></item>
+    <item android:id="@+id/logout_button" android:title="@string/logout_button" android:visible="false"></item>
 
 </menu>
\ No newline at end of file
-- 
cgit v1.2.3


From e3dd09bb37f6727a09a2d5da7c880997555b4d1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Sat, 29 Jun 2013 17:54:34 +0200
Subject: New menu option to go back to ConfigurationWizard.

It works ok (it simply starts ConfigurationWizard activity for result),
but when entering again to Dashboard a NullPointer happens in
serviceItemEIP(((ViewStub)
findViewById(R.id.eipOverviewStub)).inflate();).

It also adds (I forgot to commit before leaving the retry-login branch)
ProgressDialogs to login and logout operations.
---
 res/menu/client_dashboard.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'res/menu/client_dashboard.xml')

diff --git a/res/menu/client_dashboard.xml b/res/menu/client_dashboard.xml
index a8eaf795..55ad91b4 100644
--- a/res/menu/client_dashboard.xml
+++ b/res/menu/client_dashboard.xml
@@ -7,6 +7,7 @@
         android:title="@string/menu_settings"/>
     <item android:id="@+id/about_leap" android:title="@string/about" android:orderInCategory="110" />
     <item android:id="@+id/legacy_interface" android:title="ICS OpenVPN Interface" android:orderInCategory="500" />
+    <item android:id="@+id/switch_provider" android:title="@string/switch_provider_menu_option" android:orderInCategory="501"/>
     <item android:id="@+id/login_button" android:title="@string/login_button" android:visible="false"></item>
     <item android:id="@+id/logout_button" android:title="@string/logout_button" android:visible="false"></item>
 
-- 
cgit v1.2.3