Merge branch 'develop' into feature/simplified-workflow-results,

solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java

.github/workflows/release.yml

@@ -184,7 +184,7 @@ jobs:
           --dest appdir
           --name Cryptomator
           --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2021 Skymatic GmbH"
+          --copyright "(C) 2016 - 2022 Skymatic GmbH"
           --java-options "-Xss5m"
           --java-options "-Xmx256m"
           --java-options "-Dcryptomator.appVersion=\"${{ needs.metadata.outputs.semVerStr }}\""
@@ -529,7 +529,7 @@ jobs:
           --dest installer
           --name Cryptomator
           --vendor "Skymatic GmbH"
-          --copyright "(C) 2016 - 2021 Skymatic GmbH"
+          --copyright "(C) 2016 - 2022 Skymatic GmbH"
           --app-version "${{ needs.metadata.outputs.semVerNum }}"
           --win-menu
           --win-dir-chooser
@@ -612,14 +612,18 @@ jobs:
             *.asc
             *.dmg
             *.msi
-          body: |
+          body: |-
             :construction: Work in Progress
-            ## What's new
+            ## What's New
             ## Bugfixes
             ## Misc
+            
             ---
-            :scroll: A complete list of closed issues is available [here](LINK)
+            
+            :scroll: A complete list of closed issues is available [here](LINK).
+            
             ---
+            
             :floppy_disk: SHA-256 checksums of release artifacts:
             ```
             ${{ env.SHA256_SUMS }}

dist/linux/appimage/build.sh

@@ -35,7 +35,7 @@ ${JAVA_HOME}/bin/jpackage \
     --dest . \
     --name Cryptomator \
     --vendor "Skymatic GmbH" \
-    --copyright "(C) 2016 - 2021 Skymatic GmbH" \
+    --copyright "(C) 2016 - 2022 Skymatic GmbH" \
     --java-options "-Xss5m" \
     --java-options "-Xmx256m" \
     --app-version "${VERSION}.${REVISION_NO}" \

dist/linux/debian/copyright

@@ -4,11 +4,11 @@ Upstream-Contact: Cryptomator <info@cryptomator.org>
 Source: https://cryptomator.org
 
 Files: *
-Copyright: 2016-2021 Skymatic GmbH
+Copyright: 2016-2022 Skymatic GmbH
 License: GPL-3+
 
 Files: debian/org.cryptomator.Cryptomator.appdata.xml
-Copyright: 2016-2021 Skymatic GmbH
+Copyright: 2016-2022 Skymatic GmbH
 License: FSFAP
 
 License: GPL-3+
@@ -36,4 +36,4 @@ License: FSFAP
  Copying and distribution of this file, with or without modification, are
  permitted in any medium without royalty provided the copyright notice and
  this notice are preserved. This file is offered as-is, without any
- warranty.
+ warranty.

dist/linux/debian/rules

@@ -29,7 +29,7 @@ override_dh_auto_build:
 		--dest . \
 		--name cryptomator \
 		--vendor "Skymatic GmbH" \
-		--copyright "(C) 2016 - 2021 Skymatic GmbH" \
+		--copyright "(C) 2016 - 2022 Skymatic GmbH" \
 		--java-options "-Xss5m" \
 		--java-options "-Xmx256m" \
 		--java-options "-Dfile.encoding=\"utf-8\"" \

dist/mac/Cryptomator.entitlements

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>com.apple.security.cs.allow-dyld-environment-variables</key>
-	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
 	<key>com.apple.security.cs.allow-unsigned-executable-memory</key>

dist/mac/dmg/build.sh

@@ -54,7 +54,7 @@ ${JAVA_HOME}/bin/jpackage \
     --dest . \
     --name Cryptomator \
     --vendor "Skymatic GmbH" \
-    --copyright "(C) 2016 - 2021 Skymatic GmbH" \
+    --copyright "(C) 2016 - 2022 Skymatic GmbH" \
     --java-options "-Xss5m" \
     --java-options "-Xmx256m" \
     --java-options "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \

dist/mac/dmg/resources/license.rtf

@@ -10,7 +10,7 @@
 \f1\b0 \
 \
 
-\f0\b \'a9 2016 \'96 2021 Skymatic GmbH
+\f0\b \'a9 2016 \'96 2022 Skymatic GmbH
 \f1\b0 \
 \
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
@@ -97,4 +97,4 @@ You should have received a copy of the GNU General Public License along with thi
 	SIL OFL 1.1 License:\
 		- Font Awesome 5.12.0 ({\field{\*\fldinst{HYPERLINK "https://fontawesome.com/"}}{\fldrslt https://fontawesome.com/}})\
 \
-}
+}

dist/win/build.ps1

@@ -47,7 +47,7 @@ Copy-Item "$buildDir\..\..\target\cryptomator-*.jar" -Destination "$buildDir\..\
 	--dest . `
 	--name Cryptomator `
 	--vendor "Skymatic GmbH" `
