diff --git a/packages/firebase_admob/lib/firebase_admob.dart b/packages/firebase_admob/lib/firebase_admob.dart index 9e66a8718841..610c0dba6008 100644 --- a/packages/firebase_admob/lib/firebase_admob.dart +++ b/packages/firebase_admob/lib/firebase_admob.dart @@ -46,7 +46,6 @@ class MobileAdTargetingInfo { this.designedForFamilies, this.childDirected, this.testDevices, - this.requestAgent, }); final List keywords; @@ -56,10 +55,11 @@ class MobileAdTargetingInfo { final bool designedForFamilies; final bool childDirected; final List testDevices; - final String requestAgent; Map toJson() { - final Map json = {}; + final Map json = { + 'requestAgent': 'flutter-alpha', + }; if (keywords != null && keywords.isNotEmpty) { assert(keywords.every((String s) => s != null && s.isNotEmpty)); @@ -76,8 +76,6 @@ class MobileAdTargetingInfo { assert(testDevices.every((String s) => s != null && s.isNotEmpty)); json['testDevices'] = testDevices; } - if (requestAgent != null && requestAgent.isNotEmpty) - json['requestAgent'] = requestAgent; return json; } @@ -92,14 +90,19 @@ abstract class MobileAd { static final Map _allAds = {}; /// Default constructor, used by subclasses. - MobileAd({@required this.unitId, this.targetingInfo, this.listener}) { + MobileAd( + {@required this.unitId, + MobileAdTargetingInfo targetingInfo, + this.listener}) + : _targetingInfo = targetingInfo ?? const MobileAdTargetingInfo() { assert(unitId != null && unitId.isNotEmpty); assert(_allAds[id] == null); _allAds[id] = this; } /// Optional targeting info per the native AdMob API. - final MobileAdTargetingInfo targetingInfo; + MobileAdTargetingInfo get targetingInfo => _targetingInfo; + final MobileAdTargetingInfo _targetingInfo; /// Identifies the source of ads for your application. /// diff --git a/packages/firebase_admob/test/firebase_admob_test.dart b/packages/firebase_admob/test/firebase_admob_test.dart index 3fe23fec504d..6777ffd3fdad 100644 --- a/packages/firebase_admob/test/firebase_admob_test.dart +++ b/packages/firebase_admob/test/firebase_admob_test.dart @@ -66,7 +66,7 @@ void main() { isMethodCall('loadBannerAd', arguments: { 'id': id, 'unitId': bannerAdUnitId, - 'targetingInfo': null, + 'targetingInfo': {'requestAgent': 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id, @@ -93,7 +93,7 @@ void main() { isMethodCall('loadInterstitialAd', arguments: { 'id': id, 'unitId': interstitialAdUnitId, - 'targetingInfo': null, + 'targetingInfo': {'requestAgent': 'flutter-alpha'}, }), isMethodCall('showAd', arguments: { 'id': id,