From 952890033d726a81f9a2ef97b2b266686fd959c1 Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 26 Aug 2019 09:04:19 -0700
Subject: [PATCH 1/2] [firebase_admob] Fix firebase_admob issues caused by
 un-handled exception situations

---
 .../firebase_admob/lib/firebase_admob.dart    | 20 +++++++++----
 .../test/firebase_admob_test.dart             | 30 +++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart
index 70289b2b5dc2..17211e07de57 100644
--- a/packages/firebase_admob/lib/firebase_admob.dart
+++ b/packages/firebase_admob/lib/firebase_admob.dart
@@ -238,7 +238,7 @@ abstract class MobileAd {
   /// Disposing a banner ad that's been shown removes it from the screen.
   /// Interstitial ads can't be programmatically removed from view.
   Future<bool> dispose() {
-    assert(_allAds[id] != null);
+    if (_allAds[id] == null) return Future<bool>.value(true);
     _allAds[id] = null;
     return _invokeBooleanMethod("disposeAd", <String, dynamic>{'id': id});
   }
@@ -520,9 +520,19 @@ class FirebaseAdMob {
 }
 
 Future<bool> _invokeBooleanMethod(String method, [dynamic arguments]) async {
-  final bool result = await FirebaseAdMob.instance._channel.invokeMethod<bool>(
-    method,
-    arguments,
-  );
+  bool result = false;
+  try {
+    result = await FirebaseAdMob.instance._channel.invokeMethod<bool>(
+      method,
+      arguments,
+    );
+  } on PlatformException catch (e) {
+    if (e.code == "no_ad_for_id") {
+      result = false;
+      return result;
+    }
+    rethrow;
+  }
+
   return result;
 }
diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart
index e2a8bc5a6fba..0b46908395be 100644
--- a/packages/firebase_admob/test/firebase_admob_test.dart
+++ b/packages/firebase_admob/test/firebase_admob_test.dart
@@ -18,6 +18,8 @@ void main() {
     final List<MethodCall> log = <MethodCall>[];
     final FirebaseAdMob admob = FirebaseAdMob.private(channel);
 
+    int invalidAdId;
+
     setUp(() async {
       channel.setMockMethodCallHandler((MethodCall methodCall) async {
         log.add(methodCall);
@@ -29,6 +31,15 @@ void main() {
           case 'showAd':
           case 'showRewardedVideoAd':
           case 'disposeAd':
+            if (methodCall.arguments != null) {
+              if (methodCall.arguments.containsKey('id') &&
+                  (invalidAdId != null)) {
+                if (invalidAdId == methodCall.arguments['id']) {
+                  invalidAdId = null;
+                  throw PlatformException(code: 'no_ad_for_id');
+                }
+              }
+            }
             return Future<bool>.value(true);
           default:
             assert(false);
@@ -138,5 +149,24 @@ void main() {
         isMethodCall('showRewardedVideoAd', arguments: null),
       ]);
     });
+
+    test('noAdForId', () async {
+      log.clear();
+
+      final BannerAd banner = BannerAd(
+        adUnitId: BannerAd.testAdUnitId,
+        size: AdSize.banner,
+      );
+      final int id = banner.id;
+      invalidAdId = banner.id;
+
+      expect(await banner.dispose(), false);
+
+      expect(log, <Matcher>[
+        isMethodCall('disposeAd', arguments: <String, dynamic>{
+          'id': id,
+        }),
+      ]);
+    });
   });
 }

From 5a108cedc3db2f055dda90eb484764d1ef776a6f Mon Sep 17 00:00:00 2001
From: Collin Jackson <jackson@google.com>
Date: Mon, 26 Aug 2019 09:07:36 -0700
Subject: [PATCH 2/2] Manually resolve conflicts

---
 packages/firebase_admob/CHANGELOG.md | 4 ++++
 packages/firebase_admob/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
index 7a2b5bf14eac..cbc153b3e83f 100644
--- a/packages/firebase_admob/CHANGELOG.md
+++ b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.9.0+6
+
+* Handle exception in `BannerAd.dispose()` call for `no_ad_for_id` scenario.
+
 ## 0.9.0+5
 
 * Update documentation to reflect new repository location.
diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
index db7647bebbbe..0748194ca909 100644
--- a/packages/firebase_admob/pubspec.yaml
+++ b/packages/firebase_admob/pubspec.yaml
@@ -3,7 +3,7 @@ description: Flutter plugin for Firebase AdMob, supporting
   banner, interstitial (full-screen), and rewarded video ads
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_admob
-version: 0.9.0+5
+version: 0.9.0+6
 
 flutter:
   plugin: