summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/userstatus
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/userstatus')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java66
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java35
2 files changed, 51 insertions, 50 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
index bd9324bb..29d4f01d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
@@ -16,13 +16,19 @@
*/
package se.leap.bitmaskclient.userstatus;
-import android.app.*;
-import android.content.*;
-import android.os.*;
-import android.view.*;
-import android.widget.*;
-
-import butterknife.*;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import butterknife.ButterKnife;
+import butterknife.InjectView;
import se.leap.bitmaskclient.Provider;
import se.leap.bitmaskclient.R;
@@ -45,18 +51,18 @@ public class SessionDialog extends DialogFragment {
final public static String USERNAME = "username";
final public static String PASSWORD = "password";
- public static enum ERRORS {
+ public enum ERRORS {
USERNAME_MISSING,
PASSWORD_INVALID_LENGTH,
RISEUP_WARNING
}
@InjectView(R.id.user_message)
- TextView user_message;
+ TextView userMessage;
@InjectView(R.id.username_entered)
- EditText username_field;
+ EditText usernameField;
@InjectView(R.id.password_entered)
- EditText password_field;
+ EditText passwordField;
public static SessionDialog getInstance(Provider provider, Bundle arguments) {
SessionDialog dialog = new SessionDialog();
@@ -112,35 +118,35 @@ public class SessionDialog extends DialogFragment {
private void setUp(Bundle arguments) {
if (arguments.containsKey(ERRORS.PASSWORD_INVALID_LENGTH.toString()))
- password_field.setError(getString(R.string.error_not_valid_password_user_message));
+ passwordField.setError(getString(R.string.error_not_valid_password_user_message));
else if (arguments.containsKey(ERRORS.RISEUP_WARNING.toString())) {
- user_message.setVisibility(VISIBLE);
- user_message.setText(R.string.login_riseup_warning);
+ userMessage.setVisibility(VISIBLE);
+ userMessage.setText(R.string.login_riseup_warning);
}
if (arguments.containsKey(USERNAME)) {
String username = arguments.getString(USERNAME);
- username_field.setText(username);
+ usernameField.setText(username);
}
if (arguments.containsKey(ERRORS.USERNAME_MISSING.toString())) {
- username_field.setError(getString(R.string.username_ask));
+ usernameField.setError(getString(R.string.username_ask));
}
if (arguments.containsKey(getString(R.string.user_message))) {
- user_message.setText(arguments.getString(getString(R.string.user_message)));
- user_message.setVisibility(VISIBLE);
- } else if (user_message.getVisibility() != VISIBLE)
- user_message.setVisibility(View.GONE);
+ userMessage.setText(arguments.getString(getString(R.string.user_message)));
+ userMessage.setVisibility(VISIBLE);
+ } else if (userMessage.getVisibility() != VISIBLE)
+ userMessage.setVisibility(View.GONE);
- if (!username_field.getText().toString().isEmpty() && password_field.isFocusable())
- password_field.requestFocus();
+ if (!usernameField.getText().toString().isEmpty() && passwordField.isFocusable())
+ passwordField.requestFocus();
}
private String getEnteredUsername() {
- return username_field.getText().toString();
+ return usernameField.getText().toString();
}
private String getEnteredPassword() {
- return password_field.getText().toString();
+ return passwordField.getText().toString();
}
@@ -150,22 +156,22 @@ public class SessionDialog extends DialogFragment {
* @author parmegv
*/
public interface SessionDialogInterface {
- public void logIn(String username, String password);
+ void logIn(String username, String password);
- public void signUp(String username, String password);
+ void signUp(String username, String password);
}
SessionDialogInterface interface_with_Dashboard;
@Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
+ public void onAttach(Context context) {
+ super.onAttach(context);
try {
- interface_with_Dashboard = (SessionDialogInterface) activity.getFragmentManager().findFragmentById(R.id.user_status_fragment);;
+ interface_with_Dashboard = (SessionDialogInterface) ((AppCompatActivity) context).getSupportFragmentManager().getFragments().get(0);
} catch (ClassCastException e) {
- throw new ClassCastException(activity.toString()
+ throw new ClassCastException(context.toString()
+ " must implement LogInDialogListener");
}
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
index 14323f8e..0f1d0cdb 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
@@ -1,9 +1,8 @@
package se.leap.bitmaskclient.userstatus;
-import android.app.Activity;
-import android.app.Fragment;
+import android.content.Context;
import android.os.Bundle;
-import android.os.Handler;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -18,7 +17,7 @@ import java.util.Observer;
import butterknife.ButterKnife;
import butterknife.InjectView;
import butterknife.OnClick;
-import se.leap.bitmaskclient.Dashboard;
+import se.leap.bitmaskclient.MainActivity;
import se.leap.bitmaskclient.Provider;
import se.leap.bitmaskclient.ProviderAPI;
import se.leap.bitmaskclient.ProviderAPICommand;
@@ -28,7 +27,6 @@ import se.leap.bitmaskclient.R;
public class UserStatusFragment extends Fragment implements Observer, SessionDialog.SessionDialogInterface {
public static String TAG = UserStatusFragment.class.getSimpleName();
- private static Dashboard dashboard;
private ProviderAPIResultReceiver providerAPI_result_receiver;
@InjectView(R.id.user_status_username)
@@ -39,7 +37,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
Button button;
private UserStatus status;
- private boolean allows_registration = false;
+ private boolean allowsRegistration = false;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -65,25 +63,22 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
ButterKnife.inject(this, view);
Bundle arguments = getArguments();
- allows_registration = arguments.getBoolean(Provider.ALLOW_REGISTRATION);
+ allowsRegistration = arguments.getBoolean(Provider.ALLOW_REGISTRATION);
handleNewStatus(status);
return view;
}
@Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
- dashboard = (Dashboard) activity;
-
- providerAPI_result_receiver = new ProviderAPIResultReceiver(new Handler(), dashboard);
+ public void onAttach(Context context) {
+ super.onAttach(context);
}
public void restoreSessionStatus(Bundle savedInstanceState) {
if (savedInstanceState != null)
if (savedInstanceState.containsKey(UserStatus.TAG)) {
UserStatus.SessionStatus status = (UserStatus.SessionStatus) savedInstanceState.getSerializable(UserStatus.TAG);
- this.status.updateStatus(status, getResources());
+ UserStatus.updateStatus(status, getResources());
}
}
@@ -93,7 +88,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
if(status.isLoggedIn())
logOut();
else if(status.isLoggedOut())
- dashboard.sessionDialog(Bundle.EMPTY);
+ MainActivity.sessionDialog(Bundle.EMPTY);
else if(status.inProgress())
cancelLoginOrSignup();
}
@@ -102,7 +97,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
public void update(Observable observable, Object data) {
if (observable instanceof UserStatus) {
final UserStatus status = (UserStatus) observable;
- dashboard.runOnUiThread(new Runnable() {
+ getActivity().runOnUiThread(new Runnable() {
@Override
public void run() {
handleNewStatus(status);
@@ -113,7 +108,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
private void handleNewStatus(UserStatus status) {
this.status = status;
- if (allows_registration) {
+ if (allowsRegistration) {
if (this.status.inProgress())
showUserSessionProgressBar();
else
@@ -138,12 +133,12 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
private void updateButton() {
if(status.isLoggedIn() || status.didntLogOut())
- button.setText(dashboard.getString(R.string.logout_button));
- else if(allows_registration) {
+ button.setText(getActivity().getString(R.string.logout_button));
+ else if(allowsRegistration) {
if (status.isLoggedOut() || status.notLoggedIn())
- button.setText(dashboard.getString(R.string.login_button));
+ button.setText(getActivity().getString(R.string.login_button));
else if (status.inProgress())
- button.setText(dashboard.getString(android.R.string.cancel));
+ button.setText(getActivity().getString(android.R.string.cancel));
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 18:36:28 +0000