From 7f85600b13013d610baa039b30ea71bc4836f7e8 Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 22 Nov 2024 16:42:03 +0000 Subject: [PATCH] Various fixes --- app/build.gradle | 2 +- .../java/io/xpipe/app/comp/store/StoreEntryComp.java | 10 ++-------- .../io/xpipe/app/comp/store/StoreEntryWrapper.java | 4 +--- app/src/main/java/io/xpipe/app/prefs/AppPrefs.java | 6 ------ .../java/io/xpipe/app/prefs/DeveloperCategory.java | 2 -- .../main/java/io/xpipe/app/storage/DataStorage.java | 2 +- .../java/io/xpipe/app/storage/StandardStorage.java | 2 +- dist/licenses/sentry.properties | 2 +- 8 files changed, 7 insertions(+), 23 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6315ebe3b..28760a4e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -56,7 +56,7 @@ dependencies { exclude group: 'org.apache.commons', module: 'commons-lang3' } api 'org.apache.commons:commons-lang3:3.17.0' - api 'io.sentry:sentry:7.17.0' + api 'io.sentry:sentry:7.18.0' api 'commons-io:commons-io:2.18.0' api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.18.1" api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.18.1" diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java index 5ffa0d2d3..06527a2d8 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java @@ -386,15 +386,9 @@ protected ContextMenu createContextMenu() { del.disableProperty() .bind(Bindings.createBooleanBinding( () -> { - return !getWrapper().getDeletable().get() - && AppPrefs.get().developerMode().getValue() - && !AppPrefs.get() - .developerDisableGuiRestrictions() - .get(); + return !getWrapper().getDeletable().get(); }, - getWrapper().getDeletable(), - AppPrefs.get().developerMode(), - AppPrefs.get().developerDisableGuiRestrictions())); + getWrapper().getDeletable())); del.setOnAction(event -> getWrapper().delete()); contextMenu.getItems().add(del); diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java index af7482a29..dd82c699e 100644 --- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java +++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java @@ -156,9 +156,7 @@ public synchronized void update() { iconFile.setValue(entry.getEffectiveIconFile()); busy.setValue(entry.getBusyCounter().get() != 0); - deletable.setValue(entry.getConfiguration().isDeletable() - || (AppPrefs.get().developerMode().getValue() - && AppPrefs.get().developerDisableGuiRestrictions().getValue())); + deletable.setValue(entry.getConfiguration().isDeletable()); sessionActive.setValue(entry.getStore() instanceof SingletonSessionStore ss && entry.getStore() instanceof ShellStore && ss.isSessionRunning()); diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java index 691b46ee6..3d1c546a4 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java @@ -138,8 +138,6 @@ public class AppPrefs { mapLocal(new SimpleBooleanProperty(false), "developerMode", Boolean.class, true); final BooleanProperty developerDisableUpdateVersionCheck = mapLocal(new SimpleBooleanProperty(false), "developerDisableUpdateVersionCheck", Boolean.class, false); - final BooleanProperty developerDisableGuiRestrictions = - mapLocal(new SimpleBooleanProperty(false), "developerDisableGuiRestrictions", Boolean.class, false); final BooleanProperty developerForceSshTty = mapLocal(new SimpleBooleanProperty(false), "developerForceSshTty", Boolean.class, false); @@ -478,10 +476,6 @@ public ObservableBooleanValue developerDisableUpdateVersionCheck() { return developerDisableUpdateVersionCheck; } - public ObservableBooleanValue developerDisableGuiRestrictions() { - return developerDisableGuiRestrictions; - } - public ObservableBooleanValue developerForceSshTty() { return developerForceSshTty; } diff --git a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java index 9f77812a2..a0aa1b587 100644 --- a/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java @@ -63,8 +63,6 @@ protected Comp create() { .addToggle(prefs.developerDisableUpdateVersionCheck) .nameAndDescription("developerForceSshTty") .addToggle(prefs.developerForceSshTty) - .nameAndDescription("developerDisableGuiRestrictions") - .addToggle(prefs.developerDisableGuiRestrictions) .nameAndDescription("shellCommandTest") .addComp(runLocalCommand)) .buildComp(); diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java index b628e15f1..9f5441b8e 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java @@ -974,6 +974,6 @@ public DataStoreEntry getStoreEntry(UUID id) { } public DataStoreEntry local() { - return getStoreEntryIfPresent(LOCAL_ID).orElseThrow(() -> new IllegalStateException("Missing local machine connection")); + return getStoreEntryIfPresent(LOCAL_ID).orElseThrow(() -> new IllegalStateException("Missing local machine connection, restart is required to fix this")); } } diff --git a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java index 596310e63..40fb97aca 100644 --- a/app/src/main/java/io/xpipe/app/storage/StandardStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/StandardStorage.java @@ -243,7 +243,7 @@ public void load() { addStoreEntryIfNotPresent(entry1); }); }); - // Update validaties from synthetic parent I changes + // Update validaties from synthetic parent changes refreshEntries(); if (!hasFixedLocal) { diff --git a/dist/licenses/sentry.properties b/dist/licenses/sentry.properties index cbc0382eb..850d5ca63 100644 --- a/dist/licenses/sentry.properties +++ b/dist/licenses/sentry.properties @@ -1,4 +1,4 @@ name=Sentry Java -version=7.17.0 +version=7.18.0 license=MIT License link=https://github.com/getsentry/sentry-java \ No newline at end of file