From d3d053a2f3ec65216fc7479be252f20c817e922d Mon Sep 17 00:00:00 2001 From: russellwheatley Date: Thu, 10 Nov 2022 13:04:55 +0000 Subject: [PATCH 1/3] fix(dynamic-link): fix unhandled exception --- packages/_flutterfire_internals/lib/src/exception.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/_flutterfire_internals/lib/src/exception.dart b/packages/_flutterfire_internals/lib/src/exception.dart index 4d70bb6795dc..03c9b21db343 100644 --- a/packages/_flutterfire_internals/lib/src/exception.dart +++ b/packages/_flutterfire_internals/lib/src/exception.dart @@ -38,16 +38,16 @@ FirebaseException platformExceptionToFirebaseException( PlatformException platformException, { required String plugin, }) { - Map? details = platformException.details != null - ? Map.from(platformException.details) + Map? details = platformException.details != null + ? Map.from(platformException.details) : null; String? code; String message = platformException.message ?? ''; if (details != null) { - code = details['code'] ?? code; - message = details['message'] ?? message; + code = details['code']! as String ?? code; + message = details['message']! as String ?? message; } return FirebaseException( From 279611c9ee9c446bf0f2c225ac43b35d7e496bdb Mon Sep 17 00:00:00 2001 From: Russell Wheatley Date: Wed, 16 Nov 2022 10:59:37 +0000 Subject: [PATCH 2/3] Update exception.dart --- packages/_flutterfire_internals/lib/src/exception.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/_flutterfire_internals/lib/src/exception.dart b/packages/_flutterfire_internals/lib/src/exception.dart index 03c9b21db343..2928af9ac947 100644 --- a/packages/_flutterfire_internals/lib/src/exception.dart +++ b/packages/_flutterfire_internals/lib/src/exception.dart @@ -45,9 +45,9 @@ FirebaseException platformExceptionToFirebaseException( String? code; String message = platformException.message ?? ''; - if (details != null) { - code = details['code']! as String ?? code; - message = details['message']! as String ?? message; + if (details != null) { + code = (details['code'] as String?) ?? code; + message = (details['message'] as String?) ?? message; } return FirebaseException( From 223c36ec472e16c98793eae16ec365971e631301 Mon Sep 17 00:00:00 2001 From: Russell Wheatley Date: Wed, 16 Nov 2022 11:00:09 +0000 Subject: [PATCH 3/3] remove whitespace --- packages/_flutterfire_internals/lib/src/exception.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/_flutterfire_internals/lib/src/exception.dart b/packages/_flutterfire_internals/lib/src/exception.dart index 2928af9ac947..e9c543aa9132 100644 --- a/packages/_flutterfire_internals/lib/src/exception.dart +++ b/packages/_flutterfire_internals/lib/src/exception.dart @@ -45,7 +45,7 @@ FirebaseException platformExceptionToFirebaseException( String? code; String message = platformException.message ?? ''; - if (details != null) { + if (details != null) { code = (details['code'] as String?) ?? code; message = (details['message'] as String?) ?? message; }