diff --git a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreIntroComp.java b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreIntroComp.java index cff038e7..e2c3e1d2 100644 --- a/app/src/main/java/io/xpipe/app/comp/storage/store/StoreIntroComp.java +++ b/app/src/main/java/io/xpipe/app/comp/storage/store/StoreIntroComp.java @@ -56,10 +56,11 @@ public class StoreIntroComp extends SimpleComp { introDesc, new Separator(Orientation.HORIZONTAL), machine, - scanPane, - new Separator(Orientation.HORIZONTAL), - documentation, - docLinkPane); + scanPane +// new Separator(Orientation.HORIZONTAL), +// documentation, +// docLinkPane + ); v.setMinWidth(Region.USE_PREF_SIZE); v.setMaxWidth(Region.USE_PREF_SIZE); v.setMinHeight(Region.USE_PREF_SIZE); diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorage.java b/app/src/main/java/io/xpipe/app/storage/DataStorage.java index 84d3184e..03140e7a 100644 --- a/app/src/main/java/io/xpipe/app/storage/DataStorage.java +++ b/app/src/main/java/io/xpipe/app/storage/DataStorage.java @@ -59,7 +59,7 @@ public abstract class DataStorage { try { dataStoreProvider.storageInit(); } catch (Exception e) { - ErrorEvent.fromThrowable(e).handle(); + ErrorEvent.fromThrowable(e).omit().handle(); } }); diff --git a/core/src/main/java/io/xpipe/core/process/OsType.java b/core/src/main/java/io/xpipe/core/process/OsType.java index 5845d950..02343b02 100644 --- a/core/src/main/java/io/xpipe/core/process/OsType.java +++ b/core/src/main/java/io/xpipe/core/process/OsType.java @@ -61,17 +61,22 @@ public interface OsType { @Override public String determineOperatingSystemName(ShellControl pc) throws Exception { - return pc.executeStringSimpleCommand("wmic os get Caption") - .lines() - .skip(1) - .collect(Collectors.joining()) - .trim() - + " " - + pc.executeStringSimpleCommand("wmic os get Version") - .lines() - .skip(1) - .collect(Collectors.joining()) - .trim(); + try { + return pc.executeStringSimpleCommand("wmic os get Caption") + .lines() + .skip(1) + .collect(Collectors.joining()) + .trim() + + " " + + pc.executeStringSimpleCommand("wmic os get Version") + .lines() + .skip(1) + .collect(Collectors.joining()) + .trim(); + } catch (Throwable t) { + // Just in case this fails somehow + return "Windows ?"; + } } } diff --git a/dist/changelogs/0.5.30.md b/dist/changelogs/0.5.30.md new file mode 100644 index 00000000..b0355692 --- /dev/null +++ b/dist/changelogs/0.5.30.md @@ -0,0 +1,6 @@ +- Introduce new download functionality in the file browser +- Allow for the creation of desktop shortcuts on portable distributions as well +- Fix file sizes sometimes being incorrectly displayed +- Fix some issues when system locale was not set to english +- Fix background updater downloading the same version +- Fix various small bugs \ No newline at end of file diff --git a/version b/version index aa0ea79c..57671236 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.5.29 \ No newline at end of file +0.5.30 \ No newline at end of file