summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java3
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/StartActivity.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/User.java46
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatus.java127
4 files changed, 0 insertions, 178 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
index 961957d2..55a1da93 100644
--- a/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/ProviderCredentialsBaseActivity.java
@@ -46,7 +46,6 @@ import org.json.JSONException;
import butterknife.InjectView;
import butterknife.OnClick;
import se.leap.bitmaskclient.Constants.CREDENTIAL_ERRORS;
-import se.leap.bitmaskclient.userstatus.User;
import static android.text.TextUtils.isEmpty;
import static android.view.View.GONE;
@@ -250,14 +249,12 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
}
void login(String username, String password) {
- User.setUserName(username);
Bundle parameters = bundleUsernameAndPassword(username, password);
ProviderAPICommand.execute(this, LOG_IN, parameters, provider);
}
public void signUp(String username, String password) {
- User.setUserName(username);
Bundle parameters = bundleUsernameAndPassword(username, password);
ProviderAPICommand.execute(this, SIGN_UP, parameters, provider);
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
index d30b98a0..d8aca351 100644
--- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java
@@ -30,7 +30,6 @@ import java.lang.annotation.RetentionPolicy;
import de.blinkt.openvpn.core.VpnStatus;
import se.leap.bitmaskclient.eip.EipCommand;
-import se.leap.bitmaskclient.userstatus.User;
import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE;
import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT;
@@ -90,7 +89,6 @@ public class StartActivity extends Activity{
// initialize app necessities
VpnStatus.initLogCache(getApplicationContext().getCacheDir());
- User.init(getString(R.string.default_username));
prepareEIP();
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/User.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/User.java
deleted file mode 100644
index 64ce0629..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/User.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package se.leap.bitmaskclient.userstatus;
-
-import se.leap.bitmaskclient.LeapSRPSession;
-
-public class User {
- private static String user_name;
- private static User user;
-
- public static User init(String default_username) {
- if (user == null) {
- user = new User();
- user.setUserName(default_username);
- }
- return user;
- }
-
- public static void setUserName(String user_name) {
- User.user_name = user_name;
- }
-
- private User() { }
-
- public static String userName() {
- return user_name;
- }
-
- public static boolean loggedIn() {
- return LeapSRPSession.loggedIn();
- }
-}
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatus.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatus.java
deleted file mode 100644
index 90ad0ffd..00000000
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatus.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package se.leap.bitmaskclient.userstatus;
-
-import android.content.res.*;
-
-import java.util.*;
-
-import se.leap.bitmaskclient.R;
-
-public class UserStatus extends Observable {
- public static String TAG = UserStatus.class.getSimpleName();
- private static UserStatus current_status;
- private static Resources resources;
-
- public enum SessionStatus {
- LOGGED_IN,
- LOGGED_OUT,
- NOT_LOGGED_IN,
- DIDNT_LOG_OUT,
- LOGGING_IN,
- LOGGING_OUT,
- 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;
- else if(this == SessionStatus.SIGNING_UP)
- id = R.string.signingup_message;
-
- return resources.getString(id);
- }
- }
-
- private static SessionStatus session_status = SessionStatus.LOGGED_OUT;
-
- public static UserStatus getInstance(Resources resources) {
- if (current_status == null) {
- current_status = new UserStatus(resources);
- }
- return current_status;
- }
-
- private UserStatus(Resources resources) {
- UserStatus.resources = resources;
- }
-
- private void sessionStatus(SessionStatus session_status) {
- this.session_status = session_status;
- }
-
- public SessionStatus sessionStatus() {
- return session_status;
- }
-
- public boolean inProgress() {
- return session_status == SessionStatus.LOGGING_IN
- || session_status == SessionStatus.LOGGING_OUT;
- }
-
- public boolean isLoggedIn() {
- return session_status == SessionStatus.LOGGED_IN;
- }
-
- public boolean isLoggedOut() {
- return session_status == SessionStatus.LOGGED_OUT;
- }
-
- public boolean notLoggedIn() {
- return session_status == SessionStatus.NOT_LOGGED_IN;
- }
-
- public boolean didntLogOut() {
- return session_status == SessionStatus.DIDNT_LOG_OUT;
- }
-
- public static void updateStatus(SessionStatus session_status, Resources resources) {
- current_status = getInstance(resources);
- current_status.sessionStatus(session_status);
- current_status.setChanged();
- current_status.notifyObservers();
- }
-
- @Override
- public String toString() {
- String user_session_status = User.userName();
-
- String default_username = resources.getString(R.string.default_username, "");
- 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;
- }
-
- private String capitalize(String to_be_capitalized) {
- return to_be_capitalized.substring(0,1).toUpperCase() + to_be_capitalized.substring(1);
- }
-}