From 8863066cdeca99be1e43c298d24fa658a1745119 Mon Sep 17 00:00:00 2001
From: Phillip Davis <phdavis1027@gmail.com>
Date: Wed, 8 Oct 2025 15:54:30 -0400
Subject: [PATCH] don't care abt old pw if didUnlock

---
 .../eu/siacs/conversations/ui/ChangePasswordActivity.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
index e6444915ff3ecd9a4b5f4aab4626d99d6e3852d9..efcd7cbb80d46ec0a2c23744f4901d45c6c1481c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -52,8 +52,10 @@ public class ChangePasswordActivity extends XmppActivity {
                     }
                     final String currentPassword = binding.currentPassword.getText().toString();
                     final String newPassword = binding.newPassword.getText().toString();
-                    if (!account.isOptionSet(Account.OPTION_MAGIC_CREATE)
-                            && !currentPassword.equals(account.getPassword())) {
+                    if (!(didUnlock
+                          || account.isOptionSet(Account.OPTION_MAGIC_CREATE)
+                          || currentPassword.equals(account.getPassword())
+                        )) {
                         binding.currentPassword.requestFocus();
                         binding.currentPasswordLayout.setError(
                                 getString(R.string.account_status_unauthorized));