diff --git a/app/src/main/java/io/xpipe/app/core/AppAotTrain.java b/app/src/main/java/io/xpipe/app/core/AppAotTrain.java index ff2a6403d..312086db3 100644 --- a/app/src/main/java/io/xpipe/app/core/AppAotTrain.java +++ b/app/src/main/java/io/xpipe/app/core/AppAotTrain.java @@ -24,7 +24,7 @@ public class AppAotTrain { true); AppLayoutModel.get().selectSettings(); ThreadHelper.sleep(1000); - AppLayoutModel.get().selectLicense(); + // AppLayoutModel.get().selectLicense(); ThreadHelper.sleep(1000); AppLayoutModel.get().selectBrowser(); ThreadHelper.sleep(5000); diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java index 28b90fdbe..b3c0b88fd 100644 --- a/app/src/main/java/io/xpipe/app/core/AppProperties.java +++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java @@ -30,6 +30,7 @@ public class AppProperties { boolean useVirtualThreads; boolean debugThreads; Path dataDir; + Path defaultReleaseDataDir; Path defaultDataDir; Path dataBinDir; boolean showcase; @@ -108,6 +109,7 @@ public class AppProperties { System.getProperty(AppNames.propertyName("debugPlatformThreadAccess"))) .map(Boolean::parseBoolean) .orElse(false); + defaultReleaseDataDir = AppSystemInfo.ofCurrent().getUserHome().resolve(".xpipe"); defaultDataDir = AppSystemInfo.ofCurrent().getUserHome().resolve(isStaging() ? ".xpipe-ptb" : ".xpipe"); dataDir = Optional.ofNullable(System.getProperty(AppNames.propertyName("dataDir"))) .map(s -> { diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java index 5ec82dbaf..efc20a4bb 100644 --- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java +++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsComp.java @@ -2,6 +2,7 @@ package io.xpipe.app.prefs; import io.xpipe.app.comp.SimpleRegionBuilder; import io.xpipe.app.comp.base.VerticalComp; +import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.platform.PlatformThread; import io.xpipe.app.util.BooleanScope; @@ -16,6 +17,7 @@ public class AppPrefsComp extends SimpleRegionBuilder { @Override protected Region createSimple() { + TrackEvent.info("paaaaa"); var categories = AppPrefs.get().getCategories().stream() .filter(appPrefsCategory -> appPrefsCategory.show()) .toList(); @@ -30,10 +32,13 @@ public class AppPrefsComp extends SimpleRegionBuilder { struc.getStyleClass().add("prefs-box"); }); boxComp.maxWidth(850); + TrackEvent.info("baaaaaa"); var box = boxComp.build(); + TrackEvent.info("caaaaa"); var pane = new GraphicDecorationStackPane(); pane.getChildren().add(box); + TrackEvent.info("daaaaaa"); var scrollPane = new ScrollPane(pane); @@ -83,6 +88,7 @@ public class AppPrefsComp extends SimpleRegionBuilder { scrollPane.setFitToWidth(true); HBox.setHgrow(scrollPane, Priority.ALWAYS); + TrackEvent.info("eaaaaaa"); var sidebar = new AppPrefsSidebarComp().build(); sidebar.setMinWidth(260); sidebar.setPrefWidth(260); @@ -93,6 +99,7 @@ public class AppPrefsComp extends SimpleRegionBuilder { HBox.setMargin(sidebar, new Insets(4)); split.setFillHeight(true); split.getStyleClass().add("prefs"); + TrackEvent.info("faaaaa"); return split; } diff --git a/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java b/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java index 7acb133f9..7f6a14d0d 100644 --- a/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java +++ b/app/src/main/java/io/xpipe/app/prefs/WorkspaceManager.java @@ -62,7 +62,7 @@ public class WorkspaceManager { private void save() { try { - var file = AppProperties.get().getDefaultDataDir().resolve("workspaces.json"); + var file = AppProperties.get().getDefaultReleaseDataDir().resolve("workspaces.json"); JacksonMapper.getDefault().writeValue(file.toFile(), workspaces); } catch (Exception e) { ErrorEventFactory.fromThrowable(e).expected().handle(); diff --git a/version b/version index c53eeac3e..c5377ca46 100644 --- a/version +++ b/version @@ -1 +1 @@ -22.2-5 +22.2-6