SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
mirror of https://git.selfprivacy.org/kherel/selfprivacy.org.app.git synced 2025-02-04 07:20:39 +00:00
Code Issues Projects Releases Wiki Activity

Return to main page on backbutton press for some recovery pages

Browse source
This commit is contained in:
NaiJi 2022-06-15 07:51:32 +03:00
parent 7870cf9f99
commit 0feb9bc299
4 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/logic/cubit/server_installation/server_installation_cubit.dart
View file

@ -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;

5
lib/ui/pages/setup/recovering/recovery_confirm_backblaze.dart
View file

@ -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(

5
lib/ui/pages/setup/recovering/recovery_confirm_server.dart
View file

@ -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>>(

5
lib/ui/pages/setup/recovering/recovery_hentzner_connected.dart
View file

@ -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,