Fixes #3886

app/src/main/java/com/amaze/filemanager/adapters/RecyclerAdapter.java

@@ -47,6 +47,7 @@
 import com.amaze.filemanager.adapters.holders.SpecialViewHolder;
 import com.amaze.filemanager.application.AppConfig;
 import com.amaze.filemanager.fileoperations.filesystem.OpenMode;
+import com.amaze.filemanager.filesystem.PasteHelper;
 import com.amaze.filemanager.filesystem.files.CryptUtil;
 import com.amaze.filemanager.ui.ItemPopupMenu;
 import com.amaze.filemanager.ui.activities.superclasses.PreferenceActivity;
@@ -62,6 +63,7 @@
 import com.amaze.filemanager.ui.views.CircleGradientDrawable;
 import com.amaze.filemanager.utils.AnimUtils;
 import com.amaze.filemanager.utils.GlideConstants;
+import com.amaze.filemanager.utils.MainActivityActionMode;
 import com.amaze.filemanager.utils.Utils;
 import com.bumptech.glide.integration.recyclerview.RecyclerViewPreloader;
 import com.bumptech.glide.load.DataSource;
@@ -85,6 +87,7 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.PopupMenu;
+import android.widget.Toast;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
@@ -763,6 +766,20 @@ private void bindViewHolderList(@NonNull final ItemViewHolder holder, int positi
 
     holder.baseItemView.setOnLongClickListener(
         p1 -> {
+          MainActivityActionMode mainActivityActionMode =
+              mainFragment.getMainActivity().mainActivityActionMode;
+          PasteHelper pasteHelper = mainActivityActionMode.getPasteHelper();
+
+          if (pasteHelper != null
+              && pasteHelper.getSnackbar() != null
+              && pasteHelper.getSnackbar().isShown()) {
+            Toast.makeText(
+                    mainFragment.requireContext(),
+                    mainFragment.getString(R.string.complete_paste_warning),
+                    Toast.LENGTH_LONG)
+                .show();
+            return false;
+          }
           if (!isBackButton) {
             if (dragAndDropPreference == PreferencesConstants.PREFERENCE_DRAG_DEFAULT
                 || (dragAndDropPreference == PreferencesConstants.PREFERENCE_DRAG_TO_MOVE_COPY
@@ -976,6 +993,20 @@ private void bindViewHolderGrid(@NonNull final ItemViewHolder holder, int positi
 
     holder.baseItemView.setOnLongClickListener(
         p1 -> {
+          MainActivityActionMode mainActivityActionMode =
+              mainFragment.getMainActivity().mainActivityActionMode;
+          PasteHelper pasteHelper = mainActivityActionMode.getPasteHelper();
+
+          if (pasteHelper != null
+              && pasteHelper.getSnackbar() != null
+              && pasteHelper.getSnackbar().isShown()) {
+            Toast.makeText(
+                    mainFragment.requireContext(),
+                    mainFragment.getString(R.string.complete_paste_warning),
+                    Toast.LENGTH_LONG)
+                .show();
+            return false;
+          }
           if (!isBackButton) {
             if (dragAndDropPreference == PreferencesConstants.PREFERENCE_DRAG_DEFAULT
                 || (dragAndDropPreference == PreferencesConstants.PREFERENCE_DRAG_TO_MOVE_COPY
@@ -1366,6 +1397,21 @@ public boolean onResourceReady(
   }
 
   private void showPopup(@NonNull View view, @NonNull final LayoutElementParcelable rowItem) {
+
+    MainActivityActionMode mainActivityActionMode =
+        mainFragment.getMainActivity().mainActivityActionMode;
+    PasteHelper pasteHelper = mainActivityActionMode.getPasteHelper();
+
+    if (pasteHelper != null
+        && pasteHelper.getSnackbar() != null
+        && pasteHelper.getSnackbar().isShown()) {
+      Toast.makeText(
+              mainFragment.requireContext(),
+              mainFragment.getString(R.string.complete_paste_warning),
+              Toast.LENGTH_LONG)
+          .show();
+      return;
+    }
     Context currentContext = this.context;
     if (mainFragment.getMainActivity().getAppTheme().getSimpleTheme(mainFragment.requireContext())
         == AppTheme.BLACK) {

app/src/main/java/com/amaze/filemanager/asynchronous/asynctasks/movecopy/PrepareCopyTask.java

@@ -31,7 +31,6 @@
 import java.util.LinkedList;
 import java.util.Set;
 
-import com.afollestad.materialdialogs.DialogAction;
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.amaze.filemanager.R;
 import com.amaze.filemanager.asynchronous.asynctasks.TaskKt;
@@ -51,7 +50,6 @@
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.Toast;
 
 import androidx.annotation.IntDef;
@@ -88,6 +86,7 @@ public class PrepareCopyTask extends AsyncTask<Void, String, PrepareCopyTask.Cop
   private static final int UNKNOWN = -1;
   private static final int DO_NOT_REPLACE = 0;
   private static final int REPLACE = 1;
+  private boolean doRenaming = false;
 
   @IntDef({UNKNOWN, DO_NOT_REPLACE, REPLACE})
   @interface DialogState {}
@@ -227,7 +226,13 @@ private void showDialog(
     dialogBuilder.theme(mainActivity.get().getAppTheme().getMaterialDialogTheme(context.get()));
     dialogBuilder.title(context.get().getResources().getString(R.string.paste));
     dialogBuilder.positiveText(R.string.skip);
-    dialogBuilder.negativeText(R.string.overwrite);
+    if (filesToCopy.get(0).getParent(context.get()).equals(path)) {
+      doRenaming = true;
+      dialogBuilder.negativeText(
+          context.get().getString(R.string.rename)
+              + " & "
+              + context.get().getString(R.string.save));
+    } else dialogBuilder.negativeText(R.string.overwrite);
     dialogBuilder.neutralText(R.string.cancel);
     dialogBuilder.positiveColor(accentColor);
     dialogBuilder.negativeColor(accentColor);
@@ -245,10 +250,6 @@ private void showDialog(
 
     final MaterialDialog dialog = dialogBuilder.build();
     dialog.show();
-    if (filesToCopy.get(0).getParent(context.get()).equals(path)) {
-      View negative = dialog.getActionButton(DialogAction.NEGATIVE);
-      negative.setEnabled(false);
-    }
   }
 
   private void onEndDialog(
@@ -310,7 +311,15 @@ private void replaceFiles(
       String path,
       ArrayList<HybridFileParcelable> filesToCopy,
       ArrayList<HybridFileParcelable> conflictingFiles) {
-    if (counter < conflictingFiles.size()) {
+
+    if (doRenaming && dialogState != UNKNOWN) {
+      while (!conflictingFiles.isEmpty()) {
+        resolveByRenaming(filesToCopy, conflictingFiles);
+      }
+    } else if (doRenaming) {
+      resolveByRenaming(filesToCopy, conflictingFiles);
+      doRenaming = false;
+    } else if (counter < conflictingFiles.size()) {
       if (dialogState != UNKNOWN) {
         counter++;
       } else {
@@ -321,6 +330,29 @@ private void replaceFiles(
     onEndDialog(path, filesToCopy, conflictingFiles);
   }
 
+  private void resolveByRenaming(
+      ArrayList<HybridFileParcelable> filesToCopy,
+      ArrayList<HybridFileParcelable> conflictingFiles) {
+    int appendInt = 1;
+    String newName;
+    File targetFile;
+
+    int conflictingFileIndex = filesToCopy.indexOf(conflictingFiles.get(0));
+    String oldName = filesToCopy.get(conflictingFileIndex).getName();
+    do {
+      newName =
+          oldName.substring(0, oldName.lastIndexOf("."))
+              + "("
+              + appendInt
+              + ")"
+              + oldName.substring(oldName.lastIndexOf("."));
+      appendInt++;
+      targetFile = new File(path, newName);
+    } while (targetFile.exists());
+    filesToCopy.get(conflictingFileIndex).setName(newName);
+    conflictingFiles.remove(0);
+  }
+
   private void finishCopying(
       ArrayList<String> paths, ArrayList<ArrayList<HybridFileParcelable>> filesToCopyPerFolder) {
     for (int i = 0; i < filesToCopyPerFolder.size(); i++) {

app/src/main/java/com/amaze/filemanager/ui/activities/MainActivity.java

@@ -324,7 +324,7 @@ public class MainActivity extends PermissionsActivity
   public static final int REQUEST_CODE_CLOUD_LIST_KEY = 5472;
 
   private PasteHelper pasteHelper;
-  private MainActivityActionMode mainActivityActionMode;
+  public MainActivityActionMode mainActivityActionMode;
 
   private static final String DEFAULT_FALLBACK_STORAGE_PATH = "/storage/sdcard0";
   private static final String INTERNAL_SHARED_STORAGE = "Internal shared storage";

app/src/main/java/com/amaze/filemanager/utils/MainActivityActionMode.kt

@@ -49,6 +49,7 @@ class MainActivityActionMode(private val mainActivityReference: WeakReference<Ma
 
     var actionModeView: View? = null
     var actionMode: ActionMode? = null
+    var pasteHelper: PasteHelper? = null
 
     private fun hideOption(id: Int, menu: Menu) {
         val item = menu.findItem(id)
@@ -377,7 +378,7 @@ class MainActivityActionMode(private val mainActivityReference: WeakReference<Ma
                     // Making sure we don't cause an IllegalArgumentException
                     // when passing copies to PasteHelper
                     if (copies.isNotEmpty()) {
-                        val pasteHelper = PasteHelper(mainActivity, op, copies)
+                        pasteHelper = PasteHelper(mainActivity, op, copies)
                         mainActivity.paste = pasteHelper
                     }
                     mode.finish()

app/src/main/res/values/strings.xml

@@ -813,5 +813,6 @@ You only need to do this once, until the next time you select a new location for
     <string name="try_indexed_search">Try Indexed Search!</string>
     <string name="search_recent">Recent</string>
     <string name="results">Results</string>
+    <string name="complete_paste_warning">Please complete paste operation first</string>
 </resources>