diff options
author | Christian S <christian@pix-art.de> | 2016-04-30 22:12:27 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-04-30 22:12:27 +0200 |
commit | 29e90eb24072a47cb4cc1ecd5c64f76a2a3cb28c (patch) | |
tree | 72d09d909a1c5149fc377065903bec9b653f57eb /src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | |
parent | b609e32813f640e7a1ab32e41e61f5461733d686 (diff) |
use old ChangePassword activity
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index d4ef40901..d924435d2 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -1,11 +1,9 @@ package eu.siacs.conversations.ui; -import android.content.Intent; import android.os.Bundle; import android.view.View; import android.widget.Button; import android.widget.EditText; -import android.widget.TextView; import android.widget.Toast; import eu.siacs.conversations.R; @@ -24,7 +22,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti final String currentPassword = mCurrentPassword.getText().toString(); final String newPassword = mNewPassword.getText().toString(); final String newPasswordConfirm = mNewPasswordConfirm.getText().toString(); - if (!mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) && !currentPassword.equals(mAccount.getPassword())) { + if (!currentPassword.equals(mAccount.getPassword())) { mCurrentPassword.requestFocus(); mCurrentPassword.setError(getString(R.string.account_status_unauthorized)); } else if (!newPassword.equals(newPasswordConfirm)) { @@ -45,7 +43,6 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti } } }; - private TextView mCurrentPasswordLabel; private EditText mCurrentPassword; private EditText mNewPassword; private EditText mNewPasswordConfirm; @@ -54,13 +51,7 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti @Override void onBackendConnected() { this.mAccount = extractAccount(getIntent()); - if (this.mAccount != null && this.mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE)) { - this.mCurrentPasswordLabel.setVisibility(View.GONE); - this.mCurrentPassword.setVisibility(View.GONE); - } else { - this.mCurrentPasswordLabel.setVisibility(View.VISIBLE); - this.mCurrentPassword.setVisibility(View.VISIBLE); - } + } @Override @@ -76,21 +67,12 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti }); this.mChangePasswordButton = (Button) findViewById(R.id.right_button); this.mChangePasswordButton.setOnClickListener(this.mOnChangePasswordButtonClicked); - this.mCurrentPasswordLabel = (TextView) findViewById(R.id.current_password_label); this.mCurrentPassword = (EditText) findViewById(R.id.current_password); this.mNewPassword = (EditText) findViewById(R.id.new_password); this.mNewPasswordConfirm = (EditText) findViewById(R.id.new_password_confirm); } @Override - protected void onStart() { - super.onStart(); - Intent intent = getIntent(); - String password = intent != null ? intent.getStringExtra("password") : ""; - this.mNewPassword.getEditableText().append(password); - } - - @Override public void onPasswordChangeSucceeded() { runOnUiThread(new Runnable() { @Override @@ -118,4 +100,4 @@ public class ChangePasswordActivity extends XmppActivity implements XmppConnecti public void refreshUiReal() { } -} +}
\ No newline at end of file |