Skip to content

Fix: Remove CryptoPaths from API #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2025
Merged

Fix: Remove CryptoPaths from API #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/org/cryptomator/cryptofs/event/BrokenFileNodeEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* Emitted, if a path within the cryptographic filesystem is accessed, but the directory representing it is missing identification files.
*
* @param timestamp timestamp of event appearance
* @param cleartextPath path within the cryptographic filesystem
* @param cleartextPath path (string) within the cryptographic filesystem
* @param ciphertextPath path of the incomplete, encrypted directory
* @see org.cryptomator.cryptofs.health.type.UnknownType
*/
public record BrokenFileNodeEvent(Instant timestamp, Path cleartextPath, Path ciphertextPath) implements FilesystemEvent {
public record BrokenFileNodeEvent(Instant timestamp, String cleartextPath, Path ciphertextPath) implements FilesystemEvent {

public BrokenFileNodeEvent(Path cleartextPath, Path ciphertextPath) {
this(Instant.now(), cleartextPath, ciphertextPath);
this(Instant.now(), cleartextPath.toString(), ciphertextPath);
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/cryptomator/cryptofs/event/ConflictResolutionFailedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
* Emitted, if the conflict resolution inside an encrypted directory failed
*
* @param timestamp timestamp of event appearance
* @param canonicalCleartextPath path of the canonical file within the cryptographic filesystem
* @param canonicalCleartextPath path (string) of the canonical file within the cryptographic filesystem
* @param conflictingCiphertextPath path of the encrypted, conflicting file
* @param reason exception, why the resolution failed
*/
public record ConflictResolutionFailedEvent(Instant timestamp, Path canonicalCleartextPath, Path conflictingCiphertextPath, Exception reason) implements FilesystemEvent {
public record ConflictResolutionFailedEvent(Instant timestamp, String canonicalCleartextPath, Path conflictingCiphertextPath, Exception reason) implements FilesystemEvent {

public ConflictResolutionFailedEvent(Path canonicalCleartextPath, Path conflictingCiphertextPath, Exception reason) {
this(Instant.now(), canonicalCleartextPath, conflictingCiphertextPath, reason);
this(Instant.now(), canonicalCleartextPath.toString(), conflictingCiphertextPath, reason);
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/cryptomator/cryptofs/event/ConflictResolvedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
* On successful conflict resolution the conflicting file is renamed to the <b>resolved</b> file
*
* @param timestamp timestamp of event appearance
* @param canonicalCleartextPath path of the canonical file within the cryptographic filesystem
* @param canonicalCleartextPath path (string) of the canonical file within the cryptographic filesystem
* @param conflictingCiphertextPath path of the encrypted, conflicting file
* @param resolvedCleartextPath path of the resolved file within the cryptographic filesystem
* @param resolvedCleartextPath path (string) of the resolved file within the cryptographic filesystem
* @param resolvedCiphertextPath path of the resolved, encrypted file
*/
public record ConflictResolvedEvent(Instant timestamp, Path canonicalCleartextPath, Path conflictingCiphertextPath, Path resolvedCleartextPath, Path resolvedCiphertextPath) implements FilesystemEvent {
public record ConflictResolvedEvent(Instant timestamp, String canonicalCleartextPath, Path conflictingCiphertextPath, String resolvedCleartextPath, Path resolvedCiphertextPath) implements FilesystemEvent {

public ConflictResolvedEvent(Path canonicalCleartextPath, Path conflictingCiphertextPath, Path resolvedCleartextPath, Path resolvedCiphertextPath) {
this(Instant.now(), canonicalCleartextPath, conflictingCiphertextPath, resolvedCleartextPath, resolvedCiphertextPath);
this(Instant.now(), canonicalCleartextPath.toString(), conflictingCiphertextPath, resolvedCleartextPath.toString(), resolvedCiphertextPath);
}

@Override
Expand Down