From 99a4d94564635f0223d447bc9bcf081cadd8ff36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Tue, 2 Jul 2013 19:20:58 +0200
Subject: User messages are added to the new recovery dialog

When login is not successful, a new recovery dialog is prompted with a
message about the previous error.
---
 res/layout/log_in_dialog.xml | 7 +++++++
 res/values/strings.xml       | 8 +++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
index 6f28118d..4c9fdbad 100644
--- a/res/layout/log_in_dialog.xml
+++ b/res/layout/log_in_dialog.xml
@@ -6,6 +6,13 @@
     android:orientation="vertical"
     tools:context=".LogInDialog" >
 
+    <TextView
+        android:id="@+id/user_message"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
     <EditText
         android:id="@+id/username_entered"
         android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 83f614f9..c7ef6c2b 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -276,6 +276,13 @@
     <string name="use_anonymously_button">Use anonymously</string>
     <string name="username_ask">Introduce your username</string>
     <string name="password_ask">Enter your password</string>
+    <string name="user_message">User message</string>
+    <string name="error_bad_user_password_user_message">Not valid username and/or password.</string>
+    <string name="error_not_valid_password_user_message">Your password is not well-formed: it should have at least 8 characters.</string>
+    <string name="error_client_http_user_message">Try again: Client HTTP error</string>
+    <string name="error_io_exception_user_message">Try again: I/O error</string>
+    <string name="error_json_exception_user_message">Try again: Bad response from the server</string>
+    <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="danger_checkbox">Trust completely</string>
@@ -295,7 +302,6 @@
     <string name="server_is_down_message">Server is down.</string>
     <string name="malformed_url">It doesn\'t seem to be a LEAP provider.</string>
     <string name="certificate_error">This is not a trusted LEAP provider.</string>
-    <string name="not_valid_password_message">Your password is not well-formed: it should have at least 8 characters.</string>
     <string name="authenticating_title">Authenticating</string>
     <string name="authenticating_message">Authenticating with entered login and password.</string>
     <string name="logout_title">Log out</string>
-- 
cgit v1.2.3