浏览代码

Revert "Save Touch ID setting per vault"

This reverts commit 10bce1fb06140c31287a5d0f274c7230c251a3ce.
Ralph Plawetzki 8 月之前
父节点
当前提交
c5bfdf32a9

+ 1 - 5
src/main/java/org/cryptomator/common/settings/VaultSettings.java

@@ -40,7 +40,6 @@ public class VaultSettings {
 	static final boolean DEFAULT_AUTOLOCK_WHEN_IDLE = false;
 	static final int DEFAULT_AUTOLOCK_IDLE_SECONDS = 30 * 60;
 	static final int DEFAULT_PORT = 42427;
-	static final boolean DEFAULT_USE_TOUCH_ID = false;
 
 	private static final Random RNG = new Random();
 
@@ -59,7 +58,6 @@ public class VaultSettings {
 	public final StringExpression mountName;
 	public final StringProperty mountService;
 	public final IntegerProperty port;
-	public final BooleanProperty useTouchID;
 
 	VaultSettings(VaultSettingsJson json) {
 		this.id = json.id;
@@ -86,7 +84,6 @@ public class VaultSettings {
 			}
 			return normalizeDisplayName(name);
 		}, displayName, path));
-		this.useTouchID = new SimpleBooleanProperty(this, "useTouchID", json.useTouchID);
 
 		migrateLegacySettings(json);
 	}
@@ -102,7 +99,7 @@ public class VaultSettings {
 	}
 
 	Observable[] observables() {
-		return new Observable[]{actionAfterUnlock, autoLockIdleSeconds, autoLockWhenIdle, displayName, maxCleartextFilenameLength, mountFlags, mountPoint, path, revealAfterMount, unlockAfterStartup, usesReadOnlyMode, port, mountService, useTouchID};
+		return new Observable[]{actionAfterUnlock, autoLockIdleSeconds, autoLockWhenIdle, displayName, maxCleartextFilenameLength, mountFlags, mountPoint, path, revealAfterMount, unlockAfterStartup, usesReadOnlyMode, port, mountService};
 	}
 
 	public static VaultSettings withRandomId() {
@@ -133,7 +130,6 @@ public class VaultSettings {
 		json.mountPoint = mountPoint.map(Path::toString).getValue();
 		json.mountService = mountService.get();
 		json.port = port.get();
-		json.useTouchID = useTouchID.get();
 		return json;
 	}
 

+ 0 - 2
src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java

@@ -65,6 +65,4 @@ class VaultSettingsJson {
 	@JsonAlias("individualMountPath")
 	String customMountPath;
 
-	@JsonProperty("useTouchID")
-	boolean useTouchID = VaultSettings.DEFAULT_USE_TOUCH_ID;
 }