first orphanize, then remove content

infeo · infeo · commit 9ed893e1a8d7 · 2023-08-09T12:56:59.000+02:00
diff --git a/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemImpl.java b/src/main/java/org/cryptomator/cryptofs/CryptoFileSystemImpl.java
@@ -630,11 +630,12 @@ private void moveDirectory(CryptoPath cleartextSource, CryptoPath cleartextTarge
 			} catch (NoSuchFileException e) {
 				targetCiphertextDirExists = false;
 			}
-			// cleanup dir to be replaced:
+			//delete dir link
+			Files.walkFileTree(ciphertextTarget.getRawPath(), DeletingFileVisitor.INSTANCE);
+			// cleanup content dir
 			if (targetCiphertextDirExists) {
 				Files.walkFileTree(targetCiphertextDirContentDir, DeletingFileVisitor.INSTANCE);
 			}
-			Files.walkFileTree(ciphertextTarget.getRawPath(), DeletingFileVisitor.INSTANCE);
 		}
 
 		// no exceptions until this point, so MOVE:

Original file line number	Diff line number	Diff line change
`@@ -630,11 +630,12 @@ private void moveDirectory(CryptoPath cleartextSource, CryptoPath cleartextTarge`
`630`	`630`	`} catch (NoSuchFileException e) {`
`631`	`631`	`targetCiphertextDirExists = false;`
`632`	`632`	`}`
`633`		`- // cleanup dir to be replaced:`
	`633`	`+ //delete dir link`
	`634`	`+ Files.walkFileTree(ciphertextTarget.getRawPath(), DeletingFileVisitor.INSTANCE);`
	`635`	`+ // cleanup content dir`
`634`	`636`	`if (targetCiphertextDirExists) {`
`635`	`637`	`Files.walkFileTree(targetCiphertextDirContentDir, DeletingFileVisitor.INSTANCE);`
`636`	`638`	`}`
`637`		`- Files.walkFileTree(ciphertextTarget.getRawPath(), DeletingFileVisitor.INSTANCE);`
`638`	`639`	`}`
`639`	`640`
`640`	`641`	`// no exceptions until this point, so MOVE:`