From a42a2b8e5774e02e37ee7c7fed37e7e05a2ce3c8 Mon Sep 17 00:00:00 2001 From: Abdul Rauf Date: Thu, 26 Mar 2026 14:03:57 +0500 Subject: [PATCH 1/5] fixed #4583 --- .../asynctasks/movecopy/PreparePasteTask.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt index 7ee9cb13cb..cd8105aad6 100644 --- a/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt +++ b/app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PreparePasteTask.kt @@ -247,11 +247,8 @@ class PreparePasteTask(strongRefMain: MainActivity) { while (iterator.hasNext()) { val hybridFileParcelable = iterator.next() copyDialogBinding.fileNameText.text = hybridFileParcelable.name + dialogBuilder.cancelable(hybridFileParcelable.getParent(context.get()) == targetPath) val dialog = dialogBuilder.build() - if (hybridFileParcelable.getParent(context.get()) == targetPath) { - dialog.getActionButton(DialogAction.NEGATIVE) - .isEnabled = false - } val resultDeferred = CompletableDeferred() dialogBuilder.onPositive { _, _ -> resultDeferred.complete(DialogAction.POSITIVE) @@ -262,6 +259,13 @@ class PreparePasteTask(strongRefMain: MainActivity) { dialogBuilder.onNeutral { _, _ -> resultDeferred.complete(DialogAction.NEUTRAL) } + if (hybridFileParcelable.getParent(context.get()) == targetPath) { + dialog.setOnCancelListener { + resultDeferred.complete(DialogAction.NEUTRAL) + } + dialog.getActionButton(DialogAction.NEGATIVE) + .isEnabled = false + } dialog.show() when (resultDeferred.await()) { DialogAction.POSITIVE -> { From e4efa45829fcbc3c1750ec4f8d8f70e19d934f6f Mon Sep 17 00:00:00 2001 From: Abdul Rauf Date: Thu, 26 Mar 2026 14:11:30 +0500 Subject: [PATCH 2/5] Revert "#4354 fixed" This reverts commit 8e98ac7afad1249888d28094a67739bb52187dc6. --- .../java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java index 1a4e9be44a..a1f4dcad60 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java +++ b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java @@ -181,6 +181,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { ExtensionsKt.makeRequired(connectionTIL); ExtensionsKt.makeRequired(ipTIL); ExtensionsKt.makeRequired(usernameTIL); + ExtensionsKt.makeRequired(passwordTIL); conName.addTextChangedListener( new SimpleTextWatcher() { From aa0fae6bf11d3d3bf8f1ffeb09c7d537cb1384bb Mon Sep 17 00:00:00 2001 From: Abdul Rauf Date: Thu, 26 Mar 2026 14:11:37 +0500 Subject: [PATCH 3/5] Revert "Fix small error in SmbConnectDialog to pass the spotless" This reverts commit fbf82dd8c42cd850246bed638e37c52256d85c8f. --- .../java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java index a1f4dcad60..3f86bb6b45 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java +++ b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java @@ -347,7 +347,7 @@ public void afterTextChanged(@NonNull Editable s) { SmbFile smbFile; String domaind = domain.getText().toString(); if (chkSmbAnonymous.isChecked() - || (TextUtils.isEmpty(user.getText()) && TextUtils.isEmpty(pass.getText()))) + || (TextUtils.isEmpty(user.getText()) && TextUtils.isEmpty(pass.getText() ))) smbFile = createSMBPath(new String[] {ipa, "", "", domaind, sShare}, true, false); else { String useraw = user.getText().toString(); From b3358aed89424f4f4f8b2744f95dec0726843ee2 Mon Sep 17 00:00:00 2001 From: Abdul Rauf <41958538+abdulroufsidhu@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:14:45 +0500 Subject: [PATCH 4/5] Fix logical operator in SMB connection check --- .../java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java index 3f86bb6b45..a1f4dcad60 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java +++ b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java @@ -347,7 +347,7 @@ public void afterTextChanged(@NonNull Editable s) { SmbFile smbFile; String domaind = domain.getText().toString(); if (chkSmbAnonymous.isChecked() - || (TextUtils.isEmpty(user.getText()) && TextUtils.isEmpty(pass.getText() ))) + || (TextUtils.isEmpty(user.getText()) && TextUtils.isEmpty(pass.getText()))) smbFile = createSMBPath(new String[] {ipa, "", "", domaind, sShare}, true, false); else { String useraw = user.getText().toString(); From 3c1908bed4b32ac605d31f5f0836e4a9ecaea2d1 Mon Sep 17 00:00:00 2001 From: Abdul Rauf Date: Mon, 6 Apr 2026 12:37:07 +0500 Subject: [PATCH 5/5] Reapply "#4354 fixed" This reverts commit e4efa45829fcbc3c1750ec4f8d8f70e19d934f6f. --- .../java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java index a1f4dcad60..1a4e9be44a 100644 --- a/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java +++ b/app/src/main/java/com/amaze/filemanager/ui/dialogs/SmbConnectDialog.java @@ -181,7 +181,6 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { ExtensionsKt.makeRequired(connectionTIL); ExtensionsKt.makeRequired(ipTIL); ExtensionsKt.makeRequired(usernameTIL); - ExtensionsKt.makeRequired(passwordTIL); conName.addTextChangedListener( new SimpleTextWatcher() {