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

Require confirmation during Save if Secret Key

Browse source
This commit is contained in:
Ahsan Ahmad 2023-10-01 16:05:35 +05:00
parent 92bfa153f1
commit 573b3a321d
2 changed files with 45 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/l10n/arb/app_en.arb
View file

@ -331,5 +331,6 @@
"offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.", "offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.",
"showLargeIcons": "Show large icons", "showLargeIcons": "Show large icons",
"shouldHideCode": "Hide codes", "shouldHideCode": "Hide codes",
"focusOnSearchBar": "Focus search on app start" "focusOnSearchBar": "Focus search on app start",
"confirmUpdatingkey": "Are you sure you want to update the secret key?"
} }

68
lib/onboarding/view/setup_enter_secret_key_page.dart
View file

@ -1,5 +1,7 @@
import "package:ente_auth/l10n/l10n.dart"; import "package:ente_auth/l10n/l10n.dart";
import 'package:ente_auth/models/code.dart'; import 'package:ente_auth/models/code.dart';
import 'package:ente_auth/ui/components/buttons/button_widget.dart';
import 'package:ente_auth/ui/components/models/button_result.dart';
import 'package:ente_auth/utils/dialog_util.dart'; import 'package:ente_auth/utils/dialog_util.dart';
import 'package:ente_auth/utils/totp_util.dart'; import 'package:ente_auth/utils/totp_util.dart';
import "package:flutter/material.dart"; import "package:flutter/material.dart";
@ -10,7 +12,8 @@ class SetupEnterSecretKeyPage extends StatefulWidget {
SetupEnterSecretKeyPage({this.code, Key? key}) : super(key: key); SetupEnterSecretKeyPage({this.code, Key? key}) : super(key: key);
@override @override
State<SetupEnterSecretKeyPage> createState() => _SetupEnterSecretKeyPageState(); State<SetupEnterSecretKeyPage> createState() =>
_SetupEnterSecretKeyPageState();
} }
class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> { class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
@ -25,7 +28,8 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
text: widget.code != null ? safeDecode(widget.code!.issuer).trim() : null, text: widget.code != null ? safeDecode(widget.code!.issuer).trim() : null,
); );
_accountController = TextEditingController( _accountController = TextEditingController(
text: widget.code != null ? safeDecode(widget.code!.account).trim() : null, text:
widget.code != null ? safeDecode(widget.code!.account).trim() : null,
); );
_secretController = TextEditingController( _secretController = TextEditingController(
text: widget.code != null ? widget.code!.secret : null, text: widget.code != null ? widget.code!.secret : null,
@ -110,7 +114,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
SizedBox( SizedBox(
width: 400, width: 400,
child: OutlinedButton( child: OutlinedButton(
onPressed: () { onPressed: () async {
if ((_accountController.text.trim().isEmpty && if ((_accountController.text.trim().isEmpty &&
_issuerController.text.trim().isEmpty) || _issuerController.text.trim().isEmpty) ||
_secretController.text.trim().isEmpty) { _secretController.text.trim().isEmpty) {
@ -118,31 +122,45 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
if (_secretController.text.trim().isEmpty) { if (_secretController.text.trim().isEmpty) {
message = context.l10n.secretCanNotBeEmpty; message = context.l10n.secretCanNotBeEmpty;
} else { } else {
message = context.l10n.bothIssuerAndAccountCanNotBeEmpty; message =
context.l10n.bothIssuerAndAccountCanNotBeEmpty;
} }
_showIncorrectDetailsDialog(context, message: message); _showIncorrectDetailsDialog(context, message: message);
return; return;
} }
try { ButtonResult? result = await showChoiceActionSheet(
final account = _accountController.text.trim(); context,
final issuer = _issuerController.text.trim(); title: context.l10n.warning,
final secret = _secretController.text.trim().replaceAll(' ', ''); body: context.l10n.confirmUpdatingkey,
final Code newCode = widget.code == null firstButtonLabel: context.l10n.yes,
? Code.fromAccountAndSecret( secondButtonAction: ButtonAction.cancel,
account, secondButtonLabel: context.l10n.cancel,
issuer, );
secret,
) if (result == null) return;
: widget.code!.copyWith( if (result.action == ButtonAction.first) {
account: account, try {
issuer: issuer, final account = _accountController.text.trim();
secret: secret, final issuer = _issuerController.text.trim();
); final secret =
// Verify the validity of the code _secretController.text.trim().replaceAll(' ', '');
getOTP(newCode); final Code newCode = widget.code == null
Navigator.of(context).pop(newCode); ? Code.fromAccountAndSecret(
} catch (e) { account,
_showIncorrectDetailsDialog(context); issuer,
secret,
)
: widget.code!.copyWith(
account: account,
issuer: issuer,
secret: secret,
);
// Verify the validity of the code
getOTP(newCode);
Navigator.of(context).pop(newCode);
} catch (e) {
_showIncorrectDetailsDialog(context);
}
} }
}, },
child: Padding( child: Padding(
@ -153,7 +171,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
child: Text(l10n.saveAction), child: Text(l10n.saveAction),
), ),
), ),
) ),
], ],
), ),
), ),