0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2025-03-02 14:02:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes

Browse source
This commit is contained in:
crschnick 2024-11-22 16:42:03 +00:00
parent 372dd155f6
commit 7f85600b13
8 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -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"

10
app/src/main/java/io/xpipe/app/comp/store/StoreEntryComp.java
View file

@ -386,15 +386,9 @@ public abstract class StoreEntryComp extends SimpleComp {
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);

4
app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
View file

@ -156,9 +156,7 @@ public class StoreEntryWrapper {
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());

6
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -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 class AppPrefs {
return developerDisableUpdateVersionCheck;
}
public ObservableBooleanValue developerDisableGuiRestrictions() {
return developerDisableGuiRestrictions;
}
public ObservableBooleanValue developerForceSshTty() {
return developerForceSshTty;
}

2
app/src/main/java/io/xpipe/app/prefs/DeveloperCategory.java
View file

@ -63,8 +63,6 @@ public class DeveloperCategory extends AppPrefsCategory {
.addToggle(prefs.developerDisableUpdateVersionCheck)
.nameAndDescription("developerForceSshTty")
.addToggle(prefs.developerForceSshTty)
.nameAndDescription("developerDisableGuiRestrictions")
.addToggle(prefs.developerDisableGuiRestrictions)
.nameAndDescription("shellCommandTest")
.addComp(runLocalCommand))
.buildComp();

2
app/src/main/java/io/xpipe/app/storage/DataStorage.java
View file

@ -974,6 +974,6 @@ public abstract class DataStorage {
}
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"));
}
}

2
app/src/main/java/io/xpipe/app/storage/StandardStorage.java
View file

@ -243,7 +243,7 @@ public class StandardStorage extends DataStorage {
addStoreEntryIfNotPresent(entry1);
});
});
// Update validaties from synthetic parent I changes
// Update validaties from synthetic parent changes
refreshEntries();
if (!hasFixedLocal) {

2
dist/licenses/sentry.properties vendored
View file

@ -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