From 65a4cc424b9a1b0f35cc39649686549321cbad1b Mon Sep 17 00:00:00 2001 From: crschnick Date: Tue, 19 Nov 2024 11:23:41 +0000 Subject: [PATCH] Fine tune updater --- app/src/main/java/io/xpipe/app/ext/ShellStore.java | 1 + app/src/main/java/io/xpipe/app/update/AppDownloads.java | 2 ++ app/src/main/java/io/xpipe/app/update/UpdateHandler.java | 2 +- app/src/main/java/io/xpipe/app/util/LicenseProvider.java | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/xpipe/app/ext/ShellStore.java b/app/src/main/java/io/xpipe/app/ext/ShellStore.java index 75c39c871..18d00feb7 100644 --- a/app/src/main/java/io/xpipe/app/ext/ShellStore.java +++ b/app/src/main/java/io/xpipe/app/ext/ShellStore.java @@ -2,6 +2,7 @@ package io.xpipe.app.ext; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.core.process.ShellControl; +import io.xpipe.core.process.StubShellControl; import io.xpipe.core.store.*; public interface ShellStore extends DataStore, FileSystemStore, ValidatableStore, SingletonSessionStore { diff --git a/app/src/main/java/io/xpipe/app/update/AppDownloads.java b/app/src/main/java/io/xpipe/app/update/AppDownloads.java index a9e008816..61ad39c94 100644 --- a/app/src/main/java/io/xpipe/app/update/AppDownloads.java +++ b/app/src/main/java/io/xpipe/app/update/AppDownloads.java @@ -4,6 +4,7 @@ import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.TrackEvent; import io.xpipe.app.util.HttpHelper; +import io.xpipe.app.util.LicenseProvider; import io.xpipe.core.process.OsType; import io.xpipe.core.util.JacksonMapper; @@ -127,6 +128,7 @@ public class AppDownloads { req.put("uuid", AppProperties.get().getUuid().toString()); req.put("version", AppProperties.get().getVersion()); req.put("first", first); + req.put("license", LicenseProvider.get().getLicenseId()); var url = URI.create("https://api.xpipe.io/version"); var builder = HttpRequest.newBuilder(); diff --git a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java index 8169db97d..867a66a14 100644 --- a/app/src/main/java/io/xpipe/app/update/UpdateHandler.java +++ b/app/src/main/java/io/xpipe/app/update/UpdateHandler.java @@ -100,7 +100,7 @@ public abstract class UpdateHandler { private void startBackgroundUpdater() { ThreadHelper.createPlatformThread("updater", true, () -> { var checked = false; - ThreadHelper.sleep(Duration.ofMinutes(5).toMillis()); + ThreadHelper.sleep(Duration.ofMinutes(1).toMillis()); event("Starting background updater thread"); while (true) { if (AppPrefs.get().automaticallyUpdate().get() diff --git a/app/src/main/java/io/xpipe/app/util/LicenseProvider.java b/app/src/main/java/io/xpipe/app/util/LicenseProvider.java index 416c15902..fd837fb8e 100644 --- a/app/src/main/java/io/xpipe/app/util/LicenseProvider.java +++ b/app/src/main/java/io/xpipe/app/util/LicenseProvider.java @@ -20,6 +20,8 @@ public abstract class LicenseProvider { public abstract boolean hasLicense(); + public abstract String getLicenseId(); + public abstract ObservableValue licenseTitle(); public abstract LicensedFeature getFeature(String id);