Merge pull request #90 from NZME/contentURLMappaingForContentAds

mharrison-nzme · web-flow · commit f2318a6d3b14 · 2023-02-17T17:44:47.000+13:00
content_url mapping for google content ads
diff --git a/android/src/main/java/com/matejdr/admanager/AdaptiveBannerAdView.java b/android/src/main/java/com/matejdr/admanager/AdaptiveBannerAdView.java
@@ -44,7 +44,7 @@ class AdaptiveBannerAdView extends ReactViewGroup implements AppEventListener, L
     CustomTargeting[] customTargeting;
     String[] categoryExclusions;
     String[] keywords;
-    String contentURL;
+    String content_url;
     String publisherProvidedID;
     Location location;
     String correlator;
@@ -233,8 +233,8 @@ public void loadBanner() {
                     }
                 }
             }
-            if (contentURL != null) {
-                adRequestBuilder.setContentUrl(contentURL);
+            if (content_url != null) {
+                adRequestBuilder.setContentUrl(content_url);
             }
             if (publisherProvidedID != null) {
                 adRequestBuilder.setPublisherProvidedId(publisherProvidedID);
@@ -283,8 +283,8 @@ public void setKeywords(String[] keywords) {
         this.keywords = keywords;
     }
 
-    public void setContentURL(String contentURL) {
-        this.contentURL = contentURL;
+    public void setContentURL(String content_url) {
+        this.content_url = content_url;
     }
 
     public void setPublisherProvidedID(String publisherProvidedID) {
diff --git a/android/src/main/java/com/matejdr/admanager/BannerAdView.java b/android/src/main/java/com/matejdr/admanager/BannerAdView.java
@@ -42,7 +42,7 @@ class BannerAdView extends ReactViewGroup implements AppEventListener, Lifecycle
     CustomTargeting[] customTargeting;
     String[] categoryExclusions;
     String[] keywords;
-    String contentURL;
+    String content_url;
     String publisherProvidedID;
     Location location;
     String correlator;
@@ -264,8 +264,8 @@ public void loadBanner() {
                     }
                 }
             }
-            if (contentURL != null) {
-                adRequestBuilder.setContentUrl(contentURL);
+            if (content_url != null) {
+                adRequestBuilder.setContentUrl(content_url);
             }
             if (publisherProvidedID != null) {
                 adRequestBuilder.setPublisherProvidedId(publisherProvidedID);
@@ -306,8 +306,8 @@ public void setKeywords(String[] keywords) {
         this.keywords = keywords;
     }
 
-    public void setContentURL(String contentURL) {
-        this.contentURL = contentURL;
+    public void setContentURL(String content_url) {
+        this.content_url = content_url;
     }
 
     public void setPublisherProvidedID(String publisherProvidedID) {
diff --git a/android/src/main/java/com/matejdr/admanager/NativeAdViewContainer.java b/android/src/main/java/com/matejdr/admanager/NativeAdViewContainer.java
@@ -72,7 +72,7 @@ public class NativeAdViewContainer extends ReactViewGroup implements AppEventLis
     CustomTargeting[] customTargeting;
     String[] categoryExclusions;
     String[] keywords;
-    String contentURL;
+    String content_url;
     String publisherProvidedID;
     Location location;
     String correlator;
@@ -299,8 +299,8 @@ public void run() {
                                 }
                             }
                         }
-                        if (contentURL != null) {
-                            adRequestBuilder.setContentUrl(contentURL);
+                        if (content_url != null) {
+                            adRequestBuilder.setContentUrl(content_url);
                         }
                         if (publisherProvidedID != null) {
                             adRequestBuilder.setPublisherProvidedId(publisherProvidedID);
@@ -614,8 +614,8 @@ public void setKeywords(String[] keywords) {
         this.keywords = keywords;
     }
 
-    public void setContentURL(String contentURL) {
-        this.contentURL = contentURL;
+    public void setContentURL(String content_url) {
+        this.content_url = content_url;
     }
 
     public void setPublisherProvidedID(String publisherProvidedID) {
diff --git a/android/src/main/java/com/matejdr/admanager/RNAdManagerAdaptiveBannerViewManager.java b/android/src/main/java/com/matejdr/admanager/RNAdManagerAdaptiveBannerViewManager.java
@@ -151,8 +151,8 @@ public void setPropTargeting(final AdaptiveBannerAdView view, final ReadableMap
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {
                     view.hasTargeting = true;
-                    String contentURL = targetingObjects.getString(targetingType);
-                    view.setContentURL(contentURL);
+                    String content_url = targetingObjects.getString(targetingType);
+                    view.setContentURL(content_url);
                 }
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {
diff --git a/android/src/main/java/com/matejdr/admanager/RNAdManagerBannerViewManager.java b/android/src/main/java/com/matejdr/admanager/RNAdManagerBannerViewManager.java
@@ -163,8 +163,8 @@ public void setPropTargeting(final BannerAdView view, final ReadableMap targetin
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {
                     view.hasTargeting = true;
-                    String contentURL = targetingObjects.getString(targetingType);
-                    view.setContentURL(contentURL);
+                    String content_url = targetingObjects.getString(targetingType);
+                    view.setContentURL(content_url);
                 }
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {
diff --git a/android/src/main/java/com/matejdr/admanager/RNAdManagerInterstitial.java b/android/src/main/java/com/matejdr/admanager/RNAdManagerInterstitial.java
@@ -51,7 +51,7 @@ public class RNAdManagerInterstitial extends ReactContextBaseJavaModule {
     CustomTargeting[] customTargeting;
     String[] categoryExclusions;
     String[] keywords;
-    String contentURL;
+    String content_url;
     String publisherProvidedID;
     Location location;
 
@@ -124,8 +124,8 @@ public void setTargeting(ReadableMap targetingObjects) {
                 }
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {
-                    String contentURL = targetingObjects.getString(targetingType);
-                    this.contentURL = contentURL;
+                    String content_url = targetingObjects.getString(targetingType);
+                    this.contentURL = content_url;
                 }
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {
@@ -190,8 +190,8 @@ private AdManagerAdRequest buildAdRequest() {
                 }
             }
         }
-        if (contentURL != null) {
-            adRequestBuilder.setContentUrl(contentURL);
+        if (content_url != null) {
+            adRequestBuilder.setContentUrl(content_url);
         }
         if (publisherProvidedID != null) {
             adRequestBuilder.setPublisherProvidedId(publisherProvidedID);
diff --git a/android/src/main/java/com/matejdr/admanager/RNAdManagerNativeViewManager.java b/android/src/main/java/com/matejdr/admanager/RNAdManagerNativeViewManager.java
@@ -187,8 +187,8 @@ public void setPropTargeting(final NativeAdViewContainer view, final ReadableMap
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {
                     view.hasTargeting = true;
-                    String contentURL = targetingObjects.getString(targetingType);
-                    view.setContentURL(contentURL);
+                    String content_url = targetingObjects.getString(targetingType);
+                    view.setContentURL(content_url);
                 }
 
                 if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {
diff --git a/ios/RNAdManageNativeView.m b/ios/RNAdManageNativeView.m
@@ -162,9 +162,9 @@ - (void)reloadAd {
         if (keywords != nil) {
             request.keywords = keywords;
         }
-        NSString *contentURL = [_targeting objectForKey:@"contentURL"];
-        if (contentURL != nil) {
-            request.contentURL = contentURL;
+        NSString *content_url = [_targeting objectForKey:@"content_url"];
+        if (content_url != nil) {
+            request.contentURL = content_url;
         }
         NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];
         if (publisherProvidedID != nil) {
diff --git a/ios/RNAdManagerAdaptiveBannerView.m b/ios/RNAdManagerAdaptiveBannerView.m
@@ -128,9 +128,9 @@ - (void)createViewIfCan
         if (keywords != nil) {
             request.keywords = keywords;
         }
-        NSString *contentURL = [_targeting objectForKey:@"contentURL"];
-        if (contentURL != nil) {
-            request.contentURL = contentURL;
+        NSString *content_url = [_targeting objectForKey:@"content_url"];
+        if (content_url != nil) {
+            request.contentURL = content_url;
         }
         NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];
         if (publisherProvidedID != nil) {
diff --git a/ios/RNAdManagerBannerView.m b/ios/RNAdManagerBannerView.m
@@ -115,9 +115,9 @@ - (void)createViewIfCan
         if (keywords != nil) {
             request.keywords = keywords;
         }
-        NSString *contentURL = [_targeting objectForKey:@"contentURL"];
-        if (contentURL != nil) {
-            request.contentURL = contentURL;
+        NSString *content_url = [_targeting objectForKey:@"content_url"];
+        if (content_url != nil) {
+            request.contentURL = content_url;
         }
         NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];
         if (publisherProvidedID != nil) {
diff --git a/ios/RNAdManagerInterstitial.m b/ios/RNAdManagerInterstitial.m
@@ -86,9 +86,9 @@ + (BOOL)requiresMainQueueSetup
             if (keywords != nil) {
                 request.keywords = keywords;
             }
-            NSString *contentURL = [_targeting objectForKey:@"contentURL"];
-            if (contentURL != nil) {
-                request.contentURL = contentURL;
+            NSString *content_url = [_targeting objectForKey:@"content_url"];
+            if (content_url != nil) {
+                request.contentURL = content_url;
             }
             NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];
             if (publisherProvidedID != nil) {
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-ad-manager",
   "title": "React Native Ad Manager",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "A react-native component for Google Ad Manager banners, interstitials and native ads.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class AdaptiveBannerAdView extends ReactViewGroup implements AppEventListener, L`
`44`	`44`	`CustomTargeting[] customTargeting;`
`45`	`45`	`String[] categoryExclusions;`
`46`	`46`	`String[] keywords;`
`47`		`- String contentURL;`
	`47`	`+ String content_url;`
`48`	`48`	`String publisherProvidedID;`
`49`	`49`	`Location location;`
`50`	`50`	`String correlator;`
`@@ -233,8 +233,8 @@ public void loadBanner() {`
`233`	`233`	`}`
`234`	`234`	`}`
`235`	`235`	`}`
`236`		`- if (contentURL != null) {`
`237`		`- adRequestBuilder.setContentUrl(contentURL);`
	`236`	`+ if (content_url != null) {`
	`237`	`+ adRequestBuilder.setContentUrl(content_url);`
`238`	`238`	`}`
`239`	`239`	`if (publisherProvidedID != null) {`
`240`	`240`	`adRequestBuilder.setPublisherProvidedId(publisherProvidedID);`
`@@ -283,8 +283,8 @@ public void setKeywords(String[] keywords) {`
`283`	`283`	`this.keywords = keywords;`
`284`	`284`	`}`
`285`	`285`
`286`		`- public void setContentURL(String contentURL) {`
`287`		`- this.contentURL = contentURL;`
	`286`	`+ public void setContentURL(String content_url) {`
	`287`	`+ this.content_url = content_url;`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`public void setPublisherProvidedID(String publisherProvidedID) {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class BannerAdView extends ReactViewGroup implements AppEventListener, Lifecycle`
`42`	`42`	`CustomTargeting[] customTargeting;`
`43`	`43`	`String[] categoryExclusions;`
`44`	`44`	`String[] keywords;`
`45`		`- String contentURL;`
	`45`	`+ String content_url;`
`46`	`46`	`String publisherProvidedID;`
`47`	`47`	`Location location;`
`48`	`48`	`String correlator;`
`@@ -264,8 +264,8 @@ public void loadBanner() {`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`}`
`267`		`- if (contentURL != null) {`
`268`		`- adRequestBuilder.setContentUrl(contentURL);`
	`267`	`+ if (content_url != null) {`
	`268`	`+ adRequestBuilder.setContentUrl(content_url);`
`269`	`269`	`}`
`270`	`270`	`if (publisherProvidedID != null) {`
`271`	`271`	`adRequestBuilder.setPublisherProvidedId(publisherProvidedID);`
`@@ -306,8 +306,8 @@ public void setKeywords(String[] keywords) {`
`306`	`306`	`this.keywords = keywords;`
`307`	`307`	`}`
`308`	`308`
`309`		`- public void setContentURL(String contentURL) {`
`310`		`- this.contentURL = contentURL;`
	`309`	`+ public void setContentURL(String content_url) {`
	`310`	`+ this.content_url = content_url;`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`public void setPublisherProvidedID(String publisherProvidedID) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public class NativeAdViewContainer extends ReactViewGroup implements AppEventLis`
`72`	`72`	`CustomTargeting[] customTargeting;`
`73`	`73`	`String[] categoryExclusions;`
`74`	`74`	`String[] keywords;`
`75`		`- String contentURL;`
	`75`	`+ String content_url;`
`76`	`76`	`String publisherProvidedID;`
`77`	`77`	`Location location;`
`78`	`78`	`String correlator;`
`@@ -299,8 +299,8 @@ public void run() {`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`}`
`302`		`- if (contentURL != null) {`
`303`		`- adRequestBuilder.setContentUrl(contentURL);`
	`302`	`+ if (content_url != null) {`
	`303`	`+ adRequestBuilder.setContentUrl(content_url);`
`304`	`304`	`}`
`305`	`305`	`if (publisherProvidedID != null) {`
`306`	`306`	`adRequestBuilder.setPublisherProvidedId(publisherProvidedID);`
`@@ -614,8 +614,8 @@ public void setKeywords(String[] keywords) {`
`614`	`614`	`this.keywords = keywords;`
`615`	`615`	`}`
`616`	`616`
`617`		`- public void setContentURL(String contentURL) {`
`618`		`- this.contentURL = contentURL;`
	`617`	`+ public void setContentURL(String content_url) {`
	`618`	`+ this.content_url = content_url;`
`619`	`619`	`}`
`620`	`620`
`621`	`621`	`public void setPublisherProvidedID(String publisherProvidedID) {`
Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ public void setPropTargeting(final AdaptiveBannerAdView view, final ReadableMap`
`151`	`151`
`152`	`152`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {`
`153`	`153`	`view.hasTargeting = true;`
`154`		`- String contentURL = targetingObjects.getString(targetingType);`
`155`		`- view.setContentURL(contentURL);`
	`154`	`+ String content_url = targetingObjects.getString(targetingType);`
	`155`	`+ view.setContentURL(content_url);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {`
Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,8 @@ public void setPropTargeting(final BannerAdView view, final ReadableMap targetin`
`163`	`163`
`164`	`164`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {`
`165`	`165`	`view.hasTargeting = true;`
`166`		`- String contentURL = targetingObjects.getString(targetingType);`
`167`		`- view.setContentURL(contentURL);`
	`166`	`+ String content_url = targetingObjects.getString(targetingType);`
	`167`	`+ view.setContentURL(content_url);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class RNAdManagerInterstitial extends ReactContextBaseJavaModule {`
`51`	`51`	`CustomTargeting[] customTargeting;`
`52`	`52`	`String[] categoryExclusions;`
`53`	`53`	`String[] keywords;`
`54`		`- String contentURL;`
	`54`	`+ String content_url;`
`55`	`55`	`String publisherProvidedID;`
`56`	`56`	`Location location;`
`57`	`57`
`@@ -124,8 +124,8 @@ public void setTargeting(ReadableMap targetingObjects) {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {`
`127`		`- String contentURL = targetingObjects.getString(targetingType);`
`128`		`- this.contentURL = contentURL;`
	`127`	`+ String content_url = targetingObjects.getString(targetingType);`
	`128`	`+ this.contentURL = content_url;`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {`
`@@ -190,8 +190,8 @@ private AdManagerAdRequest buildAdRequest() {`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`	`}`
`193`		`- if (contentURL != null) {`
`194`		`- adRequestBuilder.setContentUrl(contentURL);`
	`193`	`+ if (content_url != null) {`
	`194`	`+ adRequestBuilder.setContentUrl(content_url);`
`195`	`195`	`}`
`196`	`196`	`if (publisherProvidedID != null) {`
`197`	`197`	`adRequestBuilder.setPublisherProvidedId(publisherProvidedID);`
Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,8 @@ public void setPropTargeting(final NativeAdViewContainer view, final ReadableMap`
`187`	`187`
`188`	`188`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.CONTENTURL))) {`
`189`	`189`	`view.hasTargeting = true;`
`190`		`- String contentURL = targetingObjects.getString(targetingType);`
`191`		`- view.setContentURL(contentURL);`
	`190`	`+ String content_url = targetingObjects.getString(targetingType);`
	`191`	`+ view.setContentURL(content_url);`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`if (targetingType.equals(TargetingEnums.getEnumString(TargetingTypes.PUBLISHERPROVIDEDID))) {`
Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,9 @@ - (void)reloadAd {`
`162`	`162`	`if (keywords != nil) {`
`163`	`163`	`request.keywords = keywords;`
`164`	`164`	`}`
`165`		`- NSString *contentURL = [_targeting objectForKey:@"contentURL"];`
`166`		`- if (contentURL != nil) {`
`167`		`- request.contentURL = contentURL;`
	`165`	`+ NSString *content_url = [_targeting objectForKey:@"content_url"];`
	`166`	`+ if (content_url != nil) {`
	`167`	`+ request.contentURL = content_url;`
`168`	`168`	`}`
`169`	`169`	`NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];`
`170`	`170`	`if (publisherProvidedID != nil) {`
Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,9 @@ - (void)createViewIfCan`
`128`	`128`	`if (keywords != nil) {`
`129`	`129`	`request.keywords = keywords;`
`130`	`130`	`}`
`131`		`- NSString *contentURL = [_targeting objectForKey:@"contentURL"];`
`132`		`- if (contentURL != nil) {`
`133`		`- request.contentURL = contentURL;`
	`131`	`+ NSString *content_url = [_targeting objectForKey:@"content_url"];`
	`132`	`+ if (content_url != nil) {`
	`133`	`+ request.contentURL = content_url;`
`134`	`134`	`}`
`135`	`135`	`NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];`
`136`	`136`	`if (publisherProvidedID != nil) {`
Original file line number	Diff line number	Diff line change
`@@ -115,9 +115,9 @@ - (void)createViewIfCan`
`115`	`115`	`if (keywords != nil) {`
`116`	`116`	`request.keywords = keywords;`
`117`	`117`	`}`
`118`		`- NSString *contentURL = [_targeting objectForKey:@"contentURL"];`
`119`		`- if (contentURL != nil) {`
`120`		`- request.contentURL = contentURL;`
	`118`	`+ NSString *content_url = [_targeting objectForKey:@"content_url"];`
	`119`	`+ if (content_url != nil) {`
	`120`	`+ request.contentURL = content_url;`
`121`	`121`	`}`
`122`	`122`	`NSString *publisherProvidedID = [_targeting objectForKey:@"publisherProvidedID"];`
`123`	`123`	`if (publisherProvidedID != nil) {`