prevent user from accidentally changing password after using magic create

1 files changed, 46 insertions, 11 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index d4b0172d..d6ea50fb 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -33,6 +33,8 @@ import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import android.util.Log;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -109,6 +111,13 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 		@Override
 		public void onClick(final View v) {
+			final String password = mPassword.getText().toString();
+			final String passwordConfirm = mPasswordConfirm.getText().toString();
+
+			if (!mInitMode && passwordChangedInMagicCreateMode()) {
+				gotoChangePassword(password);
+				return;
+			}
 			if (mInitMode && mAccount != null) {
 				mAccount.setOption(Account.OPTION_DISABLED, false);
 			}
@@ -173,8 +182,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				mAccountJid.requestFocus();
 				return;
 			}
-			final String password = mPassword.getText().toString();
-			final String passwordConfirm = mPasswordConfirm.getText().toString();
 			if (registerNewAccount) {
 				if (!password.equals(passwordConfirm)) {
 					mPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
@@ -183,6 +190,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				}
 			}
 			if (mAccount != null) {
+				if (mInitMode && mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE)) {
+					mAccount.setOption(Account.OPTION_MAGIC_CREATE, mAccount.getPassword().contains(password));
+				}
 				mAccount.setJid(jid);
 				mAccount.setPort(numericPort);
 				mAccount.setHostname(hostname);
@@ -330,7 +340,13 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	}
 
 	protected void updateSaveButton() {
-		if (accountInfoEdited() && !mInitMode) {
+		boolean accountInfoEdited = accountInfoEdited();
+
+		if (!mInitMode && passwordChangedInMagicCreateMode()) {
+			this.mSaveButton.setText(R.string.change_password);
+			this.mSaveButton.setEnabled(true);
+			this.mSaveButton.setTextColor(getPrimaryTextColor());
+		} else if (accountInfoEdited && !mInitMode) {
 			this.mSaveButton.setText(R.string.save);
 			this.mSaveButton.setEnabled(true);
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
@@ -349,7 +365,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			if (!mInitMode) {
 				if (mAccount != null && mAccount.isOnlineAndConnected()) {
 					this.mSaveButton.setText(R.string.save);
-					if (!accountInfoEdited()) {
+					if (!accountInfoEdited) {
 						this.mSaveButton.setEnabled(false);
 						this.mSaveButton.setTextColor(getSecondaryTextColor());
 					}
@@ -366,16 +382,28 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		if (this.mAccount == null) {
 			return false;
 		}
+		return jidEdited() ||
+				!this.mAccount.getPassword().equals(this.mPassword.getText().toString()) ||
+				!this.mAccount.getHostname().equals(this.mHostname.getText().toString()) ||
+				!String.valueOf(this.mAccount.getPort()).equals(this.mPort.getText().toString());
+	}
+
+	protected boolean jidEdited() {
 		final String unmodified;
 		if (Config.DOMAIN_LOCK != null) {
 			unmodified = this.mAccount.getJid().getLocalpart();
 		} else {
 			unmodified = this.mAccount.getJid().toBareJid().toString();
 		}
-		return !unmodified.equals(this.mAccountJid.getText().toString()) ||
-				!this.mAccount.getPassword().equals(this.mPassword.getText().toString()) ||
-				!this.mAccount.getHostname().equals(this.mHostname.getText().toString()) ||
-				!String.valueOf(this.mAccount.getPort()).equals(this.mPort.getText().toString());
+		return !unmodified.equals(this.mAccountJid.getText().toString());
+	}
+
+	protected boolean passwordChangedInMagicCreateMode() {
+		return mAccount != null
+				&& mAccount.isOptionSet(Account.OPTION_MAGIC_CREATE)
+				&& !this.mAccount.getPassword().equals(this.mPassword.getText().toString())
+				&& !this.jidEdited()
+				&& mAccount.isOnlineAndConnected();
 	}
 
 	@Override
@@ -582,9 +610,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				item.setChecked(!item.isChecked());
 				break;
 			case R.id.action_change_password_on_server:
-				final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
-				changePasswordIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toString());
-				startActivity(changePasswordIntent);
+				gotoChangePassword(null);
 				break;
 			case R.id.action_mam_prefs:
 				editMamPrefs();
@@ -602,6 +628,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		return super.onOptionsItemSelected(item);
 	}
 
+	private void gotoChangePassword(String newPassword) {
+		final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
+		changePasswordIntent.putExtra(EXTRA_ACCOUNT, mAccount.getJid().toString());
+		if (newPassword != null) {
+			changePasswordIntent.putExtra("password", newPassword);
+		}
+		startActivity(changePasswordIntent);
+	}
+
 	private void renewCertificate() {
 		KeyChain.choosePrivateKeyAlias(this, this, null, null, null, -1, null);
 	}