rename variables to CamelCase

2 files changed, 20 insertions, 20 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 d86da957..5c6355f5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
@@ -58,11 +58,11 @@ public class SessionDialog extends DialogFragment {
     }
 
     @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();
@@ -118,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();
     }
 
 
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 07c102e4..30a34de8 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java
@@ -37,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) {
@@ -63,7 +63,7 @@ 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;
@@ -108,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
@@ -134,7 +134,7 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia
     private void updateButton() {
         if(status.isLoggedIn() || status.didntLogOut())
             button.setText(getActivity().getString(R.string.logout_button));
-        else if(allows_registration) {
+        else if(allowsRegistration) {
             if (status.isLoggedOut() || status.notLoggedIn())
                 button.setText(getActivity().getString(R.string.login_button));
             else if (status.inProgress())