react-native-google-mobile-ads 16.3.2 → 16.3.4

package/README.md

@@ -145,7 +145,7 @@ When using The New Architecture, some legacy code will still be used though. See
 - [Issues](https://github.com/invertase/react-native-google-mobile-ads/issues)
 - [PRs](https://github.com/invertase/react-native-google-mobile-ads/pulls)
 - [Guidelines](https://github.com/invertase/react-native-google-mobile-ads/blob/main/CONTRIBUTING.md)
-- [Code of Conduct](https://github.com/invertase/meta/blob/main/CODE_OF_CONDUCT.md)
+- [Code of Conduct](https://github.com/invertase/.github/blob/main/CODE_OF_CONDUCT.md)
 
 ## License
 

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsMediaView.mm

@@ -16,7 +16,7 @@
  */
 
 #import "RNGoogleMobileAdsMediaView.h"
-#import "RNGoogleMobileAdsNativeModule.h"
+#import "RNGoogleMobileAdsNativeAdRegistry.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/RNGoogleMobileAdsSpec/ComponentDescriptors.h>
@@ -27,10 +27,6 @@
 #import "RCTFabricComponentsPlugins.h"
 #endif
 
-@interface RCTBridge (Private)
-+ (RCTBridge *)currentBridge;
-@end
-
 #ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook::react;
 
@@ -39,8 +35,6 @@ using namespace facebook::react;
 #endif
 
 @implementation RNGoogleMobileAdsMediaView {
-  __weak RCTBridge *_bridge;
-  __weak RNGoogleMobileAdsNativeModule *_nativeModule;
   GADMediaView *_mediaView;
   UIViewContentMode _contentMode;
 }
@@ -52,11 +46,9 @@ using namespace facebook::react;
 
 - (instancetype)initWithFrame:(CGRect)frame {
   if (self = [super initWithFrame:frame]) {
-    static const auto defaultProps = std::make_shared<const RNGoogleMobileAdsBannerViewProps>();
+    static const auto defaultProps = std::make_shared<const RNGoogleMobileAdsMediaViewProps>();
     _props = defaultProps;
 
-    _bridge = [RCTBridge currentBridge];
-    _nativeModule = [_bridge moduleForClass:RNGoogleMobileAdsNativeModule.class];
     _mediaView = [[GADMediaView alloc] init];
     _contentMode = UIViewContentModeScaleAspectFill;
     self.contentView = _mediaView;
@@ -99,9 +91,8 @@ using namespace facebook::react;
 
 - (instancetype)initWithBridge:(RCTBridge *)bridge {
   if (self = [super init]) {
-    _bridge = bridge;
-    _nativeModule = [_bridge moduleForClass:RNGoogleMobileAdsNativeModule.class];
     _mediaView = self;
+    _contentMode = UIViewContentModeScaleAspectFill;
   }
   return self;
 }
@@ -111,8 +102,11 @@ using namespace facebook::react;
 #pragma mark - Common logics
 
 - (void)setResponseId:(NSString *)responseId {
-  _responseId = responseId;
-  GADNativeAd *nativeAd = [_nativeModule nativeAdForResponseId:responseId];
+  _responseId = [responseId copy];
+  GADNativeAd *nativeAd = [RNGoogleMobileAdsNativeAdRegistry nativeAdForResponseId:responseId];
+  if (nativeAd == nil) {
+    return;
+  }
   _mediaView.mediaContent = nativeAd.mediaContent;
   _mediaView.contentMode = _contentMode;
 }

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeAdRegistry.h

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import <Foundation/Foundation.h>
+#import <GoogleMobileAds/GADNativeAd.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RNGoogleMobileAdsNativeAdRegistry : NSObject
+
++ (void)setNativeAd:(GADNativeAd *)nativeAd forResponseId:(NSString *)responseId;
++ (nullable GADNativeAd *)nativeAdForResponseId:(NSString *)responseId;
++ (void)removeNativeAdForResponseId:(NSString *)responseId;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeAdRegistry.mm

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2016-present Invertase Limited & Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this library except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#import "RNGoogleMobileAdsNativeAdRegistry.h"
+
+@implementation RNGoogleMobileAdsNativeAdRegistry
+
+static NSMapTable<NSString *, GADNativeAd *> *_nativeAds;
+
++ (void)initialize {
+  if (self == [RNGoogleMobileAdsNativeAdRegistry class]) {
+    _nativeAds = [NSMapTable strongToStrongObjectsMapTable];
+  }
+}
+
++ (void)setNativeAd:(GADNativeAd *)nativeAd forResponseId:(NSString *)responseId {
+  if (responseId.length == 0 || nativeAd == nil) {
+    return;
+  }
+
+  @synchronized(self) {
+    [_nativeAds setObject:nativeAd forKey:responseId];
+  }
+}
+
++ (nullable GADNativeAd *)nativeAdForResponseId:(NSString *)responseId {
+  if (responseId.length == 0) {
+    return nil;
+  }
+
+  @synchronized(self) {
+    return [_nativeAds objectForKey:responseId];
+  }
+}
+
++ (void)removeNativeAdForResponseId:(NSString *)responseId {
+  if (responseId.length == 0) {
+    return;
+  }
+
+  @synchronized(self) {
+    [_nativeAds removeObjectForKey:responseId];
+  }
+}
+
+@end

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeModule.mm

@@ -19,6 +19,7 @@
 
 #import "RNGoogleMobileAdsNativeModule.h"
 #import "RNGoogleMobileAdsCommon.h"
+#import "RNGoogleMobileAdsNativeAdRegistry.h"
 
 typedef void (^RNGMANativeAdLoadCompletionHandler)(GADNativeAd *_Nullable nativeAd,
                                                    NSError *_Nullable error);
@@ -48,6 +49,10 @@ RCT_EXPORT_MODULE();
   return dispatch_get_main_queue();
 }
 
++ (BOOL)requiresMainQueueSetup {
+  return YES;
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
     (const facebook::react::ObjCTurboModule::InitParams &)params {
@@ -90,6 +95,7 @@ RCT_EXPORT_METHOD(
         }
 
         [_adHolders setValue:adHolder forKey:responseId];
+        [RNGoogleMobileAdsNativeAdRegistry setNativeAd:nativeAd forResponseId:responseId];
 
         resolve(@{
           @"responseId" : responseId,
@@ -114,14 +120,15 @@ RCT_EXPORT_METHOD(
 
 RCT_EXPORT_METHOD(destroy
                   : (NSString *)responseId {
-                    if (responseId) {
-                      [[_adHolders valueForKey:responseId] dispose];
+                    if (responseId.length > 0) {
+                      [[_adHolders objectForKey:responseId] dispose];
                       [_adHolders removeObjectForKey:responseId];
+                      [RNGoogleMobileAdsNativeAdRegistry removeNativeAdForResponseId:responseId];
                     }
                   });
 
 - (GADNativeAd *)nativeAdForResponseId:(NSString *)responseId {
-  return [_adHolders valueForKey:responseId].nativeAd;
+  return [RNGoogleMobileAdsNativeAdRegistry nativeAdForResponseId:responseId];
 }
 
 - (void)dealloc {
@@ -129,6 +136,9 @@ RCT_EXPORT_METHOD(destroy
   for (RNGMANativeAdHolder *adHolder in adHolders) {
     [adHolder dispose];
   }
+  for (NSString *responseId in [_adHolders allKeys]) {
+    [RNGoogleMobileAdsNativeAdRegistry removeNativeAdForResponseId:responseId];
+  }
   [_adHolders removeAllObjects];
 }
 

package/ios/RNGoogleMobileAds/RNGoogleMobileAdsNativeView.mm

@@ -17,7 +17,7 @@
 
 #import "RNGoogleMobileAdsNativeView.h"
 #import "RNGoogleMobileAdsMediaView.h"
-#import "RNGoogleMobileAdsNativeModule.h"
+#import "RNGoogleMobileAdsNativeAdRegistry.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #import <react/renderer/components/RNGoogleMobileAdsSpec/ComponentDescriptors.h>
@@ -28,10 +28,6 @@
 #import "RCTFabricComponentsPlugins.h"
 #endif
 
-@interface RCTBridge (Private)
-+ (RCTBridge *)currentBridge;
-@end
-
 #ifdef RCT_NEW_ARCH_ENABLED
 using namespace facebook::react;
 
@@ -40,8 +36,9 @@ using namespace facebook::react;
 #endif
 
 @implementation RNGoogleMobileAdsNativeView {
+#ifndef RCT_NEW_ARCH_ENABLED
   __weak RCTBridge *_bridge;
-  __weak RNGoogleMobileAdsNativeModule *_nativeModule;
+#endif
   __weak GADNativeAd *_nativeAd;
   GADNativeAdView *_nativeAdView;
   dispatch_block_t _debouncedReload;
@@ -57,8 +54,6 @@ using namespace facebook::react;
     static const auto defaultProps = std::make_shared<const RNGoogleMobileAdsNativeViewProps>();
     _props = defaultProps;
 
-    _bridge = [RCTBridge currentBridge];
-    _nativeModule = [_bridge moduleForClass:RNGoogleMobileAdsNativeModule.class];
     _nativeAdView = [[GADNativeAdView alloc] init];
     self.contentView = _nativeAdView;
   }
@@ -127,7 +122,6 @@ using namespace facebook::react;
 - (instancetype)initWithBridge:(RCTBridge *)bridge {
   if (self = [super init]) {
     _bridge = bridge;
-    _nativeModule = [_bridge moduleForClass:RNGoogleMobileAdsNativeModule.class];
     _nativeAdView = self;
   }
   return self;
@@ -138,8 +132,8 @@ using namespace facebook::react;
 #pragma mark - Common logics
 
 - (void)setResponseId:(NSString *)responseId {
-  _responseId = responseId;
-  _nativeAd = [_nativeModule nativeAdForResponseId:responseId];
+  _responseId = [responseId copy];
+  _nativeAd = [RNGoogleMobileAdsNativeAdRegistry nativeAdForResponseId:responseId];
   [self reloadAd];
 }
 

package/lib/commonjs/version.js

@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = void 0;
 // Generated by genversion.
-const version = exports.version = '16.3.2';
+const version = exports.version = '16.3.4';
 //# sourceMappingURL=version.js.map

package/lib/module/version.js

@@ -1,5 +1,5 @@
 "use strict";
 
 // Generated by genversion.
-export const version = '16.3.2';
+export const version = '16.3.4';
 //# sourceMappingURL=version.js.map

package/lib/typescript/index.d.ts

@@ -1,4 +1,4 @@
-export declare const SDK_VERSION = "16.3.2";
+export declare const SDK_VERSION = "16.3.4";
 export { default, MobileAds } from './MobileAds';
 export { AdsConsentDebugGeography, AdsConsentInfo, AdsConsentInfoOptions, AdsConsentInterface, AdsConsentPrivacyOptionsRequirementStatus, AdsConsentStatus, AdsConsentUserChoices, } from './specs/modules/NativeConsentModule';
 export { AdsConsentPurposes } from './AdsConsentPurposes';

package/lib/typescript/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "16.3.2";
+export declare const version = "16.3.4";
 //# sourceMappingURL=version.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-google-mobile-ads",
-  "version": "16.3.2",
+  "version": "16.3.4",
   "author": "Invertase <oss@invertase.io> (http://invertase.io)",
   "description": "React Native Google Mobile Ads is an easy way to monetize mobile apps with targeted, in-app advertising.",
   "main": "lib/commonjs/index.js",

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '16.3.2';
+export const version = '16.3.4';