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

Merge branch 'develop' into feature/restore-vaultconfig

Browse Source
This commit is contained in:
Armin Schrenk
2025-10-16 15:25:27 +02:00
committed by GitHub
parent 4bcf01270a 64466df6b8
commit afd2d74c90
79 changed files with 1148 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,6 +104,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() {