diff --git a/app/src/main/java/io/xpipe/app/core/AppVersion.java b/app/src/main/java/io/xpipe/app/core/AppVersion.java index 5c0f72e66..a3904bc9b 100644 --- a/app/src/main/java/io/xpipe/app/core/AppVersion.java +++ b/app/src/main/java/io/xpipe/app/core/AppVersion.java @@ -14,7 +14,7 @@ public class AppVersion implements Comparable { public static Optional parse(String version) { try { - var releaseSplit = version.split("-"); + var releaseSplit = version.strip().split("-"); var split = releaseSplit[0].split("\\."); var major = Integer.parseInt(split[0]); var minor = split.length > 1 ? Integer.parseInt(split[1]) : 0; diff --git a/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java b/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java index 54117a90f..251caf309 100644 --- a/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java +++ b/app/src/main/java/io/xpipe/app/prefs/SyncCategory.java @@ -61,7 +61,9 @@ public class SyncCategory extends AppPrefsCategory { ChoiceComp.ofTranslatable(prefs.syncMode, Arrays.asList(SyncMode.values()), false) .maxWidth(getCompWidth()), prefs.syncMode) + .disable(prefs.storageGitRemote.isNull().or(prefs.enableGitStorage.not())) .addComp(createManualControls()) + .disable(prefs.storageGitRemote.isNull().or(prefs.enableGitStorage.not())) .hide(prefs.syncMode.isNotEqualTo(SyncMode.MANUAL).or(prefs.enableGitStorage.not())) .nameAndDescription("browseVault") .addComp(new ButtonComp(AppI18n.observable("browseVaultButton"), () -> { diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java b/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java index e0393b2b4..5fa9a113b 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java @@ -73,6 +73,7 @@ public class DataStorageCompatibilityCheck { .documentationLink(DocumentationLink.MIGRATION) .expected() .handle(); + AppOperationMode.halt(0); } private static void runTransitoryBuild() throws Exception { @@ -82,6 +83,7 @@ public class DataStorageCompatibilityCheck { var shell = LocalShell.get(DataStorageCompatibilityCheck.class); switch (OsType.ofLocal()) { case OsType.Linux ignored -> { + Files.createDirectories(tempTarget); shell.command(CommandBuilder.of() .add("tar", "-f") .addFile(downloaded) @@ -97,7 +99,7 @@ public class DataStorageCompatibilityCheck { } case OsType.MacOs ignored -> { AppOperationMode.executeAfterShutdown(() -> { - ExternalApplicationHelper.startAsync(CommandBuilder.of().add("open").addFile(tempTarget)); + ExternalApplicationHelper.startAsync(CommandBuilder.of().add("open").addFile(downloaded)); }); } case OsType.Windows ignored -> { diff --git a/version b/version index ca922b221..f4b571e1b 100644 --- a/version +++ b/version @@ -1 +1 @@ -24.0-46 +24.0-47