diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java index 8b0e5f416..e67ca87c6 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java @@ -138,7 +138,7 @@ public class RecoveryKeyCreationController implements FxController { @FXML public void restoreWithPasswordAsync() { - Task task = createTask(this::restoreWithPassword); + Task task = RecoveryKeyTasks.createTask(this::restoreWithPassword); task.setOnScheduled(_ -> { LOG.debug("Restoring vault configuration with password for {}.", vault.getDisplayablePath()); @@ -196,21 +196,6 @@ public class RecoveryKeyCreationController implements FxController { window.close(); } - @FunctionalInterface - private interface TaskAction { - void run() throws Exception; - } - - private Task createTask(TaskAction action) { - return new Task() { - @Override - protected Void call() throws Exception { - action.run(); - return null; - } - }; - } - private class RecoveryKeyCreationTask extends Task { private RecoveryKeyCreationTask() { diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java index ccc7df0e3..b57758b67 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java @@ -125,7 +125,7 @@ public class RecoveryKeyResetPasswordController implements FxController { @FXML public void restorePasswordAsync() { - Task task = createTask(this::restorePassword); + Task task = RecoveryKeyTasks.createTask(this::restorePassword); task.setOnScheduled(_ -> { LOG.debug("Restoring vault configuration for {}.", vault.getDisplayablePath()); @@ -196,21 +196,6 @@ public class RecoveryKeyResetPasswordController implements FxController { executor.submit(task); } - @FunctionalInterface - private interface TaskAction { - void run() throws Exception; - } - - private Task createTask(TaskAction action) { - return new Task() { - @Override - protected Void call() throws Exception { - action.run(); - return null; - } - }; - } - private class ResetPasswordTask extends Task { private static final Logger LOG = LoggerFactory.getLogger(ResetPasswordTask.class); diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyTasks.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyTasks.java new file mode 100644 index 000000000..ba6caf249 --- /dev/null +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyTasks.java @@ -0,0 +1,25 @@ +package org.cryptomator.ui.recoverykey; + +import javafx.concurrent.Task; + +final class RecoveryKeyTasks { + + private RecoveryKeyTasks() { + } + + @FunctionalInterface + interface TaskAction { + void run() throws Exception; + } + + static Task createTask(TaskAction action) { + return new Task() { + @Override + protected Void call() throws Exception { + action.run(); + return null; + } + }; + } + +}