diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index a4ce7dfde..51c99c6e0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -6,7 +6,6 @@ import dagger.Provides; import dagger.multibindings.IntoMap; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; -import javafx.collections.ObservableList; import javafx.stage.Modality; import javafx.stage.Stage; import javafx.stage.StageStyle; @@ -14,7 +13,6 @@ import org.cryptomator.ui.common.FXMLLoaderFactory; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.mainwindow.MainWindow; -import org.cryptomator.ui.model.Vault; import javax.inject.Provider; import java.nio.file.Path; @@ -50,12 +48,6 @@ public abstract class AddVaultModule { return new SimpleObjectProperty<>(); } - @Provides - @AddVaultWizardScoped - static ObservableList provideVaults(@AddVaultWizard ObservableList vaults) { - return vaults; - } - // ------------------ @Binds diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java index 1488f4295..dbb31d5f6 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java @@ -5,12 +5,9 @@ *******************************************************************************/ package org.cryptomator.ui.addvaultwizard; -import dagger.BindsInstance; import dagger.Subcomponent; -import javafx.collections.ObservableList; import javafx.stage.Stage; import org.cryptomator.ui.common.FXMLLoaderFactory; -import org.cryptomator.ui.model.Vault; @AddVaultWizardScoped @Subcomponent(modules = {AddVaultModule.class}) @@ -32,9 +29,6 @@ public interface AddVaultWizardComponent { @Subcomponent.Builder interface Builder { - @BindsInstance - Builder vaults(@AddVaultWizard ObservableList vaults); - AddVaultWizardComponent build(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 3b38eea61..53f701281 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -25,7 +25,7 @@ public class ChooseExistingVaultController implements FxController { private final VaultFactory vaultFactory; @Inject - ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty vaultPath, @AddVaultWizard ObservableList vaults, VaultFactory vaultFactory) { + ChooseExistingVaultController(@AddVaultWizard Stage window, @AddVaultWizard FXMLLoaderFactory fxmlLoaders, ObjectProperty vaultPath, ObservableList vaults, VaultFactory vaultFactory) { this.window = window; this.fxmlLoaders = fxmlLoaders; this.vaultPath = vaultPath; diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 250752b7d..6715d811c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -41,7 +41,7 @@ public class VaultListController implements FxController { } public void didClickAddVault() { - addVaultWizard.vaults(vaults).build().showAddVaultWizard(); + addVaultWizard.build().showAddVaultWizard(); } public void didClickRemoveVault() {