From 50c2c3b2d97ec169dc1979e42a6d1eaec69fc628 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 23 Nov 2018 14:44:33 +0100 Subject: remove now unused password has changed in magic mode --- .../de/pixart/messenger/ui/EditAccountActivity.java | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 123f2ceb1..8e82f7520 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -108,11 +108,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat final String password = binding.accountPassword.getText().toString(); final boolean wasDisabled = mAccount != null && mAccount.getStatus() == Account.State.DISABLED; final boolean accountInfoEdited = accountInfoEdited(); - - if (!mInitMode && passwordChangedInMagicCreateMode()) { - gotoChangePassword(password); - return; - } if (mInitMode && mAccount != null) { mAccount.setOption(Account.OPTION_DISABLED, false); } @@ -467,11 +462,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat protected void updateSaveButton() { boolean accountInfoEdited = accountInfoEdited(); - - if (!mInitMode && passwordChangedInMagicCreateMode()) { - this.binding.saveButton.setText(R.string.change_password); - this.binding.saveButton.setEnabled(true); - } else if (accountInfoEdited && !mInitMode) { + if (accountInfoEdited && !mInitMode) { this.binding.saveButton.setText(R.string.save); this.binding.saveButton.setEnabled(true); } else if (mAccount != null @@ -530,14 +521,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat return !unmodified.equals(this.binding.accountJid.getText().toString()); } - protected boolean passwordChangedInMagicCreateMode() { - return mAccount != null - && mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE) - && !this.mAccount.getPassword().equals(binding.accountPassword.getText().toString()) - && !this.jidEdited() - && mAccount.isOnlineAndConnected(); - } - @Override protected String getShareableUri(boolean http) { if (mAccount != null) { -- cgit v1.2.3