From 1b7a7060a81c07dfee3b6d539e75c46cf37ac2f2 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Wed, 31 Jul 2019 11:44:39 +0200 Subject: [PATCH] moved Unlock component from MainWindow to FxApplication component --- .../java/org/cryptomator/ui/fxapp/FxApplicationModule.java | 5 +++-- .../java/org/cryptomator/ui/mainwindow/MainWindowModule.java | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 1509aaf59..6e3c94d9e 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -11,14 +11,15 @@ import dagger.Provides; import javafx.application.Application; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; +import org.cryptomator.common.vaults.Vault; import org.cryptomator.keychain.KeychainModule; import org.cryptomator.ui.mainwindow.MainWindowComponent; -import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.preferences.PreferencesComponent; +import org.cryptomator.ui.unlock.UnlockComponent; import java.util.ResourceBundle; -@Module(includes = {KeychainModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class}) +@Module(includes = {KeychainModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class}) abstract class FxApplicationModule { @Binds diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index 12b1bb62e..43c979d8c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -13,13 +13,12 @@ import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.unlock.UnlockComponent; import javax.inject.Provider; import java.util.Map; import java.util.ResourceBundle; -@Module(subcomponents = {AddVaultWizardComponent.class, UnlockComponent.class}) +@Module(subcomponents = {AddVaultWizardComponent.class}) abstract class MainWindowModule { @Provides