permanently delete logic

TeamAmaze · Dec 1, 2024 · b809edc · b809edc
1 parent f24f89b
commit b809edc
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 12 deletions.
diff --git a/app/src/main/java/com/amaze/filemanager/ui/ItemPopupMenu.java b/app/src/main/java/com/amaze/filemanager/ui/ItemPopupMenu.java
@@ -157,8 +157,19 @@ public boolean onMenuItemClick(MenuItem item) {
       case R.id.delete:
         ArrayList<LayoutElementParcelable> positions = new ArrayList<>();
         positions.add(rowItem);
-        GeneralDialogCreation.deleteFilesDialog(
-            context, mainActivity, positions, utilitiesProvider.getAppTheme());
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        boolean deletePermanently = sharedPreferences.getBoolean(
+                PreferencesConstants.PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION,
+                PreferencesConstants.DEFAULT_PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION
+        );
+        if (deletePermanently) {
+          Toast.makeText(context, context.getString(R.string.deleting), Toast.LENGTH_SHORT)
+                  .show();
+          mainActivity.mainActivityHelper.deleteFilesPermanently(positions);
+        } else {
+          GeneralDialogCreation.deleteFilesDialog(
+                  context, mainActivity, positions, utilitiesProvider.getAppTheme());
+        }
         return true;
       case R.id.restore:
         ArrayList<LayoutElementParcelable> p2 = new ArrayList<>();

diff --git a/app/src/main/java/com/amaze/filemanager/ui/fragments/TabFragment.java b/app/src/main/java/com/amaze/filemanager/ui/fragments/TabFragment.java
@@ -32,6 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.amaze.filemanager.R;
+import com.amaze.filemanager.adapters.data.LayoutElementParcelable;
 import com.amaze.filemanager.application.AppConfig;
 import com.amaze.filemanager.database.TabHandler;
 import com.amaze.filemanager.database.models.explorer.Tab;
@@ -59,6 +60,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.DecelerateInterpolator;
+import android.widget.Toast;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -506,11 +508,29 @@ private void initLeftAndRightDragListeners(boolean destroy) {
           new DragToTrashListener(
               () -> {
                 if (mainFragment != null) {
-                  GeneralDialogCreation.deleteFilesDialog(
-                      requireContext(),
-                      requireMainActivity(),
-                      mainFragment.adapter.getCheckedItems(),
-                      requireMainActivity().getAppTheme());
+                    SharedPreferences sharedPreferences =
+                            PreferenceManager.getDefaultSharedPreferences(requireContext());
+                    boolean deletePermanently = sharedPreferences.getBoolean(
+                            PreferencesConstants.PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION,
+                            PreferencesConstants.DEFAULT_PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION
+                    );
+                    if (deletePermanently) {
+                        Toast.makeText(
+                                requireContext(),
+                                requireContext().getString(R.string.deleting),
+                                Toast.LENGTH_SHORT
+                        ).show();
+                        requireMainActivity().mainActivityHelper.deleteFilesPermanently(
+                                mainFragment.adapter.getCheckedItems()
+                        );
+                    } else {
+                        GeneralDialogCreation.deleteFilesDialog(
+                                requireContext(),
+                                requireMainActivity(),
+                                mainFragment.adapter.getCheckedItems(),
+                                requireMainActivity().getAppTheme()
+                        );
+                    }
                 } else {
                   AppConfig.toast(requireContext(), getString(R.string.operation_unsuccesful));
                 }

diff --git a/app/src/main/java/com/amaze/filemanager/utils/MainActivityActionMode.kt b/app/src/main/java/com/amaze/filemanager/utils/MainActivityActionMode.kt
@@ -30,6 +30,7 @@ import android.widget.Toast
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.preference.PreferenceManager
 import com.amaze.filemanager.R
 import com.amaze.filemanager.adapters.data.LayoutElementParcelable
 import com.amaze.filemanager.fileoperations.filesystem.OpenMode
@@ -38,6 +39,7 @@ import com.amaze.filemanager.filesystem.PasteHelper
 import com.amaze.filemanager.filesystem.files.FileUtils
 import com.amaze.filemanager.ui.activities.MainActivity
 import com.amaze.filemanager.ui.dialogs.GeneralDialogCreation
+import com.amaze.filemanager.ui.fragments.preferencefragments.PreferencesConstants
 import com.amaze.filemanager.ui.selection.SelectionPopupMenu.Companion.invokeSelectionDropdown
 import java.io.File
 import java.lang.ref.WeakReference
@@ -237,12 +239,27 @@ class MainActivityActionMode(private val mainActivityReference: WeakReference<Ma
                     true
                 }
                 R.id.delete -> {
-                    GeneralDialogCreation.deleteFilesDialog(
-                        mainActivity,
-                        mainActivity,
-                        checkedItems,
-                        mainActivity.utilsProvider.appTheme,
+                    val sharedPreferences =
+                        PreferenceManager.getDefaultSharedPreferences(mainActivity)
+                    val deletePermanently = sharedPreferences.getBoolean(
+                        PreferencesConstants.PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION,
+                        PreferencesConstants.DEFAULT_PREFERENCE_DELETE_PERMANENTLY_WITHOUT_CONFIRMATION
                     )
+                    if (deletePermanently) {
+                        Toast.makeText(
+                            mainActivity,
+                            mainActivity.getString(R.string.deleting),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                        mainActivity.mainActivityHelper.deleteFilesPermanently(checkedItems)
+                    } else {
+                        GeneralDialogCreation.deleteFilesDialog(
+                            mainActivity,
+                            mainActivity,
+                            checkedItems,
+                            mainActivity.utilsProvider.appTheme,
+                        )
+                    }
                     true
                 }
                 R.id.restore -> {

diff --git a/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java b/app/src/main/java/com/amaze/filemanager/utils/MainActivityHelper.java
@@ -38,6 +38,7 @@
 
 import com.afollestad.materialdialogs.MaterialDialog;
 import com.amaze.filemanager.R;
+import com.amaze.filemanager.adapters.data.LayoutElementParcelable;
 import com.amaze.filemanager.application.AppConfig;
 import com.amaze.filemanager.asynchronous.asynctasks.DeleteTask;
 import com.amaze.filemanager.asynchronous.management.ServiceWatcherUtil;
@@ -685,6 +686,15 @@ public void deleteFiles(ArrayList<HybridFileParcelable> files, boolean doDeleteP
     else Toast.makeText(mainActivity, R.string.not_allowed, Toast.LENGTH_SHORT).show();
   }
 
+    public void deleteFilesPermanently(ArrayList<LayoutElementParcelable> files) {
+        final ArrayList<HybridFileParcelable> itemsToDelete = new ArrayList<>();
+        for (int i = 0; i < files.size(); i++) {
+            final LayoutElementParcelable layoutElement = files.get(i);
+            itemsToDelete.add(layoutElement.generateBaseFile());
+        }
+        deleteFiles(itemsToDelete, true);
+    }
+
   public void extractFile(@NonNull File file) {
     final File parent = file.getParentFile();
     if (parent == null) {