PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove now unused password has changed in magic mode

Browse source
This commit is contained in:
Daniel Gultsch 2018-11-21 11:55:29 +01:00
parent 5c74918a3a
commit 0381fe3c06
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -136,10 +136,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
final boolean wasDisabled = mAccount != null && mAccount.getStatus() == Account.State.DISABLED; final boolean wasDisabled = mAccount != null && mAccount.getStatus() == Account.State.DISABLED;
final boolean accountInfoEdited = accountInfoEdited(); final boolean accountInfoEdited = accountInfoEdited();
if (!mInitMode && passwordChangedInMagicCreateMode()) {
gotoChangePassword(password);
return;
}
if (mInitMode && mAccount != null) { if (mInitMode && mAccount != null) {
mAccount.setOption(Account.OPTION_DISABLED, false); mAccount.setOption(Account.OPTION_DISABLED, false);
} }
@ -450,10 +446,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
protected void updateSaveButton() { protected void updateSaveButton() {
boolean accountInfoEdited = accountInfoEdited(); boolean accountInfoEdited = accountInfoEdited();
if (!mInitMode && passwordChangedInMagicCreateMode()) { if (accountInfoEdited && !mInitMode) {
this.binding.saveButton.setText(R.string.change_password);
this.binding.saveButton.setEnabled(true);
} else if (accountInfoEdited && !mInitMode) {
this.binding.saveButton.setText(R.string.save); this.binding.saveButton.setText(R.string.save);
this.binding.saveButton.setEnabled(true); this.binding.saveButton.setEnabled(true);
} else if (mAccount != null } else if (mAccount != null
@ -512,14 +505,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
return !unmodified.equals(this.binding.accountJid.getText().toString()); return !unmodified.equals(this.binding.accountJid.getText().toString());
} }
protected boolean passwordChangedInMagicCreateMode() {
return mAccount != null
&& mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE)
&& !this.mAccount.getPassword().equals(this.binding.accountPassword.getText().toString())
&& !this.jidEdited()
&& mAccount.isOnlineAndConnected();
}
@Override @Override
protected String getShareableUri(boolean http) { protected String getShareableUri(boolean http) {
if (mAccount != null) { if (mAccount != null) {