refactor: set testdevices for all ads, instead of per request

invertase · Dec 10, 2021 · d8c0c38 · d8c0c38
1 parent 4be5993
commit d8c0c38
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 25 deletions.
diff --git a/ios/RNGoogleAds/RNGoogleAdsCommon.m b/ios/RNGoogleAds/RNGoogleAdsCommon.m
@@ -68,18 +68,6 @@ + (GADRequest *)buildAdRequest:(NSDictionary *)adRequestOptions {
     request.keywords = adRequestOptions[@"keywords"];
   }
 
-//  if (adRequestOptions[@"testDevices"]) {
-//    NSMutableArray *devices = [@[] mutableCopy];
-//    for (NSString *key in adRequestOptions[@"testDevices"]) {
-//      if ([key isEqualToString:@"EMULATOR"]) {
-//        [devices addObject:GADSimulatorID];
-//      } else {
-//        [devices addObject:key];
-//      }
-//    }
-//    request.testDevices = devices;
-//  }
-
   if (adRequestOptions[@"location"]) {
     NSArray<NSNumber *> *latLong = adRequestOptions[@"location"];
     [request setLocationWithLatitude:[latLong[0] doubleValue]

diff --git a/ios/RNGoogleAds/RNGoogleAdsModule.m b/ios/RNGoogleAds/RNGoogleAdsModule.m
@@ -69,6 +69,18 @@ - (void)setRequestConfiguration:(NSDictionary *)requestConfiguration {
     BOOL tag = (BOOL)requestConfiguration[@"tagForUnderAgeOfConsent"];
     [GADMobileAds.sharedInstance.requestConfiguration tagForUnderAgeOfConsent:tag];
   }
+
+  if (requestConfiguration[@"testDeviceIdentifiers"]) {
+    NSMutableArray *devices = [@[] mutableCopy];
+    for (NSString *key in requestConfiguration[@"testDeviceIdentifiers"]) {
+      if ([key isEqualToString:@"EMULATOR"]) {
+        [devices addObject:GADSimulatorID];
+      } else {
+        [devices addObject:key];
+      }
+    }
+    GADMobileAds.sharedInstance.requestConfiguration.testDeviceIdentifiers = devices;
+  }
 }
 
 @end
diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -669,19 +669,6 @@ export namespace GoogleAdsTypes {
      */
     keywords?: string[];
 
-    /**
-     * An array of test device IDs to whitelist.
-     *
-     * If using an emulator, set the device ID to `EMULATOR`.
-     *
-     * ```js
-     * await Interstitial.request('ca-app-pub-3940256099942544/1033173712', {
-     *   testDevices: ['EMULATOR'],
-     * });
-     * ```
-     */
-    testDevices?: string[];
-
     /**
      * Sets a content URL for targeting purposes.
      *
@@ -784,6 +771,13 @@ export namespace GoogleAdsTypes {
      * See the [Google Mobile SDK docs](https://developers.google.com/admob/android/targeting#ad_content_filtering) for more information.
      */
     tagForUnderAgeOfConsent?: boolean;
+
+    /**
+     * An array of test device IDs to whitelist.
+     *
+     * If using an emulator, set the device ID to `EMULATOR`.
+     */
+    testDeviceIdentifiers?: string[];
   }
 
   /**