cordova-admob-tomitank 1.0.8 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-admob-tomitank",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "Trustable Google AdMob Cordova Plugin",
   "main": "lib/index.js",
   "module": "esm/index.js",

package/plugin.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<plugin id="cordova-admob-tomitank" version="1.0.8"
+<plugin id="cordova-admob-tomitank" version="1.0.9"
     xmlns="http://apache.org/cordova/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <name>cordova-admob-tomitank</name>
@@ -91,7 +91,11 @@
             <string>$USAGE</string>
         </config-file>
 
-		<config-file platform="ios" target="*-Info.plist" parent="SKAdNetworkItems">
+        <config-file target="*-Info.plist" parent="GADIntegrationManager">
+            <string>webview</string>
+        </config-file>
+
+		<config-file target="*-Info.plist" parent="SKAdNetworkItems">
 			<array>
 				<dict>
 					<key>SKAdNetworkIdentifier</key>

package/src/ios/AMBPlugin.swift

@@ -16,10 +16,11 @@ class AMBPlugin: CDVPlugin {
     }
 
     override func pluginInitialize() {
+        print("Initialize..");
+
         super.pluginInitialize()
 
         AMBContext.plugin = self
-        //GADMobileAds.sharedInstance().requestConfiguration.testDeviceIdentifiers = [ GADSimulatorID ]
 
         if let x = self.commandDelegate.settings["disableSDKCrashReporting".lowercased()] as? String,
            x == "true" {
@@ -42,7 +43,25 @@ class AMBPlugin: CDVPlugin {
 
     @objc func configRequest(_ command: CDVInvokedUrlCommand) {
         let ctx = AMBContext(command)
-        ctx.configure()
+        let requestConfiguration = GADMobileAds.sharedInstance().requestConfiguration
+
+        if let maxAdContentRating = ctx.optMaxAdContentRating() {
+            requestConfiguration.maxAdContentRating = maxAdContentRating
+        }
+
+        if let tag = ctx.optChildDirectedTreatmentTag() {
+            requestConfiguration.tag(forChildDirectedTreatment: tag)
+        }
+
+        if let tag = ctx.optUnderAgeOfConsentTag() {
+            requestConfiguration.tagForUnderAge(ofConsent: tag)
+        }
+
+        if let testDevices = ctx.optTestDeviceIds() {
+            requestConfiguration.testDeviceIdentifiers = testDevices
+        }
+
+        ctx.resolve()
     }
 
     @objc func requestTrackingAuthorization(_ command: CDVInvokedUrlCommand) {
@@ -59,8 +78,9 @@ class AMBPlugin: CDVPlugin {
 
     @objc func start(_ command: CDVInvokedUrlCommand) {
         let ctx = AMBContext(command)
+
         GADMobileAds.sharedInstance().start(completionHandler: { _ in
-            ctx.resolve(["version": GADGetStringFromVersionNumber(GADMobileAds.sharedInstance().versionNumber)])
+            ctx.resolve(["version": GADMobileAds.sharedInstance().sdkVersion])
         })
     }
 
@@ -111,7 +131,7 @@ class AMBPlugin: CDVPlugin {
                 if ad != nil {
                     ctx.resolve()
                 } else {
-                    ctx.reject("fail to create ad: \(ctx.optId() ?? "-")")
+                    ctx.reject("fail to create ad: \(ctx.optId() ?? -1)")
                 }
             } else {
                 ctx.reject()
@@ -172,21 +192,9 @@ class AMBPlugin: CDVPlugin {
         }
     }
 
-    @objc func webviewGoto(_ command: CDVInvokedUrlCommand) {
-        let ctx = AMBContext(command)
-
-        DispatchQueue.main.async {
-            if let url = URL(string: ctx.optWebviewGoto()+"#from_webview_goto") {
-                let webView = self.webViewEngine.engineWebView as! WKWebView
-                webView.load(URLRequest(url: url))
-            }
-        }
-    }
-
     func emit(_ eventName: String, data: Any = NSNull()) {
         let result = CDVPluginResult(status: CDVCommandStatus_OK, messageAs: ["type": eventName, "data": data])
         result?.setKeepCallbackAs(true)
         self.commandDelegate.send(result, callbackId: readyCallbackId)
     }
-
-}
+}