Various resilience fixes

docmalitt · Nov 18, 2024 · 3df5a1f · 3df5a1f
1 parent e763715
commit 3df5a1f
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 34 deletions.
diff --git a/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java b/app/src/main/java/io/xpipe/app/browser/file/BrowserFileSystemTabModel.java
@@ -113,7 +113,8 @@ public void close() {
             }
 
             var current = getCurrentDirectory();
-            if (DataStorage.get().getStoreEntries().contains(getEntry().get())
+            // We might close this after storage shutdown
+            if (DataStorage.get() != null && DataStorage.get().getStoreEntries().contains(getEntry().get())
                     && savedState != null
                     && current != null) {
                 savedState.cd(current.getPath(), false);

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
@@ -390,11 +390,13 @@ protected ContextMenu createContextMenu() {
                 .bind(Bindings.createBooleanBinding(
                         () -> {
                             return !getWrapper().getDeletable().get()
+                                    && AppPrefs.get().developerMode().getValue()
                                     && !AppPrefs.get()
                                             .developerDisableGuiRestrictions()
                                             .get();
                         },
                         getWrapper().getDeletable(),
+                        AppPrefs.get().developerMode(),
                         AppPrefs.get().developerDisableGuiRestrictions()));
         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
@@ -157,7 +157,7 @@ public synchronized void update() {
 
         busy.setValue(entry.getBusyCounter().get() != 0);
         deletable.setValue(entry.getConfiguration().isDeletable()
-                || AppPrefs.get().developerDisableGuiRestrictions().getValue());
+                || (AppPrefs.get().developerMode().getValue() && AppPrefs.get().developerDisableGuiRestrictions().getValue()));
         sessionActive.setValue(entry.getStore() instanceof SingletonSessionStore<?> ss
                 && entry.getStore() instanceof ShellStore
                 && ss.isSessionRunning());

diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java
@@ -1,5 +1,6 @@
 package io.xpipe.app.core;
 
+import io.xpipe.app.core.check.AppUserDirectoryCheck;
 import io.xpipe.app.issue.ErrorEvent;
 import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.prefs.AppPrefs;
@@ -121,6 +122,9 @@ public AppProperties() {
         autoAcceptEula = Optional.ofNullable(System.getProperty("io.xpipe.app.acceptEula"))
                 .map(Boolean::parseBoolean)
                 .orElse(false);
+
+        // We require the user dir from here
+        AppUserDirectoryCheck.check(dataDir);
         AppCache.setBasePath(dataDir.resolve("cache"));
         UUID id = AppCache.getNonNull("uuid", UUID.class, null);
         if (id == null) {

diff --git a/app/src/main/java/io/xpipe/app/core/check/AppUserDirectoryCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppUserDirectoryCheck.java
@@ -7,12 +7,11 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.Path;
 
 public class AppUserDirectoryCheck {
 
-    public static void check() {
-        var dataDirectory = AppProperties.get().getDataDir();
-
+    public static void check(Path dataDirectory) {
         try {
             FileUtils.forceMkdir(dataDirectory.toFile());
             var testDirectory = dataDirectory.resolve("permissions_check");

diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
@@ -115,7 +115,6 @@ private static void setup(String[] args) {
 
             TrackEvent.info("Initial setup");
             AppProperties.init();
-            AppUserDirectoryCheck.check();
             AppTempCheck.check();
             AppLogs.init();
             AppDebugModeCheck.printIfNeeded();

diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
@@ -133,12 +133,8 @@ public class AppPrefs {
             mapLocal(new SimpleBooleanProperty(false), "developerMode", Boolean.class, true);
     final BooleanProperty developerDisableUpdateVersionCheck =
             mapLocal(new SimpleBooleanProperty(false), "developerDisableUpdateVersionCheck", Boolean.class, false);
-    private final ObservableBooleanValue developerDisableUpdateVersionCheckEffective =
-            bindDeveloperTrue(developerDisableUpdateVersionCheck);
     final BooleanProperty developerDisableGuiRestrictions =
             mapLocal(new SimpleBooleanProperty(false), "developerDisableGuiRestrictions", Boolean.class, false);
-    private final ObservableBooleanValue developerDisableGuiRestrictionsEffective =
-            bindDeveloperTrue(developerDisableGuiRestrictions);
     final BooleanProperty developerForceSshTty =
             mapLocal(new SimpleBooleanProperty(false), "developerForceSshTty", Boolean.class, false);
 
@@ -276,24 +272,6 @@ public boolean isDevelopmentEnvironment() {
         return developerMode().getValue() && !ModuleHelper.isImage();
     }
 
-    private ObservableBooleanValue bindDeveloperTrue(ObservableBooleanValue o) {
-        return Bindings.createBooleanBinding(
-                () -> {
-                    return developerMode().getValue() && o.get();
-                },
-                o,
-                developerMode());
-    }
-
-    private ObservableBooleanValue bindDeveloperFalse(ObservableBooleanValue o) {
-        return Bindings.createBooleanBinding(
-                () -> {
-                    return !developerMode().getValue() && o.get();
-                },
-                o,
-                developerMode());
-    }
-
     public ObservableValue<ExternalPasswordManager> externalPasswordManager() {
         return passwordManager;
     }
@@ -488,15 +466,15 @@ public ObservableBooleanValue saveWindowLocation() {
     }
 
     public ObservableBooleanValue developerDisableUpdateVersionCheck() {
-        return developerDisableUpdateVersionCheckEffective;
+        return developerDisableUpdateVersionCheck;
     }
 
     public ObservableBooleanValue developerDisableGuiRestrictions() {
-        return developerDisableGuiRestrictionsEffective;
+        return developerDisableGuiRestrictions;
     }
 
     public ObservableBooleanValue developerForceSshTty() {
-        return bindDeveloperTrue(developerForceSshTty);
+        return developerForceSshTty;
     }
 
     @SuppressWarnings("unchecked")

diff --git a/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java b/core/src/main/java/io/xpipe/core/store/NetworkTunnelStore.java
@@ -42,7 +42,7 @@ default boolean requiresTunnel() {
         }
     }
 
-    default boolean isLocallyTunneable() {
+    default boolean isLocallyTunnelable() {
         NetworkTunnelStore current = this;
         while (true) {
             if (current.getNetworkParent() == null) {
@@ -58,7 +58,7 @@ default boolean isLocallyTunneable() {
     }
 
     default NetworkTunnelSession sessionChain(int local, int remotePort, String address) throws Exception {
-        if (!isLocallyTunneable()) {
+        if (!isLocallyTunnelable()) {
             throw new IllegalStateException(
                     "Unable to create tunnel chain as one intermediate system does not support tunneling");
         }

diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/CustomServiceStoreProvider.java
@@ -39,7 +39,7 @@ public GuiDialog guiDialog(DataStoreEntry entry, Property<DataStore> store) {
                         StoreChoiceComp.other(
                                 host,
                                 NetworkTunnelStore.class,
-                                n -> n.getStore().isLocallyTunneable(),
+                                n -> n.getStore().isLocallyTunnelable(),
                                 StoreViewState.get().getAllConnectionsCategory()),
                         host)
                 .nonNull()