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

guard the notification window from theoretical thread races

Browse Source 
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
This commit is contained in:
Armin Schrenk
2025-12-16 12:33:25 +01:00
parent 532cdf30ac
commit 0b2107309b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,8 @@ import org.cryptomator.cryptofs.event.FileIsInUseEvent;
import org.cryptomator.event.VaultEvent;
import org.cryptomator.ui.common.FxController;
import org.cryptomator.ui.fxapp.FxNotificationManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import javafx.beans.binding.Bindings;
@@ -25,6 +27,7 @@ import java.util.concurrent.ExecutorService;
@NotificationScoped
public class NotificationController implements FxController {
private static final Logger LOG = LoggerFactory.getLogger(NotificationController.class);
private static final String BUG_MSG = "IF YOU SEE THIS MESSAGE, PLEASE CONTACT THE DEVELOPERS OF CRYPTOMATOR ABOUT A BUG IN THE NOTIFICATION DISPLAY";
private final Stage window;
@@ -111,9 +114,15 @@ public class NotificationController implements FxController {
private void removeSelectedEvent() {
int i = selectionIndex.get();
var size = events.size();
if( i < 0 || i >= size) {
LOG.error("Selection index {} is out of bounds of list size {} during event removal. Closing Window.", i, size);
close();
}
events.remove(i);
if (events.isEmpty()) {
close(); //no more events
window.close(); //no more events
} else if (events.size() == i) {
selectionIndex.set(i - 1); //triggers event update
} else {