From 230ae10fb3a0c08cbd16e91fce041133bdf5ae8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Mon, 5 May 2014 16:06:53 +0200
Subject: New menu option: signup.

There is some problem in the maths, because the server says it's ok but
login doesn't work from Android app nor from webapp.
---
 app/src/main/res/menu/client_dashboard.xml | 13 ++++++++-----
 app/src/main/res/values/strings.xml        |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
index 676c07c7..d4e9c879 100644
--- a/app/src/main/res/menu/client_dashboard.xml
+++ b/app/src/main/res/menu/client_dashboard.xml
@@ -6,18 +6,21 @@
     <item
         android:id="@+id/switch_provider"
         android:orderInCategory="501"
-        android:title="@string/switch_provider_menu_option"/>  
+        android:title="@string/switch_provider_menu_option"/>
+    <item
+        android:id="@+id/signup_button"
+        android:showAsAction="ifRoom"
+        android:title="@string/signup_button"
+        android:visible="false"/>
     <item
         android:id="@+id/login_button"
         android:showAsAction="ifRoom"
         android:title="@string/login_button"
-        android:visible="false">
-    </item>
+        android:visible="false"/>
     <item
         android:id="@+id/logout_button"
         android:showAsAction="ifRoom"
         android:title="@string/logout_button"
-        android:visible="false">
-    </item>
+        android:visible="false"/>
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 492c48c7..5f0e2120 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -116,6 +116,7 @@
     <string name="error_no_such_algorithm_exception_user_message">Update the app</string>
     <string name="login_button">Log In</string>
     <string name="logout_button">Log Out</string>
+    <string name="signup_button">Sign Up</string>
     <string name="setup_error_title">Configuration Error</string>
     <string name="setup_error_configure_button">Configure</string>
     <string name="setup_error_close_button">Exit</string>
-- 
cgit v1.2.3


From daff611c70bb5e8b3bdc5f5c42bc776acb6e8e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 8 May 2014 11:33:34 +0200
Subject: Automatically log in.

Functionality copied to the Release build.
---
 app/src/main/res/values/strings.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f0e2120..ac692a69 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -127,6 +127,7 @@
     <string name="configuring_provider">Configuring provider</string>
     <string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
     <string name="authenticating_message">Logging in</string>
+    <string name="signingup_message">Signing up</string>
     <string name="logout_message">Logging out from this session.</string>
     <string name="log_out_failed_message">Didn\'t logged out.</string>
     <string name="succesful_authentication_message">Authentication succeeded.</string>
-- 
cgit v1.2.3


From de649fdd31f2d673de8eca9684ff5c66fbd53ef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 8 May 2014 12:08:47 +0200
Subject: Signup option in login dialog.

---
 app/src/main/res/menu/client_dashboard.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/menu/client_dashboard.xml b/app/src/main/res/menu/client_dashboard.xml
index d4e9c879..663231cd 100644
--- a/app/src/main/res/menu/client_dashboard.xml
+++ b/app/src/main/res/menu/client_dashboard.xml
@@ -9,7 +9,6 @@
         android:title="@string/switch_provider_menu_option"/>
     <item
         android:id="@+id/signup_button"
-        android:showAsAction="ifRoom"
         android:title="@string/signup_button"
         android:visible="false"/>
     <item
-- 
cgit v1.2.3