From 0feb9bc299333ccae1dd0e800e4026eec9725ca0 Mon Sep 17 00:00:00 2001
From: NaiJi <naijiworld@protonmail.com>
Date: Wed, 15 Jun 2022 07:51:32 +0300
Subject: [PATCH] Return to main page on backbutton press for some recovery
 pages

---
 .../server_installation_cubit.dart             | 18 ------------------
 .../recovering/recovery_confirm_backblaze.dart |  5 +++--
 .../recovering/recovery_confirm_server.dart    |  5 +++--
 .../recovery_hentzner_connected.dart           |  5 +++--
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/lib/logic/cubit/server_installation/server_installation_cubit.dart b/lib/logic/cubit/server_installation/server_installation_cubit.dart
index 36928f08..05198229 100644
--- a/lib/logic/cubit/server_installation/server_installation_cubit.dart
+++ b/lib/logic/cubit/server_installation/server_installation_cubit.dart
@@ -411,23 +411,13 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
       case RecoveryStep.recoveryKey:
       case RecoveryStep.newDeviceKey:
       case RecoveryStep.oldToken:
-      case RecoveryStep.hetznerToken:
         emit(
           dataState.copyWith(
             currentStep: RecoveryStep.selecting,
           ),
         );
         break;
-      case RecoveryStep.serverSelection:
-        repository.deleteHetznerKey();
-        emit(
-          dataState.copyWith(
-            currentStep: RecoveryStep.hetznerToken,
-          ),
-        );
-        break;
       case RecoveryStep.cloudflareToken:
-        repository.deleteDomain();
         repository.deleteServerDetails();
         emit(
           dataState.copyWith(
@@ -435,14 +425,6 @@ class ServerInstallationCubit extends Cubit<ServerInstallationState> {
           ),
         );
         break;
-      case RecoveryStep.backblazeToken:
-        repository.deleteBackblazeKey();
-        emit(
-          dataState.copyWith(
-            currentStep: RecoveryStep.cloudflareToken,
-          ),
-        );
-        break;
       // We won't revert steps after client is authorized
       default:
         break;
diff --git a/lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart b/lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart
index 02b68acf..cbd40ff0 100644
--- a/lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart
+++ b/lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart
@@ -28,8 +28,9 @@ class RecoveryConfirmBackblaze extends StatelessWidget {
             heroTitle: 'recovering.confirm_backblaze'.tr(),
             heroSubtitle: 'recovering.confirm_backblaze_description'.tr(),
             hasBackButton: true,
-            onBackButtonPressed:
-                context.read<ServerInstallationCubit>().revertRecoveryStep,
+            onBackButtonPressed: () {
+              Navigator.of(context).popUntil((final route) => route.isFirst);
+            },
             hasFlashButton: false,
             children: [
               CubitFormTextField(
diff --git a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
index 19fcbb6b..063bd890 100644
--- a/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
+++ b/lib/ui/pages/setup/recovering/recovery_confirm_server.dart
@@ -39,8 +39,9 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
             ? 'recovering.choose_server_description'.tr()
             : 'recovering.confirm_server_description'.tr(),
         hasBackButton: true,
-        onBackButtonPressed:
-            context.read<ServerInstallationCubit>().revertRecoveryStep,
+        onBackButtonPressed: () {
+          Navigator.of(context).popUntil((final route) => route.isFirst);
+        },
         hasFlashButton: false,
         children: [
           FutureBuilder<List<ServerBasicInfoWithValidators>>(
diff --git a/lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart b/lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart
index 36b5f130..6976283c 100644
--- a/lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart
+++ b/lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart
@@ -32,8 +32,9 @@ class RecoveryHetznerConnected extends StatelessWidget {
             ),
             hasBackButton: true,
             hasFlashButton: false,
-            onBackButtonPressed:
-                context.read<ServerInstallationCubit>().revertRecoveryStep,
+            onBackButtonPressed: () {
+              Navigator.of(context).popUntil((final route) => route.isFirst);
+            },
             children: [
               CubitFormTextField(
                 formFieldCubit: context.read<HetznerFormCubit>().apiKey,