Fix that test ads be shown on devices registered with TestDevice

* Regardless of whether 'isDevelop' is true or false
ko2ic · May 13, 2019 · 21caf86 · 21caf86
1 parent cd7f907
commit 21caf86
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.0
+
+* Fix that test ads be shown on devices registered with TestDevice regardless of ```isDevelop```.
+
 ## 0.7.0
 
 * Implement onAdViewCreated callback.

diff --git a/android/src/main/kotlin/com/ko2ic/fluttergoogleadmanager/BannerView.kt b/android/src/main/kotlin/com/ko2ic/fluttergoogleadmanager/BannerView.kt
@@ -85,17 +85,16 @@ class BannerView(private val context: Context, id: Int, messenger: BinaryMesseng
 
         if (isDevelop) {
             publisherAdView?.adUnitId = "/6499/example/banner"
-            builder.addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
-            val testDevices = arguments["testDevices"] as? List<*>
-            if (testDevices != null) {
-                testDevices.filterIsInstance<String>().forEach { testDevice ->
-                    builder.addTestDevice(testDevice)
-                }
-            }
         } else {
             publisherAdView?.adUnitId = adUnitId
         }
 
+        builder.addTestDevice(AdRequest.DEVICE_ID_EMULATOR)
+        val testDevices = arguments["testDevices"] as? List<*>
+        testDevices?.filterIsInstance<String>()?.forEach { testDevice ->
+            builder.addTestDevice(testDevice)
+        }
+
         publisherAdView?.setAdSizes(*adSizes)
         publisherAdView?.visibility = View.VISIBLE
         publisherAdView?.adListener = BannerListener(channel, publisherAdView)

diff --git a/ios/Classes/BannerView.swift b/ios/Classes/BannerView.swift
@@ -48,13 +48,14 @@ class BannerView: NSObject, FlutterPlatformView {
         let request = DFPRequest()
         if isDevelop {
             bannerView.adUnitID = "/6499/example/banner"
-            if let testDevices = testDevices {
-                request.testDevices = testDevices
-            }
         } else {
             bannerView.adUnitID = adUnitId
         }
 
+        if let testDevices = testDevices {
+            request.testDevices = testDevices
+        }
+
         bannerView.delegate = self
 
         bannerView.rootViewController = UIApplication.shared.delegate!.window!!.rootViewController!

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_google_ad_manager
 description: Flutter plugin for Google Ad Manager(DoubleClick for Publishers).
-version: 0.7.0
+version: 0.8.0
 author: koji ishii <ko2ic.dev@gmail.com>
 homepage: https://github.com/ko2ic/flutter_google_ad_manager