-	--copyright "(C) 2016 - 2021 Skymatic GmbH" `
+	--copyright "(C) 2016 - 2022 Skymatic GmbH" `
 	--java-options "-Xss5m" `
 	--java-options "-Xmx256m" `
 	--java-options "-Dcryptomator.appVersion=`"$semVerNo`"" `
@@ -78,7 +78,7 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 	--dest installer `
 	--name Cryptomator `
 	--vendor "Skymatic GmbH" `
-	--copyright "(C) 2016 - 2021 Skymatic GmbH" `
+	--copyright "(C) 2016 - 2022 Skymatic GmbH" `
 	--app-version "$semVerNo" `
 	--win-menu `
 	--win-dir-chooser `
@@ -87,4 +87,4 @@ $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources"
 	--win-menu-group Cryptomator `
 	--resource-dir resources `
 	--license-file resources/license.rtf `
-	--file-associations resources/FAvaultFile.properties
+	--file-associations resources/FAvaultFile.properties

dist/win/resources/license.rtf

@@ -3,7 +3,7 @@
 {\*\generator Riched20 10.0.17134}\viewkind4\uc1 
 \pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\b\fs16\lang7 Cryptomator is distributed under the GPLv3 License, found below. Please see the bottom of this document for any other license applicable to code used within Cryptomator.\b0\par
 \par
-\b\'a9 2016 \endash  2021 Skymatic GmbH\b0\par
+\b\'a9 2016 \endash  2022 Skymatic GmbH\b0\par
 \par
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\par
 \par
@@ -82,4 +82,3 @@ You should have received a copy of the GNU General Public License along with thi
 \tab SIL OFL 1.1 License:\par
 \tab\tab - Font Awesome 5.12.0 ({{\field{\*\fldinst{HYPERLINK https://fontawesome.com/ }}{\fldrslt{https://fontawesome.com/\ul0\cf0}}}}\f0\fs16 )\b\par
 }
-

pom.xml

@@ -27,7 +27,7 @@
 		<nonModularGroupIds>com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.3.0</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.3.1</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.1.0-beta1</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.0.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.0.0</cryptomator.integrations.mac.version>
@@ -46,7 +46,7 @@
 		<gson.version>2.8.9</gson.version>
 		<zxcvbn.version>1.5.2</zxcvbn.version>
 		<slf4j.version>1.7.32</slf4j.version>
-		<logback.version>1.2.7</logback.version>
+		<logback.version>1.2.9</logback.version>
 
 		<!-- test dependencies -->
 		<junit.jupiter.version>5.8.1</junit.jupiter.version>

src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileModule.java

@@ -2,13 +2,16 @@ package org.cryptomator.ui.keyloading.masterkeyfile;
 
 import dagger.Module;
 import dagger.Provides;
+import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlLoaderFactory;
+import org.cryptomator.ui.keyloading.KeyLoading;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
@@ -26,13 +29,19 @@ interface ChooseMasterkeyFileModule {
 
 	@Provides
 	@ChooseMasterkeyFileScoped
-	static Scene provideChooseMasterkeyScene(ChooseMasterkeyFileController controller, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+	static Scene provideChooseMasterkeyScene(ChooseMasterkeyFileController controller, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle, @KeyLoading Stage window, @KeyLoading Vault v) {
 		// TODO: simplify FxmlLoaderFactory
 		try {
 			var url = FxmlLoaderFactory.class.getResource(FxmlFile.UNLOCK_SELECT_MASTERKEYFILE.getRessourcePathString());
 			var loader = new FXMLLoader(url, resourceBundle, null, clazz -> controller);
 			Parent root = loader.load();
-			return sceneFactory.apply(root);
+			var scene = sceneFactory.apply(root);
+			scene.windowProperty().addListener((prop, oldVal, newVal) -> {
+				if (window.equals(newVal)) {
+					window.setTitle(String.format(resourceBundle.getString("unlock.chooseMasterkey.title"), v.getDisplayName()));
+				}
+			});
+			return scene;
 		} catch (IOException e) {
 			throw new UncheckedIOException("Failed to load UnlockScene", e);
 		}

src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryModule.java

@@ -2,13 +2,16 @@ package org.cryptomator.ui.keyloading.masterkeyfile;
 
 import dagger.Module;
 import dagger.Provides;
+import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlLoaderFactory;
+import org.cryptomator.ui.keyloading.KeyLoading;
 
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.ResourceBundle;
@@ -25,13 +28,19 @@ interface PassphraseEntryModule {
 
 	@Provides
 	@PassphraseEntryScoped
-	static Scene provideUnlockScene(PassphraseEntryController controller, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+	static Scene provideUnlockScene(PassphraseEntryController controller, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle, @KeyLoading Stage window, @KeyLoading Vault v) {
 		// TODO: simplify FxmlLoaderFactory
 		try {
 			var url = FxmlLoaderFactory.class.getResource(FxmlFile.UNLOCK_ENTER_PASSWORD.getRessourcePathString());
 			var loader = new FXMLLoader(url, resourceBundle, null, clazz -> controller);
 			Parent root = loader.load();
-			return sceneFactory.apply(root);
+			var scene = sceneFactory.apply(root);
+			scene.windowProperty().addListener((prop, oldVal, newVal) -> {
+				if (window.equals(newVal)) {
+					window.setTitle(String.format(resourceBundle.getString("unlock.title"), v.getDisplayName()));
+				}
+			});
+			return scene;
 		} catch (IOException e) {
 			throw new UncheckedIOException("Failed to load UnlockScene", e);
 		}

src/main/resources/fxml/preferences_about.fxml

@@ -22,7 +22,7 @@
 			</ImageView>
 			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-large" format="Cryptomator %s" arg1="${controller.applicationVersion}"/>
-				<Label text="© 2016 – 2021 Skymatic GmbH"/>
+				<Label text="© 2016 – 2022 Skymatic GmbH"/>
 			</VBox>
 		</HBox>
 

src/main/resources/i18n/strings.properties

@@ -103,7 +103,8 @@ unlock.title=Unlock "%s"
 unlock.passwordPrompt=Enter password for "%s":
 unlock.savePassword=Remember Password
 unlock.unlockBtn=Unlock
-##
+## Select
+unlock.chooseMasterkey.title=Select Masterkey of "%s"
 unlock.chooseMasterkey.prompt=Could not find the masterkey file for this vault at its expected location. Please choose the key file manually.
 unlock.chooseMasterkey.filePickerTitle=Select Masterkey File
 ## Success

src/main/resources/license/THIRD-PARTY.txt

@@ -52,13 +52,13 @@ Cryptomator uses 40 third-party dependencies under the following licenses:
 			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:10.0.6 - https://eclipse.org/jetty/jetty-servlet)
 			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:10.0.6 - https://eclipse.org/jetty/jetty-util)
         Eclipse Public License - v 1.0:
-			- Logback Classic Module (ch.qos.logback:logback-classic:1.2.7 - http://logback.qos.ch/logback-classic)
-			- Logback Core Module (ch.qos.logback:logback-core:1.2.7 - http://logback.qos.ch/logback-core)
+			- Logback Classic Module (ch.qos.logback:logback-classic:1.2.9 - http://logback.qos.ch/logback-classic)
+			- Logback Core Module (ch.qos.logback:logback-core:1.2.9 - http://logback.qos.ch/logback-core)
         Eclipse Public License - v 2.0:
 			- jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
         GNU Lesser General Public License:
-			- Logback Classic Module (ch.qos.logback:logback-classic:1.2.7 - http://logback.qos.ch/logback-classic)
-			- Logback Core Module (ch.qos.logback:logback-core:1.2.7 - http://logback.qos.ch/logback-core)
+			- Logback Classic Module (ch.qos.logback:logback-classic:1.2.9 - http://logback.qos.ch/logback-classic)
+			- Logback Core Module (ch.qos.logback:logback-core:1.2.9 - http://logback.qos.ch/logback-core)
         GPLv2:
 			- jnr-posix (com.github.jnr:jnr-posix:3.1.10 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
         GPLv2+CE: