Adds nonPersonalizedAds option to MobileAdTargetingInfo for firebase_…

…admob (flutter#638) * Adds nonPersonalizedAds option to MobileAdTargetingInfo * Formats code * Bump version
p30arena · Aug 24, 2018 · c9c4016 · c9c4016
1 parent d447c4a
commit c9c4016
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 10 deletions.
diff --git a/packages/firebase_admob/CHANGELOG.md b/packages/firebase_admob/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0
+
+* Add nonPersonalizedAds option to MobileAdTargetingInfo
+
 ## 0.5.7
 
 * Bumped mockito dependency to pick up Dart 2 support.

diff --git a/...admob/android/src/main/java/io/flutter/plugins/firebaseadmob/AdRequestBuilderFactory.java b/...admob/android/src/main/java/io/flutter/plugins/firebaseadmob/AdRequestBuilderFactory.java
@@ -4,7 +4,9 @@
 
 package io.flutter.plugins.firebaseadmob;
 
+import android.os.Bundle;
 import android.util.Log;
+import com.google.ads.mediation.admob.AdMobAdapter;
 import com.google.android.gms.ads.AdRequest;
 import java.util.ArrayList;
 import java.util.Date;
@@ -115,6 +117,14 @@ AdRequest.Builder createAdRequestBuilder() {
     String requestAgent = getTargetingInfoString("requestAgent", targetingInfo.get("requestAgent"));
     if (requestAgent != null) builder.setRequestAgent(requestAgent);
 
+    Boolean nonPersonalizedAds =
+        getTargetingInfoBoolean("nonPersonalizedAds", targetingInfo.get("nonPersonalizedAds"));
+    if (nonPersonalizedAds != null && nonPersonalizedAds) {
+      Bundle extras = new Bundle();
+      extras.putString("npa", "1");
+      builder.addNetworkExtrasBundle(AdMobAdapter.class, extras);
+    }
+
     return builder;
   }
 }
diff --git a/packages/firebase_admob/example/lib/main.dart b/packages/firebase_admob/example/lib/main.dart
@@ -22,6 +22,7 @@ class _MyAppState extends State<MyApp> {
     birthday: new DateTime.now(),
     childDirected: true,
     gender: MobileAdGender.male,
+    nonPersonalizedAds: true,
   );
 
   BannerAd _bannerAd;

diff --git a/packages/firebase_admob/ios/Classes/FLTRequestFactory.m b/packages/firebase_admob/ios/Classes/FLTRequestFactory.m
@@ -4,6 +4,7 @@
 
 #import "FLTRequestFactory.h"
 #import "FirebaseAdMobPlugin.h"
+#import "GoogleMobileAds/GADExtras.h"
 #import "GoogleMobileAds/GoogleMobileAds.h"
 
 @implementation FLTRequestFactory
@@ -120,6 +121,14 @@ - (GADRequest *)createRequest {
     request.requestAgent = requestAgent;
   }
 
+  NSNumber *nonPersonalizedAds =
+      [self targetingInfoBoolForKey:@"nonPersonalizedAds" info:_targetingInfo];
+  if (nonPersonalizedAds != nil && [nonPersonalizedAds boolValue]) {
+    GADExtras *extras = [[GADExtras alloc] init];
+    extras.additionalParameters = @{@"npa" : @"1"};
+    [request registerAdNetworkExtras:extras];
+  }
+
   return request;
 }
 

diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart
@@ -39,15 +39,15 @@ typedef void MobileAdListener(MobileAdEvent event);
 /// This class's properties mirror the native AdRequest API. See for example:
 /// [AdRequest.Builder for Android](https://firebase.google.com/docs/reference/android/com/google/android/gms/ads/AdRequest.Builder).
 class MobileAdTargetingInfo {
-  const MobileAdTargetingInfo({
-    this.keywords,
-    this.contentUrl,
-    this.birthday,
-    this.gender,
-    this.designedForFamilies,
-    this.childDirected,
-    this.testDevices,
-  });
+  const MobileAdTargetingInfo(
+      {this.keywords,
+      this.contentUrl,
+      this.birthday,
+      this.gender,
+      this.designedForFamilies,
+      this.childDirected,
+      this.testDevices,
+      this.nonPersonalizedAds});
 
   final List<String> keywords;
   final String contentUrl;
@@ -56,6 +56,7 @@ class MobileAdTargetingInfo {
   final bool designedForFamilies;
   final bool childDirected;
   final List<String> testDevices;
+  final bool nonPersonalizedAds;
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> json = <String, dynamic>{
@@ -66,6 +67,8 @@ class MobileAdTargetingInfo {
       assert(keywords.every((String s) => s != null && s.isNotEmpty));
       json['keywords'] = keywords;
     }
+    if (nonPersonalizedAds != null)
+      json['nonPersonalizedAds'] = nonPersonalizedAds;
     if (contentUrl != null && contentUrl.isNotEmpty)
       json['contentUrl'] = contentUrl;
     if (birthday != null) json['birthday'] = birthday.millisecondsSinceEpoch;

diff --git a/packages/firebase_admob/pubspec.yaml b/packages/firebase_admob/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_admob
 description: Firebase AdMob plugin for Flutter applications.
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_admob
-version: 0.5.7
+version: 0.6.0
 
 flutter:
   plugin: