android-apps-mirrors/CakeWallet
0
0
Fork 0
mirror of https://github.com/cake-tech/cake_wallet.git synced 2025-06-28 20:39:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix null check when user exits out of qr code scanner (#2002)

Browse source
This commit is contained in:
cyan 2025-02-05 02:40:06 +01:00 • committed by GitHub
parent e88b6b2bcf
commit 1dc7f9309a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/entities/qr_scanner.dart
View file

@ -12,7 +12,7 @@ import 'package:flutter/scheduler.dart';
var isQrScannerShown = false; var isQrScannerShown = false;
Future<String> presentQRScanner(BuildContext context) async { Future<String?> presentQRScanner(BuildContext context) async {
isQrScannerShown = true; isQrScannerShown = true;
try { try {
final result = await Navigator.of(context).push<String>( final result = await Navigator.of(context).push<String>(
@ -23,7 +23,7 @@ Future<String> presentQRScanner(BuildContext context) async {
), ),
); );
isQrScannerShown = false; isQrScannerShown = false;
return result!; return result;
} catch (e) { } catch (e) {
isQrScannerShown = false; isQrScannerShown = false;
rethrow; rethrow;

2
lib/src/screens/ur/animated_ur_page.dart
View file

@ -100,6 +100,7 @@ class AnimatedURPage extends BasePage {
switch (urQrType) { switch (urQrType) {
case "ur:xmr-txunsigned": // ur:xmr-txsigned case "ur:xmr-txunsigned": // ur:xmr-txsigned
final ur = await presentQRScanner(context); final ur = await presentQRScanner(context);
if (ur == null) return;
final result = await monero!.commitTransactionUR(animatedURmodel.wallet, ur); final result = await monero!.commitTransactionUR(animatedURmodel.wallet, ur);
if (result) { if (result) {
Navigator.of(context).pop(true); Navigator.of(context).pop(true);
@ -107,6 +108,7 @@ class AnimatedURPage extends BasePage {
break; break;
case "ur:xmr-output": // xmr-keyimage case "ur:xmr-output": // xmr-keyimage
final ur = await presentQRScanner(context); final ur = await presentQRScanner(context);
if (ur == null) return;
final result = await monero!.importKeyImagesUR(animatedURmodel.wallet, ur); final result = await monero!.importKeyImagesUR(animatedURmodel.wallet, ur);
if (result) { if (result) {
Navigator.of(context).pop(true); Navigator.of(context).pop(true);

1
lib/src/widgets/address_text_field.dart
View file

@ -233,6 +233,7 @@ class AddressTextField<T extends Currency> extends StatelessWidget{
await PermissionHandler.checkPermission(Permission.camera, context); await PermissionHandler.checkPermission(Permission.camera, context);
if (!isCameraPermissionGranted) return; if (!isCameraPermissionGranted) return;
final code = await presentQRScanner(context); final code = await presentQRScanner(context);
if (code == null) return;
if (code.isEmpty) { if (code.isEmpty) {
return; return;
} }

4
lib/view_model/node_list/node_create_or_edit_view_model.dart
View file

@ -215,7 +215,9 @@ abstract class NodeCreateOrEditViewModelBase with Store {
bool isCameraPermissionGranted = bool isCameraPermissionGranted =
await PermissionHandler.checkPermission(Permission.camera, context); await PermissionHandler.checkPermission(Permission.camera, context);
if (!isCameraPermissionGranted) return; if (!isCameraPermissionGranted) return;
String code = await presentQRScanner(context); String? code = await presentQRScanner(context);
if (code == null) throw Exception("Unexpected QR code value: aborted");
if (code.isEmpty) { if (code.isEmpty) {
throw Exception('Unexpected scan QR code value: value is empty'); throw Exception('Unexpected scan QR code value: value is empty');
} }

3
lib/view_model/restore/wallet_restore_from_qr_code.dart
View file

@ -89,7 +89,8 @@ class WalletRestoreFromQRCode {
} }
static Future<RestoredWallet> scanQRCodeForRestoring(BuildContext context) async { static Future<RestoredWallet> scanQRCodeForRestoring(BuildContext context) async {
String code = await presentQRScanner(context); String? code = await presentQRScanner(context);
if (code == null) throw Exception("Unexpected scan QR code value: aborted");
if (code.isEmpty) throw Exception('Unexpected scan QR code value: value is empty'); if (code.isEmpty) throw Exception('Unexpected scan QR code value: value is empty');
WalletType? walletType; WalletType? walletType;