fix win-update-url

file is named now msica.dll

.github/workflows/win-exe.yml

@@ -83,7 +83,7 @@ jobs:
           - arch: x64
             os: windows-latest
             java-dist: 'zulu' #cannot use temurin, see https://github.com/cryptomator/cryptomator/issues/3824#issuecomment-2829827427
-            java-version: '25.0.1+8'
+            java-version: '26.0.1+8'
             java-package: 'jdk'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -220,12 +220,10 @@ jobs:
               }
               $jar.Dispose()
           }
-      - name: Extract wixhelper.dll for Codesigning #see https://github.com/cryptomator/cryptomator/issues/3130
-        shell: pwsh
+      - name: Get msi helper dll for code signing
         run: |
-          New-Item -Path appdir/jpackage-jmod -ItemType Directory
-          & $env:JAVA_HOME\bin\jmod.exe extract --dir jpackage-jmod "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod"
-          Get-ChildItem -Recurse -Path "jpackage-jmod" -File wixhelper.dll | Select-Object -Last 1 | Copy-Item -Destination "appdir"
+          ${JAVA_HOME}/bin/jpackage --type msi --win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775 --app-image appdir/Cryptomator --dest /tmp/ --name Test --vendor Test --copyright "None" --app-version "1.0" --temp msi-helper
+          find ./msi-helper/ -type f -name msica.dll -exec mv {} ./appdir \;
       - name: Sign DLLs with Azure Trusted Signing
         if: inputs.sign || github.event_name == 'schedule'
         uses: ./.github/actions/win-sign-action
@@ -261,6 +259,16 @@ jobs:
           "-Dlicense.failOnMissing=true"
           "-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
         shell: pwsh
+      - name: Create file association file from template
+        working-directory: dist/win
+        run: |
+          $Env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT = "${Env:JP_WIXWIZARD_RESOURCES}".Replace('\', '\\');
+          Get-Content .\resources\FAvaultFile.template.properties `
+            | ForEach-Object { $ExecutionContext.InvokeCommand.ExpandString($_) } `
+            | Out-File -FilePath .\resources\FAvaultFile.properties
+        env:
+          JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources/ # requires abs path, used in resources/main.wxs
+        shell: pwsh
       - name: Create MSI
         run: >
           ${JAVA_HOME}/bin/jpackage
@@ -276,14 +284,14 @@ jobs:
           --win-menu
           --win-dir-chooser
           --win-shortcut-prompt
-          --win-update-url "https:\\cryptomator.org\downloads"
+          --win-update-url "https://cryptomator.org/downloads"
           --win-menu-group Cryptomator
           --resource-dir dist/win/resources
           --license-file dist/win/resources/license.rtf
           --file-associations dist/win/resources/FAvaultFile.properties
         env:
-          JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
-          JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir
+          JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources/ # requires abs path, used in resources/main.wxs
+          JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir\
       - name: Sign MSI with Azure Trusted Signing
         if: inputs.sign || github.event_name == 'schedule'
         uses: ./.github/actions/win-sign-action

dist/win/build.ps1

@@ -16,6 +16,19 @@ Param(
 # Function Definitions Section
 # ============================
 
+function Invoke-CommandWithExitCheck {
+	param (
+		[string]$Command,
+		[string[]]$Arguments
+	)
+
+	& $Command @Arguments
+	if ($LASTEXITCODE -ne 0) {
+		Write-Error "Command '$Command' failed with exit code $LASTEXITCODE"
+		exit $LASTEXITCODE
+	}
+}
+
 function Main {
 
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
@@ -65,7 +78,8 @@ Write-Host "`$Env:JAVA_HOME=$Env:JAVA_HOME"
 $copyright = "(C) $CopyrightStartYear - $((Get-Date).Year) $Vendor"
 
 # compile
-&mvn -B -f $buildDir/../../pom.xml clean package -DskipTests -Pwin
+Invoke-CommandWithExitCheck -Command `
+    "mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "clean", "package", "-DskipTests", "-Pwin")
 Copy-Item "$buildDir\..\..\target\$MainJarGlob.jar" -Destination "$buildDir\..\..\target\mods"
 
 # add runtime
@@ -129,16 +143,18 @@ if ((& "$Env:JAVA_HOME\bin\jlink" --help | Select-String -Pattern "Linking from
 }
 
 ### create runtime
-& "$Env:JAVA_HOME\bin\jlink" `
-	--verbose `
-	--output runtime `
-	--module-path $jmodPaths `
-	--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml `
-	--strip-native-commands `
-	--no-header-files `
-	--no-man-pages `
-	--strip-debug `
-	--compress "zip-0" #do not compress and use msi compression
+Invoke-CommandWithExitCheck -Command `
+    "$Env:JAVA_HOME\bin\jlink" -Arguments @(
+    "--verbose",
+    "--output", "runtime",
+    "--module-path", $jmodPaths,
+    "--add-modules", "java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml",
+    "--strip-native-commands",
+    "--no-header-files",
+    "--no-man-pages",
+    "--strip-debug",
+    "--compress", "zip-0" #do not compress and use msi compression
+    )
 
 $appPath = ".\$AppName"
 if ($clean -and (Test-Path -Path $appPath)) {
@@ -195,14 +211,15 @@ if ($LASTEXITCODE -ne 0) {
 }
 
 #Create RTF license for msi
-&mvn -B -f $buildDir/../../pom.xml license:add-third-party `
- "-Dlicense.thirdPartyFilename=license.rtf" `
- "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl" `
- "-Dlicense.outputDirectory=$buildDir\resources\" `
- "-Dlicense.includedScopes=compile" `
- "-Dlicense.excludedGroups=^org\.cryptomator" `
- "-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
+Invoke-CommandWithExitCheck -Command `
+    "mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "license:add-third-party", `
+    "-Dlicense.thirdPartyFilename=license.rtf", `
+    "-Dlicense.fileTemplate=$buildDir\resources\licenseTemplate.ftl", `
+    "-Dlicense.outputDirectory=$buildDir\resources\", `
+    "-Dlicense.includedScopes=compile", `
+    "-Dlicense.excludedGroups=^org\.cryptomator", `
+    "-Dlicense.failOnMissing=true", `
+    "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
 
 # patch app dir
 Copy-Item "contrib\*" -Destination "$AppName"
@@ -210,42 +227,46 @@ attrib -r "$AppName\$AppName.exe"
 attrib -r "$AppName\${AppName} (Debug).exe"
 
 # create .msi
-$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
-$Env:JP_WIXHELPER_DIR = "."
-& "$Env:JAVA_HOME\bin\jpackage" `
-	--verbose `
-	--type msi `
-	--win-upgrade-uuid $UpgradeUUID `
-	--app-image $AppName `
-	--dest installer `
-	--name $AppName `
-	--vendor $Vendor `
-	--copyright $copyright `
-	--app-version "$semVerNo.$revisionNo" `
-	--win-menu `
-	--win-dir-chooser `
-	--win-shortcut-prompt `
-	--win-menu-group $AppName `
-	--resource-dir resources `
-	--license-file resources/license.rtf `
-	--win-update-url $UpdateUrl `
-	--about-url $AboutUrl `
-	--file-associations resources/FAvaultFile.properties
+$Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources\"
+$Env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT = "${Env:JP_WIXWIZARD_RESOURCES}".Replace('\', '\\');
+$Env:JP_WIXHELPER_DIR = ""
 
-if ($LASTEXITCODE -ne 0) {
-    Write-Error "jpackage MSI failed with exit code $LASTEXITCODE"
-	return 1;
-}
+Get-Content .\resources\FAvaultFile.template.properties ` # Similar to envsubst
+    | ForEach-Object { $ExecutionContext.InvokeCommand.ExpandString($_) } `
+    | Out-File -FilePath .\resources\FAvaultFile.properties
+
+Invoke-CommandWithExitCheck -Command `
+    "$Env:JAVA_HOME\bin\jpackage" -Arguments @(
+    "--verbose",
+    "--type", "msi",
+    "--win-upgrade-uuid", $UpgradeUUID,
+    "--app-image", $AppName,
+    "--dest", "installer",
+    "--name", $AppName,
+    "--vendor", $Vendor,
+    "--copyright", $copyright,
+    "--app-version", "$semVerNo.$revisionNo",
+    "--win-menu",
+    "--win-dir-chooser",
+    "--win-shortcut-prompt",
+    "--win-menu-group", $AppName,
+    "--resource-dir", "resources",
+    "--license-file", "resources/license.rtf",
+    "--win-update-url", $UpdateUrl,
+    "--about-url", $AboutUrl,
+    "--file-associations", "resources/FAvaultFile.properties"
+    )
 
 #Create RTF license for bundle
-&mvn -B -f $buildDir/../../pom.xml license:add-third-party `
- "-Dlicense.thirdPartyFilename=license.rtf" `
- "-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl" `
- "-Dlicense.outputDirectory=$buildDir\bundle\resources\" `
- "-Dlicense.includedScopes=compile" `
- "-Dlicense.excludedGroups=^org\.cryptomator" `
- "-Dlicense.failOnMissing=true" `
- "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
+Invoke-CommandWithExitCheck -Command `
+	"mvn" -Arguments @("-B", "-f", "$buildDir/../../pom.xml", "license:add-third-party", `
+	"-Dlicense.thirdPartyFilename=license.rtf", `
+	"-Dlicense.fileTemplate=$buildDir\bundle\resources\licenseTemplate.ftl", `
+	"-Dlicense.outputDirectory=$buildDir\bundle\resources\", `
+	"-Dlicense.includedScopes=compile", `
+	"-Dlicense.excludedGroups=^org\.cryptomator", `
+	"-Dlicense.failOnMissing=true", `
+	"-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges")
 
 # download Winfsp
 $winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
@@ -271,18 +292,21 @@ Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninsta
 Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi" -Force
 
 # create bundle including winfsp
-& wix build `
-	-define BundleName="$AppName" `
-	-define BundleVersion="$semVerNo.$revisionNo" `
-	-define BundleVendor="$Vendor" `
-	-define BundleCopyright="$copyright" `
-	-define AboutUrl="$AboutUrl" `
-	-define HelpUrl="$HelpUrl" `
-	-define UpdateUrl="$UpdateUrl" `
-	-ext "WixToolset.Util.wixext" `
-	-ext "WixToolset.BootstrapperApplications.wixext" `
-    .\bundle\bundleWithWinfsp.wxs `
-    -out "installer\$AppName-Installer.exe"
+Invoke-CommandWithExitCheck -Command `
+    "wix" -Arguments @(
+    "build",
+    "-define", "BundleName=$AppName",
+    "-define", "BundleVersion=$semVerNo.$revisionNo",
+    "-define", "BundleVendor=$Vendor",
+    "-define", "BundleCopyright=$copyright",
+    "-define", "AboutUrl=$AboutUrl",
+    "-define", "HelpUrl=$HelpUrl",
+    "-define", "UpdateUrl=$UpdateUrl",
+    "-ext", "WixToolset.Util.wixext",
+    "-ext", "WixToolset.BootstrapperApplications.wixext",
+    ".\bundle\bundleWithWinfsp.wxs",
+    "-out", ".\installer\$AppName-Installer.exe"
+)
 
 Write-Host "Created EXE installer .\installer\$AppName-Installer.exe"
 return 0;

dist/win/contrib/patchWebDAV.bat

@@ -4,18 +4,15 @@
 :: This file must be located in the INSTALLDIR
 
 set "LOOPBACK_ALIAS=%1"
-set "ACTION=%2"
-if "%ACTION%"=="" set "ACTION=install"
 
 :: Log for debugging
 echo LOOPBACK_ALIAS=%LOOPBACK_ALIAS%
-echo ACTION=%ACTION%
 
 :: Change to INSTALLDIR
 cd %~dp0
 :: Execute the PowerShell script
 powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy RemoteSigned -File .\patchWebDAV.ps1^
- -LoopbackAlias %LOOPBACK_ALIAS% -Action %ACTION%
+ -LoopbackAlias %LOOPBACK_ALIAS%
 
 :: Return the exit code from PowerShell
 exit /b %ERRORLEVEL%

dist/win/contrib/patchWebDAV.ps1

@@ -1,17 +1,15 @@
 #Requires -RunAsAdministrator
 Param(
-	[Parameter(Mandatory, HelpMessage="Please provide an alias for 127.0.0.1")][string] $LoopbackAlias,
-	[string] $Action = "install"
+	[Parameter(Mandatory, HelpMessage="Please provide an alias for 127.0.0.1")][string] $LoopbackAlias
 )
 
-New-Variable -Name "sysdir" -Value ([Environment]::SystemDirectory) -Option Constant -Scope Global
-New-Variable -Name "hostsFile" -Value "$sysdir\drivers\etc\hosts" -Option Constant -Scope Global
-
 # Adds an alias for 127.0.0.1 to the hosts file
 function Add-AliasToHost {
     param (
         [string]$LoopbackAlias
     )
+    $sysdir = [Environment]::SystemDirectory
+    $hostsFile = "$sysdir\drivers\etc\hosts"
     $aliasLine = "127.0.0.1 $LoopbackAlias"
 
     foreach ($line in Get-Content $hostsFile) {
@@ -20,26 +18,9 @@ function Add-AliasToHost {
         }
     }
 
-    $content = Get-Content $hostsFile
-    $content += "`r`n$aliasLine"
-
-    $content | Set-Content "$hostsFile.tmp" -Encoding ascii
-    Move-Item "$hostsFile.tmp" $hostsFile -Force
+    Add-Content -Path $hostsFile -Encoding ascii -Value "`r`n$aliasLine"
 }
 
-# Removes an alias for 127.0.0.1 from the hosts file
-function Remove-AliasFromHost {
-    param (
-    	[string]$LoopbackAlias
-    )
-    $aliasLine = "127.0.0.1 $LoopbackAlias"
-
-    $content = Get-Content $hostsFile
-    $newContent = $content | Where-Object { $_ -ne $aliasLine }
-
-    $newContent | Set-Content "$hostsFile.tmp" -Encoding ascii
-	Move-Item "$hostsFile.tmp" $hostsFile -Force
-}
 
 # Sets in the registry the webclient file size limit to the maximum value
 function Set-WebDAVFileSizeLimit {
@@ -73,20 +54,14 @@ function Edit-ProviderOrder {
     New-ItemProperty -Path $RegistryPath -Name $Name -Value $UpdatedOrder -PropertyType String -Force | Out-Null
 }
 
-if ($Action -eq "install") {
-	Add-AliasToHost $LoopbackAlias
-    Write-Output 'Ensured alias exists in hosts file'
 
-	Set-WebDAVFileSizeLimit
-    Write-Output 'Set WebDAV file size limit'
+Add-AliasToHost $LoopbackAlias
+Write-Output 'Ensured alias exists in hosts file'
 
-    Edit-ProviderOrder
-    Write-Output 'Ensured correct provider order'
-} elseif ($Action -eq "uninstall") {
-    Remove-AliasFromHost $LoopbackAlias
-    Write-Output 'Ensured alias removed from hosts file'
-} else {
-	Write-Error "Invalid action: $Action. Only 'install' or 'uninstall' are valid."
-}
+Set-WebDAVFileSizeLimit
+Write-Output 'Set WebDAV file size limit'
+
+Edit-ProviderOrder
+Write-Output 'Ensured correct provider order'
 
 exit 0

dist/win/resources/FAvaultFile.properties

@@ -1,4 +1,4 @@
 mime-type=application/vnd.cryptomator.vault
 extension=cryptomator
 description=Cryptomator Vault File
-icon=resources/Cryptomator-Vault.ico
+icon=C:\\Users\\Arbeit\\Skymatic\\cryptomator-jdk26-jpackage\\dist\\win\\resources\\Cryptomator-Vault.ico

dist/win/resources/FAvaultFile.template.properties

@@ -0,0 +1,4 @@
+mime-type=application/vnd.cryptomator.vault
+extension=cryptomator
+description=Cryptomator Vault File
+icon=${env:JP_WIXWIZARD_RESOURCES_PROPERTIES_FORMAT}Cryptomator-Vault.ico

dist/win/resources/main.wxs

@@ -68,7 +68,7 @@
     <?endif?>
 
     <!-- TODO: how does this work again? -->
-    <ns0:Binary Id="JpCaDll" SourceFile="$(env.JP_WIXHELPER_DIR)\wixhelper.dll" />
+    <ns0:Binary Id="JpCaDll" SourceFile="$(env.JP_WIXHELPER_DIR)msica.dll"></ns0:Binary>
     <ns0:CustomAction Id="JpFindRelatedProducts" BinaryRef="JpCaDll" DllEntry="FindRelatedProductsEx" />
 
     <?ifndef SkipCryptomatorLegacyCheck ?>
@@ -158,13 +158,9 @@
     <ns0:CustomAction Id="DisableUserConfig" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
 
     <!-- WebDAV patches -->
-    <ns0:SetProperty Id="PatchWebDAV" Value="&quot;[INSTALLDIR]patchWebDAV.bat&quot; &quot;$(var.LoopbackAlias)&quot; install" Sequence="execute" Before="PatchWebDAV" />
+    <ns0:SetProperty Id="PatchWebDAV" Value="&quot;[INSTALLDIR]patchWebDAV.bat&quot; &quot;$(var.LoopbackAlias)&quot;" Sequence="execute" Before="PatchWebDAV" />
     <ns0:CustomAction Id="PatchWebDAV" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
 
-    <!-- WebDAV patches (Uninstall) -->
-    <ns0:SetProperty Id="PatchWebDAVUninstall" Value="&quot;[INSTALLDIR]patchWebDAV.bat&quot; &quot;$(var.LoopbackAlias)&quot; uninstall" Sequence="execute" Before="PatchWebDAVUninstall" />
-    <ns0:CustomAction Id="PatchWebDAVUninstall" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
-
     <!-- Update check configuration -->
     <ns0:SetProperty Id="PatchUpdateCheck" Value="&quot;[INSTALLDIR]patchUpdateCheck.bat&quot; &quot;[DISABLEUPDATECHECK]&quot;" Sequence="execute" Before="PatchUpdateCheck" />
     <ns0:CustomAction Id="PatchUpdateCheck" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
@@ -218,8 +214,9 @@
 
       <ns0:RemoveExistingProducts After="InstallValidate"/> <!-- Moved from CostInitialize, due to Wix4CloseApplications_* -->
       <ns0:Custom Action="DisableUserConfig" After="InstallFiles" Condition="NOT (Installed AND (NOT REINSTALL) AND (NOT UPGRADINGPRODUCTCODE) AND REMOVE)"/>
+      <!-- Skip action on uninstall -->
+      <!-- TODO: don't skip action, but remove cryptomator alias from hosts file -->
       <ns0:Custom Action="PatchWebDAV" After="DisableUserConfig" Condition="NOT (Installed AND (NOT REINSTALL) AND (NOT UPGRADINGPRODUCTCODE) AND REMOVE)"/>
-      <ns0:Custom Action="PatchWebDAVUninstall" Before="RemoveFiles" Condition="Installed AND (NOT REINSTALL) AND (NOT UPGRADINGPRODUCTCODE) AND REMOVE" />
       <!-- Configure update check setting if property is provided -->
       <ns0:Custom Action="PatchUpdateCheck" After="PatchWebDAV" Condition="DISABLEUPDATECHECK AND NOT (Installed AND (NOT REINSTALL) AND (NOT UPGRADINGPRODUCTCODE) AND REMOVE)"/>
     </ns0:InstallExecuteSequence>
@@ -228,7 +225,7 @@
       <ns0:Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
     </ns0:InstallUISequence>
 
-    <ns0:WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />
-    <ns0:WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
+    <ns0:WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)banner.bmp" />
+    <ns0:WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)background.bmp" />
   </ns0:Package>
-</ns0:Wix>
+</ns0:Wix>

src/main/java/org/cryptomator/common/vaults/NotAVaultDirectoryException.java

@@ -1,32 +0,0 @@
-package org.cryptomator.common.vaults;
-
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-
-public class NotAVaultDirectoryException extends NoSuchFileException {
-
-	public enum Reason {
-		MISSING_DATA_DIR,
-		DATA_NOT_A_DIRECTORY,
-		MISSING_VAULT_CONFIG,
-		VAULT_CONFIG_ACCESS_DENIED,
-		UNSUPPORTED_STRUCTURE
-	}
-
-	private final transient Path path;
-	private final Reason reason;
-
-	public NotAVaultDirectoryException(Path path, Reason reason) {
-		super(path.toString(), null, "Not a vault directory: " + reason);
-		this.path = path;
-		this.reason = reason;
-	}
-
-	public Path path() {
-		return path;
-	}
-
-	public Reason notAVaultReason() {
-		return reason;
-	}
-}

src/main/java/org/cryptomator/common/vaults/VaultListManager.java

@@ -22,20 +22,20 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.ResourceBundle;
 
 import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME;
 import static org.cryptomator.common.vaults.VaultState.Value.*;
-import static org.cryptomator.cryptofs.common.Constants.DATA_DIR_NAME;
 
 @Singleton
 public class VaultListManager {
@@ -72,51 +72,20 @@ public class VaultListManager {
 		return vaultList.stream().anyMatch(v -> vaultPath.equals(v.getPath()));
 	}
 
-	/**
-	 * Safe to call from any thread: the IO work runs on the calling thread, but the
-	 * {@code ObservableList} mutation is marshaled to the JavaFX application thread.
-	 */
 	public Vault add(Path pathToVault) throws IOException {
 		Path normalizedPathToVault = pathToVault.normalize().toAbsolutePath();
-		assertIsVaultDirectory(normalizedPathToVault);
+		if (CryptoFileSystemProvider.checkDirStructureForVault(normalizedPathToVault, VAULTCONFIG_FILENAME, MASTERKEY_FILENAME) == DirStructure.UNRELATED) {
+			throw new NoSuchFileException(normalizedPathToVault.toString(), null, "Not a vault directory");
+		}
 
 		return get(normalizedPathToVault) //
 				.orElseGet(() -> {
 					Vault newVault = create(newVaultSettings(normalizedPathToVault));
-					if (Platform.isFxApplicationThread()) {
-						vaultList.add(newVault);
-					} else {
-						Platform.runLater(() -> vaultList.add(newVault));
-					}
+					vaultList.add(newVault);
 					return newVault;
 				});
 	}
 
-	public static void assertIsVaultDirectory(Path pathToVault) throws IOException {
-		if (CryptoFileSystemProvider.checkDirStructureForVault(pathToVault, VAULTCONFIG_FILENAME, MASTERKEY_FILENAME) == DirStructure.UNRELATED) {
-			Path dataDir = pathToVault.resolve(DATA_DIR_NAME);
-			if (!Files.isDirectory(dataDir)) {
-				if (Files.exists(dataDir)) {
-					throw new NotAVaultDirectoryException(pathToVault, NotAVaultDirectoryException.Reason.DATA_NOT_A_DIRECTORY);
-				} else {
-					throw new NotAVaultDirectoryException(pathToVault, NotAVaultDirectoryException.Reason.MISSING_DATA_DIR);
-				}
-			}
-
-			Path vaultConfig = pathToVault.resolve(VAULTCONFIG_FILENAME);
-			if (!Files.isReadable(vaultConfig)) {
-				if (Files.exists(vaultConfig)) {
-					throw new NotAVaultDirectoryException(pathToVault, NotAVaultDirectoryException.Reason.VAULT_CONFIG_ACCESS_DENIED);
-				} else {
-					throw new NotAVaultDirectoryException(pathToVault, NotAVaultDirectoryException.Reason.MISSING_VAULT_CONFIG);
-				}
-			}
-
-			//if vault is legacy _and_ not readable, just say unsupported
-			throw new NotAVaultDirectoryException(pathToVault, NotAVaultDirectoryException.Reason.UNSUPPORTED_STRUCTURE);
-		}
-	}
-
 	private VaultSettings newVaultSettings(Path path) {
 		VaultSettings vaultSettings = VaultSettings.withRandomId();
 		vaultSettings.path.set(path);
@@ -184,7 +153,7 @@ public class VaultListManager {
 				//for legacy reasons: pre v8 vault do not have a config, but they are in the NEEDS_MIGRATION state
 				vaultSettings.lastKnownKeyLoader.set(MasterkeyFileLoadingStrategy.SCHEME);
 			}
-			case VAULT_CONFIG_MISSING -> {
+			case VAULT_CONFIG_MISSING ->  {
 				//Nothing to do here, since there is no config to read
 			}
 			case MISSING, ALL_MISSING, ERROR, PROCESSING -> {

src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java

@@ -2,14 +2,12 @@ package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.NotAVaultDirectoryException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.cryptomator.ui.fxapp.FxApplicationStyle;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.slf4j.Logger;
@@ -43,7 +41,6 @@ public class ChooseExistingVaultController implements FxController {
 	private final ObjectProperty<Vault> vault;
 	private final VaultListManager vaultListManager;
 	private final ResourceBundle resourceBundle;
-	private final Dialogs dialogs;
 	private final ObservableValue<Image> screenshot;
 
 	@Inject
@@ -54,7 +51,6 @@ public class ChooseExistingVaultController implements FxController {
 								  @AddVaultWizardWindow ObjectProperty<Vault> vault, //
 								  VaultListManager vaultListManager, //
 								  ResourceBundle resourceBundle, //
-								  Dialogs dialogs, //
 								  FxApplicationStyle applicationStyle) {
 		this.window = window;
 		this.successScene = successScene;
@@ -63,7 +59,6 @@ public class ChooseExistingVaultController implements FxController {
 		this.vault = vault;
 		this.vaultListManager = vaultListManager;
 		this.resourceBundle = resourceBundle;
-		this.dialogs = dialogs;
 		this.screenshot = applicationStyle.appliedAppThemeProperty().map(this::selectScreenshot);
 	}
 
@@ -92,9 +87,6 @@ public class ChooseExistingVaultController implements FxController {
 				Vault newVault = vaultListManager.add(vaultPath.get());
 				vault.set(newVault);
 				window.setScene(successScene.get());
-			} catch (NotAVaultDirectoryException e) {
-				LOG.warn("Selected folder is not a vault directory: {}", e.getMessage());
-				dialogs.prepareNotAVaultDirectoryDialog(window, e).build().showAndWait();
 			} catch (IOException e) {
 				LOG.error("Failed to open existing vault.", e);
 				appWindows.showErrorWindow(e, window, window.getScene());

src/main/java/org/cryptomator/ui/dialogs/Dialogs.java

@@ -1,7 +1,6 @@
 package org.cryptomator.ui.dialogs;
 
 import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.vaults.NotAVaultDirectoryException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.StageFactory;
@@ -140,24 +139,6 @@ public class Dialogs {
 				.setCancelAction(Stage::close);
 	}
 
-	public SimpleDialog.Builder prepareNotAVaultDirectoryDialog(Stage window, NotAVaultDirectoryException e) {
-		String descriptionKey = switch (e.notAVaultReason()) {
-			case MISSING_DATA_DIR -> "addvaultwizard.existing.notAVault.description.missingDataDir";
-			case DATA_NOT_A_DIRECTORY -> "addvaultwizard.existing.notAVault.description.dataNotADirectory";
-			case MISSING_VAULT_CONFIG -> "addvaultwizard.existing.notAVault.description.missingVaultConfig";
-			case VAULT_CONFIG_ACCESS_DENIED -> "addvaultwizard.existing.notAVault.description.vaultConfigAccessDenied";
-			case UNSUPPORTED_STRUCTURE -> "addvaultwizard.existing.notAVault.description.unsupportedStructure";
-		};
-		return createDialogBuilder() //
-				.setOwner(window) //
-				.setTitleKey("addvaultwizard.existing.notAVault.title") //
-				.setMessageKey("addvaultwizard.existing.notAVault.message") //
-				.setDescriptionKey(descriptionKey, e.path().getFileName() != null ? e.path().getFileName().toString() : e.path().toString()) //
-				.setIcon(FontAwesome5Icon.EXCLAMATION) //
-				.setOkButtonKey(BUTTON_KEY_CLOSE) //
-				.setOkAction(Stage::close);
-	}
-
 	public SimpleDialog.Builder prepareNoDDirectorySelectedDialog(Stage window) {
 		return createDialogBuilder() //
 				.setOwner(window) //

src/main/java/org/cryptomator/ui/fxapp/AppLaunchEventHandler.java

@@ -1,18 +1,15 @@
 package org.cryptomator.ui.fxapp;
 
-import org.cryptomator.common.vaults.NotAVaultDirectoryException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.launcher.AppLaunchEvent;
 import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.dialogs.Dialogs;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.application.Platform;
-import javafx.stage.Stage;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
@@ -32,18 +29,14 @@ class AppLaunchEventHandler {
 	private final FxApplicationWindows appWindows;
 	private final VaultListManager vaultListManager;
 	private final VaultService vaultService;
-	private final Stage primaryStage;
-	private final Dialogs dialogs;
 
 	@Inject
-	public AppLaunchEventHandler(@Named("launchEventQueue") BlockingQueue<AppLaunchEvent> launchEventQueue, ExecutorService executorService, FxApplicationWindows appWindows, VaultListManager vaultListManager, VaultService vaultService, @PrimaryStage Stage primaryStage, Dialogs dialogs) {
+	public AppLaunchEventHandler(@Named("launchEventQueue") BlockingQueue<AppLaunchEvent> launchEventQueue, ExecutorService executorService, FxApplicationWindows appWindows, VaultListManager vaultListManager, VaultService vaultService) {
 		this.launchEventQueue = launchEventQueue;
 		this.executorService = executorService;
 		this.appWindows = appWindows;
 		this.vaultListManager = vaultListManager;
 		this.vaultService = vaultService;
-		this.primaryStage = primaryStage;
-		this.dialogs = dialogs;
 	}
 
 	public void startHandlingLaunchEvents() {
@@ -65,34 +58,31 @@ class AppLaunchEventHandler {
 	private void handleLaunchEvent(AppLaunchEvent event) {
 		switch (event.type()) {
 			case REVEAL_APP -> appWindows.showMainWindow();
-			case OPEN_FILE -> event.pathsToOpen().forEach(this::openPotentialVault);
+			case OPEN_FILE -> Platform.runLater(() -> {
+				event.pathsToOpen().forEach(this::openPotentialVault);
+			});
 			default -> LOG.warn("Unsupported event type: {}", event.type());
 		}
 	}
 
 	// TODO deduplicate MainWindowController...
 	private void openPotentialVault(Path path) {
-		assert !Platform.isFxApplicationThread();
-		Path potentialVaultPath = path.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT) ? path.getParent() : path;
-		Optional<Vault> existing = vaultListManager.get(potentialVaultPath.normalize().toAbsolutePath());
-		if (existing.isPresent()) {
-			Platform.runLater(() -> {
-				if (existing.get().isUnlocked()) {
-					vaultService.reveal(existing.get());
-				} else if (existing.get().isLocked()) {
-					appWindows.startUnlockWorkflow(existing.get(), null);
-				}
-			});
-			return;
-		}
+		assert Platform.isFxApplicationThread();
 		try {
-			vaultListManager.add(potentialVaultPath);
-			LOG.debug("Added vault {}", potentialVaultPath);
-		} catch (NotAVaultDirectoryException e) {
-			LOG.warn("Cannot add {}: {}", potentialVaultPath, e.getMessage());
-			Platform.runLater(() -> dialogs.prepareNotAVaultDirectoryDialog(primaryStage, e).build().showAndWait());
+			Path potentialVaultPath = path.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT) ? path.getParent() : path;
+			final Optional<Vault> v = vaultListManager.get(potentialVaultPath);
+			if (v.isPresent()) {
+				if (v.get().isUnlocked()) {
+					vaultService.reveal(v.get());
+				} else if (v.get().isLocked()) {
+					appWindows.startUnlockWorkflow(v.get(), null);
+				}
+			} else {
+				vaultListManager.add(potentialVaultPath);
+				LOG.debug("Added vault {}", potentialVaultPath);
+			}
 		} catch (IOException e) {
-			LOG.error("Failed to add vault {}", potentialVaultPath, e);
+			LOG.error("Failed to add vault " + path, e);
 		}
 	}
 

src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -4,7 +4,6 @@ import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.recovery.RecoveryActionType;
 import org.cryptomator.common.recovery.VaultPreparator;
 import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.vaults.NotAVaultDirectoryException;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultComponent;
 import org.cryptomator.common.vaults.VaultListManager;
@@ -24,7 +23,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -57,7 +55,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_EXT;
@@ -93,7 +90,6 @@ public class VaultListController implements FxController {
 	private final VaultComponent.Factory vaultComponentFactory;
 	private final RecoveryKeyComponent.Factory recoveryKeyWindow;
 	private final List<MountService> mountServices;
-	private final ExecutorService executor;
 
 	public ListView<Vault> vaultList;
 	public StackPane root;
@@ -117,8 +113,7 @@ public class VaultListController implements FxController {
 						RecoveryKeyComponent.Factory recoveryKeyWindow, //
 						VaultComponent.Factory vaultComponentFactory, //
 						List<MountService> mountServices, //
-						FxFSEventList fxFSEventList, //
-						ExecutorService executor) {
+						FxFSEventList fxFSEventList) {
 		this.mainWindow = mainWindow;
 		this.vaults = vaults;
 		this.selectedVault = selectedVault;
@@ -132,7 +127,6 @@ public class VaultListController implements FxController {
 		this.recoveryKeyWindow = recoveryKeyWindow;
 		this.vaultComponentFactory = vaultComponentFactory;
 		this.mountServices = mountServices;
-		this.executor = executor;
 
 		this.emptyVaultList = Bindings.isEmpty(vaults);
 		this.unreadEvents = fxFSEventList.unreadEventsProperty();
@@ -330,17 +324,15 @@ public class VaultListController implements FxController {
 	}
 
 	private void addVault(Path pathToVault) {
-		Path target = pathToVault.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT) ? pathToVault.getParent() : pathToVault;
-		executor.execute(() -> {
-			try {
-				vaultListManager.add(target);
-			} catch (NotAVaultDirectoryException e) {
-				LOG.warn("Cannot add {}: {}", target, e.getMessage());
-				Platform.runLater(() -> dialogs.prepareNotAVaultDirectoryDialog(mainWindow, e).build().showAndWait());
-			} catch (IOException e) {
-				LOG.error("Failed to add vault {}", target, e);
+		try {
+			if (pathToVault.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT)) {
+				vaultListManager.add(pathToVault.getParent());
+			} else {
+				vaultListManager.add(pathToVault);
 			}
-		});
+		} catch (IOException e) {
+			LOG.debug("Not a vault: {}", pathToVault);
+		}
 	}
 
 	@FXML

src/main/resources/i18n/strings.properties

@@ -110,13 +110,6 @@ addvaultwizard.existing.restore=Restore…
 addvaultwizard.existing.chooseBtn=Choose…
 addvaultwizard.existing.filePickerTitle=Select Vault File
 addvaultwizard.existing.filePickerMimeDesc=Cryptomator Vault
-addvaultwizard.existing.notAVault.title=Not a Vault
-addvaultwizard.existing.notAVault.message=The selected folder is not a Cryptomator vault
-addvaultwizard.existing.notAVault.description.missingDataDir=The required "d" subdirectory is missing inside "%s".
-addvaultwizard.existing.notAVault.description.dataNotADirectory=The "d" entry inside "%s" is not a directory.
-addvaultwizard.existing.notAVault.description.missingVaultConfig=The required "vault.cryptomator" file is missing inside "%s".
-addvaultwizard.existing.notAVault.description.vaultConfigAccessDenied=File "vault.cryptomator" inside "%s" cannot be read due to insufficient access rights.
-addvaultwizard.existing.notAVault.description.unsupportedStructure=The directory structure of "%s" is not supported.
 ## Success
 addvaultwizard.success.nextStepsInstructions=Added vault "%s".\nYou need to unlock this vault to access or add contents. Alternatively you can unlock it at any later point in time.
 addvaultwizard.success.unlockNow=Unlock Now

src/test/java/org/cryptomator/common/vaults/VaultListManagerTest.java

@@ -1,70 +0,0 @@
-package org.cryptomator.common.vaults;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
-import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME;
-import static org.cryptomator.cryptofs.common.Constants.DATA_DIR_NAME;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-class VaultListManagerTest {
-
-	@Test
-	void testAssertIsVaultDirectoryWhenDataDirIsMissing(@TempDir Path tmpDir) {
-		NotAVaultDirectoryException e = assertThrows(NotAVaultDirectoryException.class, () -> {
-			VaultListManager.assertIsVaultDirectory(tmpDir);
-		});
-
-		assertEquals(NotAVaultDirectoryException.Reason.MISSING_DATA_DIR, e.notAVaultReason());
-	}
-
-	@Test
-	void testAssertIsVaultDirectoryWhenDataDirIsFile(@TempDir Path tmpDir) throws IOException {
-		Files.createFile(tmpDir.resolve(DATA_DIR_NAME));
-
-		NotAVaultDirectoryException e = assertThrows(NotAVaultDirectoryException.class, () -> {
-			VaultListManager.assertIsVaultDirectory(tmpDir);
-		});
-
-		assertEquals(NotAVaultDirectoryException.Reason.DATA_NOT_A_DIRECTORY, e.notAVaultReason());
-	}
-
-	@Test
-	void testAssertIsVaultDirectoryWhenVaultConfigAndMasterkeyAreMissing(@TempDir Path tmpDir) throws IOException {
-		Files.createDirectory(tmpDir.resolve(DATA_DIR_NAME));
-
-		NotAVaultDirectoryException e = assertThrows(NotAVaultDirectoryException.class, () -> {
-			VaultListManager.assertIsVaultDirectory(tmpDir);
-		});
-
-		assertEquals(NotAVaultDirectoryException.Reason.MISSING_VAULT_CONFIG, e.notAVaultReason());
-	}
-
-	@Test
-	void testAssertIsVaultDirectoryAcceptsModernVault(@TempDir Path tmpDir) throws IOException {
-		Files.createDirectory(tmpDir.resolve(DATA_DIR_NAME));
-		Files.createFile(tmpDir.resolve(VAULTCONFIG_FILENAME));
-
-		assertDoesNotThrow(() -> {
-			VaultListManager.assertIsVaultDirectory(tmpDir);
-		});
-	}
-
-	@Test
-	void testAssertIsVaultDirectoryAcceptsLegacyVaultCandidate(@TempDir Path tmpDir) throws IOException {
-		Files.createDirectory(tmpDir.resolve(DATA_DIR_NAME));
-		Files.createFile(tmpDir.resolve(MASTERKEY_FILENAME));
-
-		assertDoesNotThrow(() -> {
-			VaultListManager.assertIsVaultDirectory(tmpDir);
-		});
-	}
-
-}