Browse Source

Refactored UnlockWorkflow using new vault format 8 APIs

Sebastian Stenzel 4 years ago
parent
commit
ff17b60f56

+ 1 - 1
main/pom.xml

@@ -24,7 +24,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.0.0-beta2</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.0.0-beta3</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.2.1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/StaticMasterkeyFileLoaderContext.java

@@ -16,7 +16,7 @@ class StaticMasterkeyFileLoaderContext implements MasterkeyFileLoaderContext {
 	}
 
 	@Override
-	public Path getMasterkeyFilePath(String s) {
+	public Path getCorrectMasterkeyFilePath(String s) {
 		return masterkeyFilePath;
 	}
 

File diff suppressed because it is too large
+ 50 - 27
main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java