Code cleanup 2

files-community · Aug 13, 2021 · 11b0b54 · 11b0b54
1 parent b209d67
commit 11b0b54
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs b/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs
@@ -657,17 +657,19 @@ public async Task<ReturnResult> CopyItemAsync(IStorageItemWithPath source, strin
 
         public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory)
         {
+            if (!HasDraggedStorageItems(packageView))
+            {
+                // Happens if you copy some text and then you Ctrl+V in Files
+                return ReturnResult.BadArgumentException;
+            }
+
             var (handledByFtp, source) = await GetDraggedStorageItems(packageView);
+
             if (handledByFtp)
             {
                 // Not supported
                 return ReturnResult.Failed;
             }
-            if (!source.Any())
-            {
-                // Happens if you copy some text and then you Ctrl+V in Files
-                return ReturnResult.BadArgumentException;
-            }
 
             ReturnResult returnStatus = ReturnResult.InProgress;
 
@@ -680,6 +682,7 @@ public async Task<ReturnResult> RecycleItemsFromClipboard(DataPackageView packag
         public async Task<ReturnResult> CopyItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory)
         {
             var (handledByFtp, source) = await GetDraggedStorageItems(packageView);
+
             if (handledByFtp)
             {
                 var connection = await ServiceConnection;
@@ -899,17 +902,19 @@ public async Task<ReturnResult> MoveItemAsync(IStorageItemWithPath source, strin
 
         public async Task<ReturnResult> MoveItemsFromClipboard(DataPackageView packageView, string destination, bool showDialog, bool registerHistory)
         {
+            if (!HasDraggedStorageItems(packageView))
+            {
+                // Happens if you copy some text and then you Ctrl+V in Files
+                return ReturnResult.BadArgumentException;
+            }
+
             var (handledByFtp, source) = await GetDraggedStorageItems(packageView);
+
             if (handledByFtp)
             {
                 // Not supported
                 return ReturnResult.Failed;
             }
-            if (!source.Any())
-            {
-                // Happens if you copy some text and then you Ctrl+V in Files
-                return ReturnResult.BadArgumentException;
-            }
 
             ReturnResult returnStatus = ReturnResult.InProgress;