recreate adview when adUnitID is already set

the adUnitID can only be set once, and sometimes in unfortunate rerenders the prop is set twice, which caused a crash.
sbugert · Aug 9, 2017 · c02f32d · c02f32d
1 parent 45f1106
commit c02f32d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 0 deletions.
diff --git a/android/src/main/java/com/sbugert/rnadmob/RNAdMobBannerViewManager.java b/android/src/main/java/com/sbugert/rnadmob/RNAdMobBannerViewManager.java
@@ -26,11 +26,22 @@
 
 class ReactAdView extends ReactViewGroup {
 
+  private Context mContext;
+
   protected AdView adView;
+
+  String adUnitID;
   String[] testDevices;
 
   public ReactAdView(final Context context) {
     super(context);
+    this.createAdView();
+  }
+
+  private void createAdView() {
+    if (this.adView != null) this.adView.destroy();
+
+    final Context context = getContext();
     this.adView = new AdView(context);
     this.adView.setAdListener(new AdListener() {
       @Override
@@ -121,6 +132,12 @@ public void loadBanner() {
   }
 
   public void setAdUnitID(String adUnitID) {
+    if (this.adUnitID != null) {
+      // We can only set adUnitID once, so when it was previously set we have
+      // to recreate the view
+      this.createAdView();
+    }
+    this.adUnitID = adUnitID;
     this.adView.setAdUnitId(adUnitID);
   }
 

diff --git a/android/src/main/java/com/sbugert/rnadmob/RNPublisherBannerViewManager.java b/android/src/main/java/com/sbugert/rnadmob/RNPublisherBannerViewManager.java
@@ -30,13 +30,24 @@
 
 class ReactPublisherAdView extends ReactViewGroup implements AppEventListener {
 
+  private Context mContext;
+
   protected PublisherAdView adView;
+
   String[] testDevices;
   AdSize[] validAdSizes;
+  String adUnitID;
   AdSize adSize;
 
   public ReactPublisherAdView(final Context context) {
     super(context);
+    this.createAdView();
+  }
+
+  private void createAdView() {
+    if (this.adView != null) this.adView.destroy();
+
+    final Context context = getContext();
     this.adView = new PublisherAdView(context);
     this.adView.setAppEventListener(this);
     this.adView.setAdListener(new AdListener() {
@@ -145,6 +156,12 @@ public void loadBanner() {
   }
 
   public void setAdUnitID(String adUnitID) {
+    if (this.adUnitID != null) {
+      // We can only set adUnitID once, so when it was previously set we have
+      // to recreate the view
+      this.createAdView();
+    }
+    this.adUnitID = adUnitID;
     this.adView.setAdUnitId(adUnitID);
   }