diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index ecb92eb60..1c209c301 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -143,7 +143,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2025 Skymatic GmbH" + --copyright "(C) 2016 - 2026 Skymatic GmbH" --app-version "${VERSION_NUM}.${REVISION_NUM}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index a440af8c3..a3ed97967 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -146,7 +146,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2025 Skymatic GmbH" + --copyright "(C) 2016 - 2026 Skymatic GmbH" --app-version "${VERSION_NUM}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index d4d295104..0d9fb9f29 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -144,7 +144,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2025 Skymatic GmbH" + --copyright "(C) 2016 - 2026 Skymatic GmbH" --app-version "${VERSION_NUM}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 0802fb0f0..0f1b16b3f 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -165,7 +165,7 @@ jobs: --dest appdir --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2025 Skymatic GmbH" + --copyright "(C) 2016 - 2026 Skymatic GmbH" --app-version "${VERSION_NUM}.${REVISION_NUM}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.win,org.cryptomator.integrations.win" @@ -268,7 +268,7 @@ jobs: --dest installer --name Cryptomator --vendor "Skymatic GmbH" - --copyright "(C) 2016 - 2025 Skymatic GmbH" + --copyright "(C) 2016 - 2026 Skymatic GmbH" --app-version "${VERSION_NUM}.${REVISION_NUM}" --win-menu --win-dir-chooser @@ -384,7 +384,7 @@ jobs: -define BundleName="Cryptomator" -define BundleVersion="${VERSION_NUM}.${REVISION_NUM}" -define BundleVendor="Skymatic GmbH" - -define BundleCopyright="(C) 2016 - 2025 Skymatic GmbH" + -define BundleCopyright="(C) 2016 - 2026 Skymatic GmbH" -define AboutUrl="https://cryptomator.org" -define HelpUrl="https://cryptomator.org/contact" -define UpdateUrl="https://cryptomator.org/downloads/" diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index 8beb229de..73dc43a8f 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -82,7 +82,7 @@ ${JAVA_HOME}/bin/jpackage \ --vendor "Skymatic GmbH" \ --java-options "--enable-preview" \ --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \ - --copyright "(C) 2016 - 2025 Skymatic GmbH" \ + --copyright "(C) 2016 - 2026 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ --app-version "${VERSION}.${REVISION_NO}" \ diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 0fefef2e0..fc8937459 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -46,7 +46,7 @@ override_dh_auto_build: --vendor "Skymatic GmbH" \ --java-options "--enable-preview" \ --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \ - --copyright "(C) 2016 - 2025 Skymatic GmbH" \ + --copyright "(C) 2016 - 2026 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ --java-options "-Dfile.encoding=\"utf-8\"" \ diff --git a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml index 0adc4e8ea..4d7c3f4d0 100644 --- a/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml +++ b/dist/linux/flatpak/org.cryptomator.Cryptomator.TEMPLATE.yaml @@ -114,7 +114,7 @@ modules: --dest . --name Cryptomator --vendor 'Skymatic GmbH' - --copyright '(C) 2016 - 2025 Skymatic GmbH' + --copyright '(C) 2016 - 2026 Skymatic GmbH' --java-options '--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator' --java-options "--sun-misc-unsafe-memory-access=allow" --java-options '-Xss5m' diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 53abb794f..16e2ef07a 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -24,7 +24,7 @@ rm -rf runtime dmg *.app *.dmg # set variables APP_NAME="Cryptomator" VENDOR="Skymatic GmbH" -COPYRIGHT_YEARS="2016 - 2025" +COPYRIGHT_YEARS="2016 - 2026" PACKAGE_IDENTIFIER="org.cryptomator" MAIN_JAR_GLOB="cryptomator-*.jar" MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java index 92c2596f3..485e1de68 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java @@ -1,9 +1,8 @@ package org.cryptomator.ui.mainwindow; +import com.github.benmanes.caffeine.cache.Caffeine; +import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.base.Preconditions; -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; import com.tobiasdiez.easybind.EasyBind; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.Nullable; @@ -90,8 +89,8 @@ public class VaultDetailUnlockedController implements FxController { this.revealPathService = revealPathService; this.decryptNameWindowFactory = decryptNameWindowFactory; this.resourceBundle = resourceBundle; - this.vaultStats = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildVaultStats)); - this.decryptNameWindows = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildDecryptNameWindow)); + this.vaultStats = Caffeine.newBuilder().weakValues().build(this::buildVaultStats); + this.decryptNameWindows = Caffeine.newBuilder().weakValues().build(this::buildDecryptNameWindow); this.vaultStatsBuilder = vaultStatsBuilder; var mp = vault.flatMap(Vault::mountPointProperty); this.accessibleViaPath = mp.map(m -> m instanceof Mountpoint.WithPath).orElse(false); @@ -163,7 +162,7 @@ public class VaultDetailUnlockedController implements FxController { } private void showDecryptNameWindow(List pathsToDecrypt) { - decryptNameWindows.getUnchecked(vault.get()).showDecryptFileNameWindow(pathsToDecrypt); + decryptNameWindows.get(vault.get()).showDecryptFileNameWindow(pathsToDecrypt); } private boolean startsWithVaultAccessPoint(Path path) { @@ -223,7 +222,7 @@ public class VaultDetailUnlockedController implements FxController { @FXML public void showVaultStatistics() { - vaultStats.getUnchecked(vault.get()).showVaultStatisticsWindow(); + vaultStats.get(vault.get()).showVaultStatisticsWindow(); } /* Getter/Setter */ diff --git a/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java b/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java index b0c490a3f..d45dc46cd 100644 --- a/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java +++ b/src/main/java/org/cryptomator/ui/sharevault/ShareVaultController.java @@ -18,7 +18,10 @@ import java.net.URISyntaxException; public class ShareVaultController implements FxController { private static final String SCHEME_PREFIX = "hub+"; - private static final String VISIT_HUB_URL = "https://cryptomator.org/hub/"; + private static final String VISIT_HUB_URL = "https://cryptomator.org/hub/" // + + "?utm_source=cryptomator-desktop" // + + "&utm_medium=app" // + + "&utm_campaign=share-vault"; private static final String BEST_PRACTICES_URL = "https://docs.cryptomator.org/security/best-practices/#sharing-of-vaults"; private final Stage window; diff --git a/src/main/resources/fxml/preferences_about.fxml b/src/main/resources/fxml/preferences_about.fxml index b3142e301..96714e08d 100644 --- a/src/main/resources/fxml/preferences_about.fxml +++ b/src/main/resources/fxml/preferences_about.fxml @@ -22,7 +22,7 @@ -