diff options
author | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-03-24 19:37:41 +0100 |
commit | 6954d5a4d7739b472ba74bacac76d30aa9e065c9 (patch) | |
tree | 86fddd58a06fb4d57a2f8cd34b017ed86969bdc0 /app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java | |
parent | fb4f332e4a0c669fa559aee0dba159b82c9d28c7 (diff) | |
parent | 9e5d0f1a2399787b1a57349e0e3b5ad596fcbf8f (diff) |
Merge branch 'bug/Clean-logs-and-indentation-#6810' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java index db432a82..369df1a3 100644 --- a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java +++ b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java @@ -1,6 +1,6 @@ /** * Copyright (c) 2013 LEAP Encryption Access Project and contributers - * + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -25,47 +25,50 @@ public class UserSessionStatus extends Observable { private static UserSessionStatus current_status; public enum SessionStatus { - LOGGED_IN, - LOGGED_OUT, - NOT_LOGGED_IN, - DIDNT_LOG_OUT, - LOGGING_IN, - LOGGING_OUT, + LOGGED_IN, + LOGGED_OUT, + NOT_LOGGED_IN, + DIDNT_LOG_OUT, + LOGGING_IN, + LOGGING_OUT, SIGNING_UP } private static SessionStatus session_status = SessionStatus.NOT_LOGGED_IN; - + public static UserSessionStatus getInstance() { - if(current_status == null) { - current_status = new UserSessionStatus(); - } - return current_status; + if (current_status == null) { + current_status = new UserSessionStatus(); + } + return current_status; } - private UserSessionStatus() { } + private UserSessionStatus() { + } private void sessionStatus(SessionStatus session_status) { - this.session_status = session_status; + this.session_status = session_status; } - public SessionStatus sessionStatus() { return session_status; } + public SessionStatus sessionStatus() { + return session_status; + } public boolean inProgress() { return session_status == SessionStatus.LOGGING_IN || session_status == SessionStatus.LOGGING_OUT; } - + public static void updateStatus(SessionStatus session_status) { - current_status = getInstance(); - current_status.sessionStatus(session_status); - current_status.setChanged(); - current_status.notifyObservers(); + current_status = getInstance(); + current_status.sessionStatus(session_status); + current_status.setChanged(); + current_status.notifyObservers(); } @Override public String toString() { - return User.userName() + " is " - + session_status.toString().toLowerCase().replaceAll("_", " "); + return User.userName() + " is " + + session_status.toString().toLowerCase().replaceAll("_", " "); } } |