adjust to API, check with provided http client

Author: overheadhunter

pom.xml

@@ -39,12 +39,12 @@
 		<project.jdk.version>25</project.jdk.version>
 
 		<!-- runtime dependencies -->
-
 		<api.version>1.8.0-SNAPSHOT</api.version>
+		<slf4j.version>2.0.17</slf4j.version>
+		<jackson.version>2.20.0</jackson.version>
 		<secret-service.version>2.0.1-alpha</secret-service.version>
 		<kdewallet.version>1.4.0</kdewallet.version>
 		<flatpakupdateportal.version>1.1.0</flatpakupdateportal.version>
-		<slf4j.version>2.0.17</slf4j.version>
 		<appindicator.version>1.4.2</appindicator.version>
 
 		<!-- test dependencies -->
@@ -87,6 +87,12 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
+
 		<dependency>
 			<groupId>de.swiesend</groupId>
 			<artifactId>secret-service</artifactId>

src/main/java/module-info.java

@@ -22,6 +22,8 @@
 	requires org.purejava.portal;
 	requires de.swiesend.secretservice;
 	requires java.xml;
+	requires java.net.http;
+	requires com.fasterxml.jackson.databind;
 
 	provides AutoStartProvider with FreedesktopAutoStartService;
 	provides KeychainAccessProvider with GnomeKeyringKeychainAccess, KDEWalletKeychainAccess;

src/main/java/org/cryptomator/linux/update/FlatpakUpdateInfo.java

@@ -0,0 +1,7 @@
+package org.cryptomator.linux.update;
+
+import org.cryptomator.integrations.update.UpdateInfo;
+import org.cryptomator.integrations.update.UpdateMechanism;
+
+public record FlatpakUpdateInfo(String version, UpdateMechanism<FlatpakUpdateInfo> updateMechanism) implements UpdateInfo<FlatpakUpdateInfo> {
+}

src/main/java/org/cryptomator/linux/update/FlatpakUpdater.java

@@ -1,9 +1,11 @@
 package org.cryptomator.linux.update;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.cryptomator.integrations.common.CheckAvailability;
 import org.cryptomator.integrations.common.DisplayName;
 import org.cryptomator.integrations.common.OperatingSystem;
-import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.update.UpdateFailedException;
 import org.cryptomator.integrations.update.UpdateMechanism;
 import org.cryptomator.integrations.update.UpdateStep;
@@ -19,21 +21,26 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
-@Priority(1000)
 @CheckAvailability
 @DisplayName("Update via Flatpak update")
 @OperatingSystem(OperatingSystem.Value.LINUX)
-public class FlatpakUpdater implements UpdateMechanism {
+public class FlatpakUpdater implements UpdateMechanism<FlatpakUpdateInfo> {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FlatpakUpdater.class);
+	private static final String FLATHUB_API_BASE_URL = "https://flathub.org/api/v2/appstream/";
 	private static final String APP_NAME = "org.cryptomator.Cryptomator";
+	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
 	private final UpdatePortal portal;
 
@@ -48,31 +55,50 @@ public boolean isSupported() {
 	}
 
 	@Override
-	public boolean isUpdateAvailable(String installedVersion) {
-		var cdl = new CountDownLatch(1);
-		portal.setUpdateCheckerTaskFor(APP_NAME);
-		var checkTask = portal.getUpdateCheckerTaskFor(APP_NAME);
-		var updateAvailable = new AtomicBoolean(false);
-		checkTask.setOnSucceeded(updateVersion -> {
-			updateAvailable.set(UpdateMechanism.isUpdateAvailable(updateVersion, installedVersion));
-			cdl.countDown();
-		});
-		checkTask.setOnFailed(error -> {
-			LOG.warn("Error while checking for updates.", error);
-			cdl.countDown();
-		});
+	public FlatpakUpdateInfo checkForUpdate(String currentVersion, HttpClient httpClient) throws UpdateFailedException {
+		var uri = URI.create(FLATHUB_API_BASE_URL + APP_NAME);
+		var request = HttpRequest.newBuilder(uri).GET().build();
 		try {
-			cdl.await();
-			return updateAvailable.get();
+			var response = httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
+			if (response.statusCode() != 200) {
+				LOG.warn("GET {} resulted in status {}", uri, response.statusCode());
+				return null;
+			} else {
+				var appstream = OBJECT_MAPPER.reader().readValue(response.body(), AppstreamResponse.class);
+				var updateVersion = appstream.releases().stream()
+						.filter(release -> "stable".equalsIgnoreCase(release.type))
+						.max(Comparator.comparing(AppstreamReleases::timestamp)) // we're interested in the newest stable release
+						.map(AppstreamReleases::version)
+						.orElse("0.0.0"); // fallback should always be smaller than current version
+				if (UpdateMechanism.isUpdateAvailable(updateVersion, currentVersion)) {
+					return new FlatpakUpdateInfo(updateVersion, this);
+				} else {
+					return null;
+				}
+			}
+		} catch (IOException e) {
+			throw new UpdateFailedException("Check for updates failed.", e);
 		} catch (InterruptedException e) {
-			checkTask.cancel();
 			Thread.currentThread().interrupt();
-			return false;
+			LOG.warn("Update check interrupted", e);
+			return null;
 		}
 	}
 
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public record AppstreamResponse(
+			@JsonProperty("releases") List<AppstreamReleases> releases
+	) {}
+
+	@JsonIgnoreProperties(ignoreUnknown = true)
+	public record AppstreamReleases(
+			@JsonProperty("timestamp") long timestamp,
+			@JsonProperty("version") String version,
+			@JsonProperty("type") String type
+	) {}
+
 	@Override
-	public UpdateStep firstStep() throws UpdateFailedException {
+	public UpdateStep firstStep(FlatpakUpdateInfo updateInfo) throws UpdateFailedException {
 		var monitorPath = portal.CreateUpdateMonitor(UpdatePortal.OPTIONS_DUMMY);
 		if (monitorPath == null) {
 			throw new UpdateFailedException("Failed to create UpdateMonitor on DBus");
@@ -205,7 +231,7 @@ public UpdateStep applyUpdate() throws IllegalStateException, IOException {
 			Map<String, Variant<?>> options = UpdatePortal.OPTIONS_DUMMY;
 			var pid = portal.Spawn(cwdPath, argv, fds, envs, flags, options).longValue();
 			LOG.info("Spawned updated Cryptomator process with PID {}", pid);
-			return null;
+			return UpdateStep.EXIT;
 		}
 	}