mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-14 08:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show notification for fileIsInUseEvent

Browse Source
This commit is contained in:
Armin Schrenk
2025-12-12 13:29:46 +01:00
parent bf890d2165
commit 408c80744a
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/cryptomator/event/NotificationManager.java
View File

@@ -3,6 +3,7 @@ package org.cryptomator.event;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import org.cryptomator.common.vaults.Vault;
import org.cryptomator.cryptofs.event.FileIsInUseEvent;
import org.cryptomator.cryptofs.event.FilesystemEvent;
import javax.inject.Inject;
@@ -48,7 +49,7 @@ public class NotificationManager {
*/
public boolean offer(Vault v, FilesystemEvent e) {
return switch (e) {
//example: case BrokenFileNodeEvent bfne -> addEvent(v, bfne.ciphertextPath(), bfne);
case FileIsInUseEvent fiiue -> addEvent(v, fiiue.ciphertextPath(), fiiue);
default -> false;
};
}

19
src/main/java/org/cryptomator/ui/notification/NotificationController.java
View File

@@ -1,5 +1,6 @@
package org.cryptomator.ui.notification;
import org.cryptomator.cryptofs.event.FileIsInUseEvent;
import org.cryptomator.event.VaultEvent;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxNotificationManager;
@@ -18,6 +19,7 @@ import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
import javafx.stage.Stage;
import java.util.Objects;
import java.util.ResourceBundle;
import java.util.concurrent.ExecutorService;
@NotificationScoped
@@ -27,6 +29,7 @@ public class NotificationController implements FxController {
private final Stage window;
private final SimpleListProperty<VaultEvent> events;
private final ResourceBundle resourceBundle;
private final IntegerProperty selectionIndex;
private final ObservableStringValue paging;
private final ObjectProperty<VaultEvent> selectedEvent;
@@ -38,9 +41,10 @@ public class NotificationController implements FxController {
private final ExecutorService executorService;
@Inject
public NotificationController(@NotificationWindow Stage window, FxNotificationManager notificationManager, ExecutorService executorService) {
public NotificationController(@NotificationWindow Stage window, FxNotificationManager notificationManager, ExecutorService executorService, ResourceBundle resourceBundle) {
this.window = window;
this.events = new SimpleListProperty<>(notificationManager.getEventsRequiringNotification());
this.resourceBundle = resourceBundle;
this.selectionIndex = new SimpleIntegerProperty(-1);
this.selectedEvent = new SimpleObjectProperty<>();
this.singleEvent = events.sizeProperty().map(size -> size.intValue() == 1);
@@ -64,7 +68,6 @@ public class NotificationController implements FxController {
selectionIndex.setValue(0);
}
//TODO: Translations!
private void selectTexts(ObservableValue<? extends VaultEvent> observable, VaultEvent oldEvent, VaultEvent newEvent) {
if (newEvent == null) {
vaultName.set("");
@@ -74,9 +77,15 @@ public class NotificationController implements FxController {
return;
}
vaultName.set(newEvent.v().getDisplayName());
switch (newEvent.actualEvent()) {
case FileIsInUseEvent fiiue -> {
//TODO: Translations!
message.set("File is locked");
description.set("The file %s is locked by user %s. Ask the user to close the file. Otherwise, you can ignore the lock and open it anyway.".formatted(fiiue.cleartextPath(), fiiue.owner()));
actionText.set("Ignore Lock");
}
default -> {
vaultName.set(newEvent.v().getDisplayName());
message.set("NO CONTENT");
description.set(BUG_MSG);
actionText.set(null);
@@ -90,7 +99,9 @@ public class NotificationController implements FxController {
try {
var ev = selectedEvent.get();
switch (ev.actualEvent()) {
//TODO: executorService.submit(callback.action());
case FileIsInUseEvent fiiue -> {
executorService.submit(fiiue.ignoreMethod());
}
default -> {
} //normally nothing
}