|
@@ -14,7 +14,6 @@ import org.cryptomator.ui.common.FxmlFile;
|
|
|
import org.cryptomator.ui.common.FxmlScene;
|
|
|
import org.cryptomator.ui.keyloading.KeyLoading;
|
|
|
import org.cryptomator.ui.keyloading.KeyLoadingScoped;
|
|
|
-import org.jetbrains.annotations.Nullable;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
@@ -33,7 +32,6 @@ import javafx.stage.Stage;
|
|
|
import javafx.stage.WindowEvent;
|
|
|
import java.io.IOException;
|
|
|
import java.net.InetAddress;
|
|
|
-import java.net.URI;
|
|
|
import java.net.http.HttpClient;
|
|
|
import java.net.http.HttpRequest;
|
|
|
import java.net.http.HttpResponse;
|
|
@@ -47,9 +45,9 @@ import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.atomic.AtomicReference;
|
|
|
|
|
|
@KeyLoadingScoped
|
|
|
-public class SetupDeviceController implements FxController {
|
|
|
+public class RegisterDeviceController implements FxController {
|
|
|
|
|
|
- private static final Logger LOG = LoggerFactory.getLogger(SetupDeviceController.class);
|
|
|
+ private static final Logger LOG = LoggerFactory.getLogger(RegisterDeviceController.class);
|
|
|
private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true);
|
|
|
|
|
|
private final Stage window;
|
|
@@ -70,7 +68,7 @@ public class SetupDeviceController implements FxController {
|
|
|
public Button registerBtn;
|
|
|
|
|
|
@Inject
|
|
|
- public SetupDeviceController(@KeyLoading Stage window, ExecutorService executor, HubConfig hubConfig, @Named("deviceId") String deviceId, DeviceKey deviceKey, CompletableFuture<ReceivedKey> result, @Named("bearerToken") AtomicReference<String> bearerToken, @FxmlScene(FxmlFile.HUB_REGISTER_SUCCESS) Lazy<Scene> registerSuccessScene, @FxmlScene(FxmlFile.HUB_REGISTER_FAILED) Lazy<Scene> registerFailedScene) {
|
|
|
+ public RegisterDeviceController(@KeyLoading Stage window, ExecutorService executor, HubConfig hubConfig, @Named("deviceId") String deviceId, DeviceKey deviceKey, CompletableFuture<ReceivedKey> result, @Named("bearerToken") AtomicReference<String> bearerToken, @FxmlScene(FxmlFile.HUB_REGISTER_SUCCESS) Lazy<Scene> registerSuccessScene, @FxmlScene(FxmlFile.HUB_REGISTER_FAILED) Lazy<Scene> registerFailedScene) {
|
|
|
this.window = window;
|
|
|
this.hubConfig = hubConfig;
|
|
|
this.deviceId = deviceId;
|