Avoiding pasting in same origin folder

Play-Store-Mauricio-Togneri · Oct 1, 2016 · 6749401 · 6749401
1 parent a46d0c9
commit 6749401
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/fragments/FolderFragment.java
@@ -165,7 +165,7 @@ private void updateButtonBar()
     {
         Clipboard clipboard = mainActivity.clipboard();
 
-        mainActivity.buttonBar().displayButtons(adapter.itemsSelected(), !adapter.allItemsSelected(), !clipboard.isEmpty());
+        mainActivity.buttonBar().displayButtons(adapter.itemsSelected(), !adapter.allItemsSelected(), !clipboard.isEmpty() && !clipboard.hasParent(folder()));
     }
 
     public String folderName()

diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/models/Clipboard.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/models/Clipboard.java
@@ -1,11 +1,12 @@
 package com.mauriciotogneri.fileexplorer.models;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public class Clipboard
 {
+    private File parent = null;
     private Mode mode = Mode.NONE;
     private List<FileInfo> items = new ArrayList<>();
 
@@ -32,12 +33,22 @@ public boolean isCopy()
 
     public void cut(List<FileInfo> items)
     {
+        if (!items.isEmpty())
+        {
+            parent = items.get(0).parent();
+        }
+
         mode = Mode.CUT;
         this.items = items;
     }
 
     public void copy(List<FileInfo> items)
     {
+        if (!items.isEmpty())
+        {
+            parent = items.get(0).parent();
+        }
+
         mode = Mode.COPY;
         this.items = items;
     }
@@ -66,6 +77,7 @@ public boolean paste(FileInfo target)
 
         items.clear();
         mode = Mode.NONE;
+        parent = null;
 
         return allPasted;
     }
@@ -74,4 +86,9 @@ public boolean isEmpty()
     {
         return items.isEmpty();
     }
+
+    public boolean hasParent(File parent)
+    {
+        return this.parent.compareTo(parent) == 0;
+    }
 }
diff --git a/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java b/app/src/main/java/com/mauriciotogneri/fileexplorer/models/FileInfo.java
@@ -162,6 +162,11 @@ public boolean delete()
         return file.delete();
     }
 
+    public File parent()
+    {
+        return file.getParentFile();
+    }
+
     public String name()
     {
         if (cachedName == null)