From f8f636d90a1110554eda858420e5052e88a250b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Fri, 10 Apr 2015 10:39:51 +0200
Subject: Seems to work.

---
 .../se/leap/bitmaskclient/UserSessionStatus.java   | 37 +++++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java')

diff --git a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
index ee818635..d5d53b6f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
@@ -32,7 +32,26 @@ public class UserSessionStatus extends Observable {
         DIDNT_LOG_OUT,
         LOGGING_IN,
         LOGGING_OUT,
-        SIGNING_UP
+        SIGNING_UP;
+
+        @Override
+        public String toString() {
+            int id = 0;
+            if(this == SessionStatus.LOGGED_IN)
+                id = R.string.logged_in_user_status;
+            else if(this == SessionStatus.LOGGED_OUT)
+                id = R.string.logged_out_user_status;
+            else if(this == SessionStatus.NOT_LOGGED_IN)
+                id = R.string.not_logged_in_user_status;
+            else if(this == SessionStatus.DIDNT_LOG_OUT)
+                id = R.string.didnt_log_out_user_status;
+            else if(this == SessionStatus.LOGGING_IN)
+                id = R.string.logging_in_user_status;
+            else if(this == SessionStatus.LOGGING_OUT)
+                id = R.string.logging_out_user_status;
+
+            return resources.getString(id);
+        }
     }
 
     private static SessionStatus session_status = SessionStatus.NOT_LOGGED_IN;
@@ -70,10 +89,20 @@ public class UserSessionStatus extends Observable {
 
     @Override
     public String toString() {
-        String username = User.userName();
+        String user_session_status = User.userName();
+
+        String default_username = resources.getString(R.string.default_user, "");
+        if(user_session_status.isEmpty() && !default_username.equalsIgnoreCase("null")) user_session_status = default_username;
+        user_session_status += " " + session_status.toString();
+
+        user_session_status = user_session_status.trim();
+        if(User.userName().isEmpty())
+            user_session_status = capitalize(user_session_status);
+        return user_session_status;
+    }
 
-        return username + " " + conjugateToBe(username) + " "
-                + session_status.toString().toLowerCase().replaceAll("_", " ");
+    private String capitalize(String to_be_capitalized) {
+        return to_be_capitalized.substring(0,1).toUpperCase() + to_be_capitalized.substring(1);
     }
 
     private String conjugateToBe(String subject) {
-- 
cgit v1.2.3