Added file already existing error code

Author: gave92

Files/Filesystem/StorageFileHelpers/FilesystemResult.cs

@@ -17,8 +17,9 @@ public enum FilesystemErrorCode
         ERROR_NOTFOUND = 4,
         ERROR_INUSE = 8,
         ERROR_NAMETOOLONG = 16,
-        ERROR_NOTAFOLDER = 32,
-        ERROR_NOTAFILE = 64
+        ERROR_ALREADYEXIST = 32,
+        ERROR_NOTAFOLDER = 64,
+        ERROR_NOTAFILE = 128
     }
 
     public static class FilesystemErrorCodeExtensions
@@ -86,6 +87,10 @@ private static FilesystemErrorCode GetErrorCode(Exception ex, Type T = null)
                 return (T == typeof(StorageFolder) || T == typeof(StorageFolderWithPath)) ?
                     FilesystemErrorCode.ERROR_NOTAFOLDER : FilesystemErrorCode.ERROR_NOTAFILE;
             }
+            else if ((uint)ex.HResult == 0x800700B7)
+            {
+                return FilesystemErrorCode.ERROR_ALREADYEXIST;
+            }
             else if ((uint)ex.HResult == 0x800700A1 // The specified path is invalid (usually an mtp device was disconnected)
                 || (uint)ex.HResult == 0x8007016A // The cloud file provider is not running
                 || (uint)ex.HResult == 0x8000000A) // The data necessary to complete this operation is not yet available)

Files/Interacts/Interaction.cs

@@ -796,7 +796,7 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
                     renamed = await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(item.ItemPath)
                         .OnSuccess(t => t.RenameAsync(newName, NameCollisionOption.FailIfExists).AsTask());
                 }
-                if (renamed.ErrorCode == FilesystemErrorCode.ERROR_UNAUTHORIZED)
+                if (renamed == FilesystemErrorCode.ERROR_UNAUTHORIZED)
                 {
                     // Try again with MoveFileFromApp
                     if (!NativeDirectoryChangesHelper.MoveFileFromApp(item.ItemPath, Path.Combine(Path.GetDirectoryName(item.ItemPath), newName)))
@@ -805,24 +805,24 @@ public async Task<bool> RenameFileItem(ListedItem item, string oldName, string n
                         return false;
                     }
                 }
-                else if (renamed.ErrorCode == FilesystemErrorCode.ERROR_NOTAFILE || renamed.ErrorCode == FilesystemErrorCode.ERROR_NOTAFOLDER)
+                else if (renamed == FilesystemErrorCode.ERROR_NOTAFILE || renamed == FilesystemErrorCode.ERROR_NOTAFOLDER)
                 {
                     await DialogDisplayHelper.ShowDialog("RenameError.NameInvalid.Title".GetLocalized(), "RenameError.NameInvalid.Text".GetLocalized());
                 }
-                else if (renamed.ErrorCode == FilesystemErrorCode.ERROR_NAMETOOLONG)
+                else if (renamed == FilesystemErrorCode.ERROR_NAMETOOLONG)
                 {
                     await DialogDisplayHelper.ShowDialog("RenameError.TooLong.Title".GetLocalized(), "RenameError.TooLong.Text".GetLocalized());
                 }
-                else if (renamed.ErrorCode == FilesystemErrorCode.ERROR_INUSE)
+                else if (renamed == FilesystemErrorCode.ERROR_INUSE)
                 {
                     // TODO: proper dialog, retry
                     await DialogDisplayHelper.ShowDialog("FileInUseDeleteDialog/Title".GetLocalized(), "");
                 }
-                else if (renamed.ErrorCode == FilesystemErrorCode.ERROR_NOTFOUND)
+                else if (renamed == FilesystemErrorCode.ERROR_NOTFOUND)
                 {
                     await DialogDisplayHelper.ShowDialog("RenameError.ItemDeleted.Title".GetLocalized(), "RenameError.ItemDeleted.Text".GetLocalized());
                 }
-                else if (!renamed)
+                else if (renamed == FilesystemErrorCode.ERROR_ALREADYEXIST)
                 {
                     var ItemAlreadyExistsDialog = new ContentDialog()
                     {
@@ -913,7 +913,7 @@ await AssociatedInstance.FilesystemViewModel.GetFileFromPathAsync(iFilePath)
                         {
                             await DialogDisplayHelper.ShowDialog("FileNotFoundDialog/Title".GetLocalized(), "FileNotFoundDialog/Text".GetLocalized());
                         }
-                        else
+                        else if (restored.HasFlag(FilesystemErrorCode.ERROR_ALREADYEXIST))
                         {
                             await DialogDisplayHelper.ShowDialog("ItemAlreadyExistsDialogTitle".GetLocalized(), "ItemAlreadyExistsDialogContent".GetLocalized());
                         }