Remove root directory in file paths in diffs

UI/ViewModels/PatchDialogViewModel.cs

@@ -25,6 +25,9 @@ namespace pEp.UI.ViewModels
         private ConfigFile          _SelectedFile           = null;
         private FlowDocument        _VisibleDiff            = null;
 
+        private const string FILE_A_PREFIX = "---a";
+        private const string FILE_B_PREFIX = "+++b";
+
         #endregion
 
         #region Properties
@@ -289,12 +292,12 @@ namespace pEp.UI.ViewModels
             // The patch was created right now
             this.Dialog.Patch.CreationDate = DateTime.UtcNow;
 
-            // Concatenate all diffs from the selected files
-            this.Dialog.Patch.Diff = this.UnifyDiffs();
-
             // Get a common root URI of all diff files
             this.Dialog.Patch.Uri = this.GetRootUri();
 
+            // Concatenate all diffs from the selected files
+            this.Dialog.Patch.Diff = this.UnifyDiffs();
+
             // Close with result True.
             this.Close(true);
         }
@@ -363,7 +366,7 @@ namespace pEp.UI.ViewModels
              * => The modified part.
              * => Three unchanged lines (if available) after the modified part.
              */
-            string diff = $"---a/{ fileNameB }\n+++b/{ fileNameB }\n";
+            string diff = $"{ PatchDialogViewModel.FILE_A_PREFIX }/{ fileNameB }\n{ PatchDialogViewModel.FILE_B_PREFIX }/{ fileNameB }\n";
 
             SideBySideDiffModel sideBySideDiffModel = SideBySideDiffBuilder.Diff(fileA, fileB);
             List<DiffPiece> newLines = sideBySideDiffModel.NewText.Lines;
@@ -587,11 +590,16 @@ namespace pEp.UI.ViewModels
         {
             string diff = null;
 
+            // Concatenate diffs
             foreach (ConfigFile modifiedFile in this.ConfigFiles)
             {
                 diff += modifiedFile.Diff + "\n";
             }
 
+            // Remove root parts of URI
+            diff = diff.Replace(PatchDialogViewModel.FILE_A_PREFIX + "/" + this.Dialog.Patch.Uri, PatchDialogViewModel.FILE_A_PREFIX + "/");
+            diff = diff.Replace(PatchDialogViewModel.FILE_B_PREFIX + "/" + this.Dialog.Patch.Uri, PatchDialogViewModel.FILE_B_PREFIX + "/");
+
             return diff.TrimEnd('\n');
         }