beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Pop correctly post recovery

Browse source
This commit is contained in:
Vishnu Mohandas 2021-04-01 20:10:32 +05:30
parent d445e21e01
commit c09be8da24
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/ui/password_entry_page.dart
View file

@ -6,6 +6,9 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_password_strength/flutter_password_strength.dart';
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/event_bus.dart';
import 'package:photos/events/subscription_purchased_event.dart';
import 'package:photos/services/billing_service.dart';
import 'package:photos/services/user_service.dart';
import 'package:photos/ui/common_elements.dart';
import 'package:photos/ui/recovery_key_dialog.dart';
@ -201,6 +204,20 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
await dialog.hide();
showToast("password changed successfully");
Navigator.of(context).pop();
if (widget.mode == PasswordEntryMode.reset) {
if (!BillingService.instance.hasActiveSubscription()) {
Navigator.of(context).pushReplacement(
MaterialPageRoute(
builder: (BuildContext context) {
return SubscriptionPage(isOnboarding: true);
},
),
);
} else {
Bus.instance.fire(SubscriptionPurchasedEvent());
Navigator.of(context).popUntil((route) => route.isFirst);
}
}
} catch (e) {
await dialog.hide();
showGenericErrorDialog(context);

2
lib/ui/password_reentry_page.dart
View file

@ -25,7 +25,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
return Scaffold(
appBar: AppBar(
title: Text(
"encryption password",
"password",
),
),
body: _getBody(),