fix(android): race condition getting current activity

invertase · Sep 10, 2023 · b3a09e1 · b3a09e1
1 parent 7c89579
commit b3a09e1
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/...main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java b/...main/java/io/invertase/googlemobileads/ReactNativeGoogleMobileAdsBannerAdViewManager.java
@@ -17,6 +17,7 @@
  *
  */
 
+import android.app.Activity;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import com.facebook.react.bridge.Arguments;
@@ -44,7 +45,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.json.JSONException;
@@ -167,13 +167,11 @@ private BaseAdView initAdView(ReactNativeAdView reactViewGroup) {
     }
     BaseAdView adView;
     if (ReactNativeGoogleMobileAdsCommon.isAdManagerUnit(reactViewGroup.getUnitId())) {
-      if (((ReactContext) reactViewGroup.getContext()).getCurrentActivity() != null) {
+      Activity currentActivity = ((ReactContext) reactViewGroup.getContext()).getCurrentActivity();
+      if (currentActivity != null) {
         // in order to display the debug menu for GAM ads we need the activity context
         // https://github.com/invertase/react-native-google-mobile-ads/issues/188
-        adView =
-            new AdManagerAdView(
-                Objects.requireNonNull(
-                    ((ReactContext) reactViewGroup.getContext()).getCurrentActivity()));
+        adView = new AdManagerAdView(currentActivity);
       } else {
         return null;
       }