From 6dfae9951be275ccf33a05f4980a977b5b634e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Parm=C3=A9nides=20GV?= <parmegv@sdf.org>
Date: Thu, 19 Mar 2015 15:27:28 +0100
Subject: Don't show user session progress in the eip fragment

---
 app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java      | 1 +
 app/src/main/java/se/leap/bitmaskclient/Dashboard.java         | 6 +++---
 app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java | 3 ++-
 app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java    | 1 +
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
index 9ce0e99f..47451a70 100644
--- a/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/debug/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -143,6 +143,7 @@ public class ProviderAPI extends IntentService {
 		}
 	    }
 	} else if (action.equalsIgnoreCase(SIGN_UP)) {
+        UserSessionStatus.updateStatus(UserSessionStatus.SessionStatus.SIGNING_UP);
 	    Bundle result = tryToRegister(parameters);
 	    if(result.getBoolean(RESULT_KEY)) {
 		receiver.send(SUCCESSFUL_SIGNUP, result);
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index a8f6e110..c043821f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -291,18 +291,18 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn
     public void signUp(String username, String password) {
         User.setUserName(username);
 	Bundle parameters = bundlePassword(password);
-	providerApiCommand(parameters, R.string.signingup_message, ProviderAPI.SIGN_UP);
+	providerApiCommand(parameters, 0, ProviderAPI.SIGN_UP);
     }
 
     @Override
     public void logIn(String username, String password) {
         User.setUserName(username);
 	Bundle parameters = bundlePassword(password);
-	providerApiCommand(parameters, R.string.authenticating_message, ProviderAPI.LOG_IN);
+	providerApiCommand(parameters, 0, ProviderAPI.LOG_IN);
     }
 	
     public void logOut() {
-	providerApiCommand(Bundle.EMPTY, R.string.logout_message, ProviderAPI.LOG_OUT);
+	providerApiCommand(Bundle.EMPTY, 0, ProviderAPI.LOG_OUT);
     }
     
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
index f533819b..db432a82 100644
--- a/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
+++ b/app/src/main/java/se/leap/bitmaskclient/UserSessionStatus.java
@@ -30,7 +30,8 @@ public class UserSessionStatus extends Observable {
 	NOT_LOGGED_IN,
 	DIDNT_LOG_OUT,
 	LOGGING_IN,
-	LOGGING_OUT
+	LOGGING_OUT,
+        SIGNING_UP
     }
 
     private static SessionStatus session_status = SessionStatus.NOT_LOGGED_IN;
diff --git a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
index 184173b2..3117ea6f 100644
--- a/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
+++ b/app/src/release/java/se/leap/bitmaskclient/ProviderAPI.java
@@ -138,6 +138,7 @@ public class ProviderAPI extends IntentService {
 				}
 			}
 		} else if (action.equalsIgnoreCase(SIGN_UP)) {
+            UserSessionStatus.updateStatus(UserSessionStatus.SessionStatus.SIGNING_UP);
 		    Bundle result = tryToRegister(parameters);
 		    if(result.getBoolean(RESULT_KEY)) {
 			receiver.send(SUCCESSFUL_SIGNUP, result);
-- 
cgit v1.2.3