mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-22 04:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/files-in-use

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Armin Schrenk
2025-10-15 17:20:37 +02:00
parent f5bd23de51 ad73b2f31d
commit bdc1cc3f05
55 changed files with 1105 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/cryptomator/common/EventMap.java
View File

@@ -155,7 +155,7 @@ public class EventMap implements ObservableMap<EventMap.EventKey, VaultEvent> {
case ConflictResolutionFailedEvent(_, _, Path conflictingCiphertext, _) -> conflictingCiphertext;
case BrokenDirFileEvent(_, Path ciphertext) -> ciphertext;
case BrokenFileNodeEvent(_, _, Path ciphertext) -> ciphertext;
case FileIsInUseEvent(_,_, Path ciphertext,_) -> ciphertext;
case FileIsInUseEvent(_, _, Path ciphertext, _, _, _) -> ciphertext;
};
return new EventKey(p, e.getClass());
}

2
src/main/java/org/cryptomator/event/FileSystemEventAggregator.java
View File

@@ -102,7 +102,7 @@ public class FileSystemEventAggregator {
case ConflictResolutionFailedEvent(_, _, Path conflictingCiphertext, _) -> conflictingCiphertext;
case BrokenDirFileEvent(_, Path ciphertext) -> ciphertext;
case BrokenFileNodeEvent(_, _, Path ciphertext) -> ciphertext;
case FileIsInUseEvent(_, _, Path ciphertext, _) -> ciphertext;
case FileIsInUseEvent(_, _, Path ciphertext, _, _, _) -> ciphertext;
};
return new FSEventBucket(v, p, event.getClass());
}

2
src/main/java/org/cryptomator/ui/eventview/EventViewController.java
View File

@@ -49,7 +49,7 @@ public class EventViewController implements FxController {
}
/**
* Comparison method for the lru cache. During comparsion the map is accessed.
* Comparison method for the lru cache. During comparison the map is accessed.
* First the entries are compared by the event timestamp, then vaultId, then identifying path and lastly by class name.
*
* @param left an entry of a {@link FSEventBucket} and its content

2
src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
View File

@@ -110,7 +110,7 @@ public class FxApplicationTerminator {
} else if (settings.autoCloseVaults.get() && !preventQuitWithGracefulLock.get()) {
var lockAllTask = vaultService.createLockAllTask(vaults.filtered(Vault::isUnlocked), false);
lockAllTask.setOnSucceeded(event -> {
LOG.info("Locked remaining vaults was succesful.");
LOG.info("Locked remaining vaults was successful.");
exitingResponse.performQuit();
});
lockAllTask.setOnFailed(event -> {

6
src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java
View File

@@ -102,6 +102,12 @@ public class VaultListContextMenuController implements FxController {
vaultService.reveal(vault);
}
@FXML
public void didClickShareVault() {
var vault = Objects.requireNonNull(selectedVault.get());
appWindows.showShareVaultWindow(vault);
}
// Getter and Setter
public ObservableValue<Boolean> selectedVaultUnlockableProperty() {