From 2225476bf84964d35961ce5f228f5b55262afc52 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 17 Jan 2024 13:33:38 +0100
Subject: [PATCH] reordered methods

[ci skip]
---
 .../keyloading/hub/ReceiveKeyController.java  | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
index 86f034a0c..624184d43 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
@@ -119,37 +119,6 @@ public class ReceiveKeyController implements FxController {
 		}
 	}
 
-	/**
-	 * STEP 2 (Request): GET vault key for this user
-	 */
-	private void requestVaultMasterkey(String encryptedUserKey) {
-		var vaultKeyUri = API_BASE."vaults/\{vaultId}/access-token";
-		var request = HttpRequest.newBuilder(vaultKeyUri) //
-				.header("Authorization", "Bearer " + bearerToken) //
-				.GET() //
-				.timeout(REQ_TIMEOUT) //
-				.build();
-		httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) //
-				.thenAcceptAsync(response -> receivedVaultMasterkey(encryptedUserKey, response), Platform::runLater) //
-				.exceptionally(this::retrievalFailed);
-	}
-
-	/**
-	 * STEP 2 (Response): GET vault key for this user
-	 *
-	 * @param response Response
-	 */
-	private void receivedVaultMasterkey(String encryptedUserKey, HttpResponse<String> response) {
-		LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode());
-		switch (response.statusCode()) {
-			case 200 -> receivedBothEncryptedKeys(response.body(), encryptedUserKey);
-			case 402 -> licenseExceeded();
-			case 403, 410 -> accessNotGranted(); // or vault has been archived, effectively disallowing access - TODO: add specific dialog?
-			case 449 -> accountInitializationRequired();
-			default -> throw new IllegalStateException("Unexpected response " + response.statusCode());
-		}
-	}
-
 	/**
 	 * STEP 1 (Request): GET user key for this device
 	 */
@@ -190,6 +159,37 @@ public class ReceiveKeyController implements FxController {
 		window.setScene(registerDeviceScene.get());
 	}
 
+	/**
+	 * STEP 2 (Request): GET vault key for this user
+	 */
+	private void requestVaultMasterkey(String encryptedUserKey) {
+		var vaultKeyUri = API_BASE."vaults/\{vaultId}/access-token";
+		var request = HttpRequest.newBuilder(vaultKeyUri) //
+				.header("Authorization", "Bearer " + bearerToken) //
+				.GET() //
+				.timeout(REQ_TIMEOUT) //
+				.build();
+		httpClient.sendAsync(request, HttpResponse.BodyHandlers.ofString(StandardCharsets.US_ASCII)) //
+				.thenAcceptAsync(response -> receivedVaultMasterkey(encryptedUserKey, response), Platform::runLater) //
+				.exceptionally(this::retrievalFailed);
+	}
+
+	/**
+	 * STEP 2 (Response): GET vault key for this user
+	 *
+	 * @param response Response
+	 */
+	private void receivedVaultMasterkey(String encryptedUserKey, HttpResponse<String> response) {
+		LOG.debug("GET {} -> Status Code {}", response.request().uri(), response.statusCode());
+		switch (response.statusCode()) {
+			case 200 -> receivedBothEncryptedKeys(response.body(), encryptedUserKey);
+			case 402 -> licenseExceeded();
+			case 403, 410 -> accessNotGranted(); // or vault has been archived, effectively disallowing access - TODO: add specific dialog?
+			case 449 -> accountInitializationRequired();
+			default -> throw new IllegalStateException("Unexpected response " + response.statusCode());
+		}
+	}
+
 	private void receivedBothEncryptedKeys(String encryptedVaultKey, String encryptedUserKey) {
 		try {
 			var vaultKeyJwe = JWEObject.parse(encryptedVaultKey);