Merge branch 'main' into develop

Author: infeo

CHANGELOG.md

@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 The changelog starts with version 1.6.1.
 Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/integrations-linux/releases).
 
-## [Unreleased](https://github.com/cryptomator/integrations-linux/compare/1.6.1...HEAD)
+## [1.7.0](https://github.com/cryptomator/integrations-linux/releases/1.7.0) - 2026-03-12
 
 ### Added
 * Flatpak Update Mechanism ([#117](https://github.com/cryptomator/integrations-linux/pull/117))

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>integrations-linux</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>1.7.0-beta1</version>
 
 	<name>integrations-linux</name>
 	<description>Provides optional Linux services used by Cryptomator</description>

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

@@ -71,14 +71,6 @@ public FlatpakUpdateInfo checkForUpdate(String currentVersion, HttpClient httpCl
 						.map(AppstreamReleases::version)
 						.orElse("0.0.0"); // fallback should always be smaller than current version
 
-
-				// FIXME: remove this block! see https://github.com/cryptomator/cryptomator/issues/4058
-				if (currentVersion.startsWith("1.18.0-beta")) {
-					return new FlatpakUpdateInfo(updateVersion, this);
-				}
-				// END FIXME
-
-
 				if (UpdateMechanism.isUpdateAvailable(updateVersion, currentVersion)) {
 					return new FlatpakUpdateInfo(updateVersion, this);
 				} else {