diff --git a/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/src/main/java/org/cryptomator/ui/common/FxmlFile.java index ea0c1ed38..b8d5bbff0 100644 --- a/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -12,7 +12,6 @@ public enum FxmlFile { ERROR("/fxml/error.fxml"), // FORGET_PASSWORD("/fxml/forget_password.fxml"), // HEALTH_START("/fxml/health_start.fxml"), // - HEALTH_START_FAIL("/fxml/health_start_fail.fxml"), // HEALTH_CHECK_LIST("/fxml/health_check_list.fxml"), // LOCK_FORCED("/fxml/lock_forced.fxml"), // LOCK_FAILED("/fxml/lock_failed.fxml"), // diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java index a98807d82..c36f486e0 100644 --- a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java +++ b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java @@ -116,13 +116,6 @@ abstract class HealthCheckModule { return fxmlLoaders.createScene(FxmlFile.HEALTH_START); } - @Provides - @FxmlScene(FxmlFile.HEALTH_START_FAIL) - @HealthCheckScoped - static Scene provideHealthStartFailScene(@HealthCheckWindow FxmlLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.HEALTH_START_FAIL); - } - @Provides @FxmlScene(FxmlFile.HEALTH_CHECK_LIST) @HealthCheckScoped @@ -135,11 +128,6 @@ abstract class HealthCheckModule { @FxControllerKey(StartController.class) abstract FxController bindStartController(StartController controller); - @Binds - @IntoMap - @FxControllerKey(StartFailController.class) - abstract FxController bindStartFailController(StartFailController controller); - @Binds @IntoMap @FxControllerKey(CheckListController.class) diff --git a/src/main/java/org/cryptomator/ui/health/StartFailController.java b/src/main/java/org/cryptomator/ui/health/StartFailController.java deleted file mode 100644 index 80b97bb44..000000000 --- a/src/main/java/org/cryptomator/ui/health/StartFailController.java +++ /dev/null @@ -1,79 +0,0 @@ -package org.cryptomator.ui.health; - -import com.google.common.base.Preconditions; -import org.cryptomator.cryptofs.VaultConfigLoadException; -import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.controls.FontAwesome5Icon; - -import javax.inject.Inject; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.value.ObservableValue; -import javafx.fxml.FXML; -import javafx.scene.control.TitledPane; -import javafx.stage.Stage; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; - -// TODO reevaluate config loading, as soon as we have the new generic error screen -@HealthCheckScoped -@Deprecated -public class StartFailController implements FxController { - - private final Stage window; - private final ObjectProperty loadError; - private final ObjectProperty moreInfoIcon; - - /* FXML */ - public TitledPane moreInfoPane; - - @Inject - public StartFailController(@HealthCheckWindow Stage window) { - this.window = window; - this.loadError = new SimpleObjectProperty<>(new IllegalStateException("This class is not reachable anymore")); - this.moreInfoIcon = new SimpleObjectProperty<>(FontAwesome5Icon.CARET_RIGHT); - } - - public void initialize() { - moreInfoPane.expandedProperty().addListener(this::setMoreInfoIcon); - } - - private void setMoreInfoIcon(ObservableValue observable, boolean wasExpanded, boolean willExpand) { - moreInfoIcon.set(willExpand ? FontAwesome5Icon.CARET_DOWN : FontAwesome5Icon.CARET_RIGHT); - } - - @FXML - public void close() { - window.close(); - } - - /* Getter & Setter */ - - public ObjectProperty moreInfoIconProperty() { - return moreInfoIcon; - } - - public FontAwesome5Icon getMoreInfoIcon() { - return moreInfoIcon.getValue(); - } - - public String getStackTrace() { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - loadError.get().printStackTrace(new PrintStream(baos)); - return baos.toString(StandardCharsets.UTF_8); - } - - public String getLocalizedErrorMessage() { - return loadError.get().getLocalizedMessage(); - } - - public boolean isParseException() { - return loadError.get() instanceof VaultConfigLoadException; - } - - public boolean isIoException() { - return !isParseException(); - } - -} diff --git a/src/main/resources/fxml/health_start_fail.fxml b/src/main/resources/fxml/health_start_fail.fxml deleted file mode 100644 index 9a35e4788..000000000 --- a/src/main/resources/fxml/health_start_fail.fxml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - -