diff --git a/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java b/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java index 765c69034..9b1def5fd 100644 --- a/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java +++ b/app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java @@ -12,6 +12,7 @@ import io.xpipe.app.fxcomps.util.PlatformThread; import io.xpipe.app.update.UpdateAvailableAlert; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.Hyperlinks; + import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.Property; diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java index 1cd1257dc..59fec1092 100644 --- a/app/src/main/java/io/xpipe/app/core/App.java +++ b/app/src/main/java/io/xpipe/app/core/App.java @@ -6,9 +6,11 @@ import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.update.XPipeDistributionType; import io.xpipe.app.util.LicenseProvider; + import javafx.application.Application; import javafx.beans.binding.Bindings; import javafx.stage.Stage; + import lombok.Getter; import lombok.SneakyThrows; diff --git a/app/src/main/java/io/xpipe/app/core/AppIntegration.java b/app/src/main/java/io/xpipe/app/core/AppIntegration.java index 5759928b3..350e1c0d6 100644 --- a/app/src/main/java/io/xpipe/app/core/AppIntegration.java +++ b/app/src/main/java/io/xpipe/app/core/AppIntegration.java @@ -8,20 +8,22 @@ import io.xpipe.app.prefs.AppPrefs; import io.xpipe.app.util.ThreadHelper; import io.xpipe.core.process.OsType; -import javax.imageio.ImageIO; import java.awt.*; import java.awt.desktop.*; import java.util.List; +import javax.imageio.ImageIO; public class AppIntegration { - public static void setupDesktopIntegrations() { try { Desktop.getDesktop().addAppEventListener(new SystemSleepListener() { @Override public void systemAboutToSleep(SystemSleepEvent e) { - if (AppPrefs.get() != null && AppPrefs.get().lockVaultOnHibernation().get() && AppPrefs.get().getLockCrypt().get() != null && !AppPrefs.get().getLockCrypt().get().isBlank()) { + if (AppPrefs.get() != null + && AppPrefs.get().lockVaultOnHibernation().get() + && AppPrefs.get().getLockCrypt().get() != null + && !AppPrefs.get().getLockCrypt().get().isBlank()) { // If we run this at the same time as the system is sleeping, there might be exceptions // because the platform does not like being shut down while sleeping // This hopefully assures that it will be run later, probably on system wake @@ -33,9 +35,7 @@ public class AppIntegration { } @Override - public void systemAwoke(SystemSleepEvent e) { - - } + public void systemAwoke(SystemSleepEvent e) {} }); // This will initialize the toolkit on macos and create the dock icon @@ -92,5 +92,4 @@ public class AppIntegration { ErrorEvent.fromThrowable(ex).term().handle(); } } - } 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 index a89e9d847..5a81b2a7d 100644 --- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java +++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java @@ -13,7 +13,9 @@ import io.xpipe.app.util.XPipeSession; import io.xpipe.core.util.FailableRunnable; import io.xpipe.core.util.XPipeDaemonMode; import io.xpipe.core.util.XPipeInstallation; + import javafx.application.Platform; + import lombok.Getter; import java.util.ArrayList; diff --git a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java index eff309a36..86e98c7d4 100644 --- a/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/VaultCategory.java @@ -55,8 +55,9 @@ public class VaultCategory extends AppPrefsCategory { prefs.getLockCrypt()) .nameAndDescription("lockVaultOnHibernation") .addToggle(prefs.lockVaultOnHibernation) - .hide(prefs.getLockCrypt().isNull().or(prefs.getLockCrypt().isEmpty())) - ); + .hide(prefs.getLockCrypt() + .isNull() + .or(prefs.getLockCrypt().isEmpty()))); return builder.buildComp(); } } diff --git a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java index 2fad4284d..dfe276ae5 100644 --- a/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java +++ b/ext/base/src/main/java/io/xpipe/ext/base/browser/EditFileAction.java @@ -37,7 +37,8 @@ public class EditFileAction implements LeafAction { @Override public ObservableValue getName(OpenFileSystemModel model, List entries) { var e = AppPrefs.get().externalEditor().getValue(); - return AppI18n.observable("editWithEditor", e != null ? e.toTranslatedString().getValue() : "?"); + return AppI18n.observable( + "editWithEditor", e != null ? e.toTranslatedString().getValue() : "?"); } @Override