Fix ios problem with options

appfeel · Oct 27, 2016 · c97a77f · c97a77f
1 parent a070733
commit c97a77f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1 +1 @@
-{"name":"cordova-admob","version":"4.1.12","description":"Google AdMob Ads plugin for Cordova, Phonegap, Ionic/Angular and Intel XDK. Monetize your app with one javascript line. Android SDK v7.5, iOS SDK v7.3.1. With support for tappx and auto-detect internet connection.","cordova":{"id":"cordova-admob","platforms":["android","ios"]},"repository":{"type":"git","url":"git+https://github.com/appfeel/admob-google-cordova.git"},"keywords":["ad","ads","admob","google","advertising","advertisment","publicity","earn","win","play","services","iad","flurry","monetization","money","appfeel","tappx","ecosystem:cordova","cordova-android","cordova-ios"],"engines":[{"name":"cordova","version":">=4.0.0"}],"author":"AppFeel","license":"MIT","bugs":{"url":"https://github.com/appfeel/admob-google-cordova/issues"},"homepage":"https://github.com/appfeel/admob-google-cordova#readme"}
+{"name":"cordova-admob","version":"4.1.13","description":"Google AdMob Ads plugin for Cordova, Phonegap, Ionic/Angular and Intel XDK. Monetize your app with one javascript line. Android SDK v7.5, iOS SDK v7.3.1. With support for tappx and auto-detect internet connection.","cordova":{"id":"cordova-admob","platforms":["android","ios"]},"repository":{"type":"git","url":"git+https://github.com/appfeel/admob-google-cordova.git"},"keywords":["ad","ads","admob","google","advertising","advertisment","publicity","earn","win","play","services","iad","flurry","monetization","money","appfeel","tappx","ecosystem:cordova","cordova-android","cordova-ios"],"engines":[{"name":"cordova","version":">=4.0.0"}],"author":"AppFeel","license":"MIT","bugs":{"url":"https://github.com/appfeel/admob-google-cordova/issues"},"homepage":"https://github.com/appfeel/admob-google-cordova#readme"}
diff --git a/plugin.xml b/plugin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-admob" version="4.1.12">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-admob" version="4.1.13">
   <description>Google AdMob Ads plugin for Cordova, Phonegap, Ionic/Angular and Intel XDK. Monetize your app with one javascript line. Android SDK v7.5, iOS SDK v7.3.1. With support for tappx and auto-detect internet connection.</description>
   <name>AdMob Google Ads + Tappx</name>
   <author email="info@appfeel.com" href="https://github.com/appfeel/admob-google-cordova">AppFeel</author>

diff --git a/src/ios/CDVAdMobAds.m b/src/ios/CDVAdMobAds.m
@@ -543,64 +543,64 @@ - (void) __setOptions:(NSDictionary*) options {
     NSString* str = nil;
 
     str = [options objectForKey:OPT_PUBLISHER_ID];
-    if (str && [str length] > 0) {
+    if (str && ![str isEqual:[NSNull null]] && [str length] > 0) {
         publisherId = str;
     }
 
     str = [options objectForKey:OPT_INTERSTITIAL_ADID];
-    if (str && [str length] > 0) {
+    if (str && ![str isEqual:[NSNull null]] && [str length] > 0) {
         interstitialAdId = str;
     }
 
     str = [options objectForKey:OPT_AD_SIZE];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         adSize = [self __adSizeFromString:str];
     }
 
     str = [options objectForKey:OPT_BANNER_AT_TOP];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         isBannerAtTop = [str boolValue];
     }
 
     str = [options objectForKey:OPT_OVERLAP];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]] ) {
         isBannerOverlap = [str boolValue];
     }
 
     str = [options objectForKey:OPT_OFFSET_STATUSBAR];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         isOffsetStatusBar = [str boolValue];
     }
 
     str = [options objectForKey:OPT_IS_TESTING];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         isTesting = [str boolValue];
     }
 
     NSDictionary* dict = [options objectForKey:OPT_AD_EXTRAS];
-    if (dict) {
+    if (dict && ![dict isEqual:[NSNull null]]) {
         adExtras = dict;
     }
 
     str = [options objectForKey:OPT_AUTO_SHOW_BANNER];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         isBannerAutoShow = [str boolValue];
     }
 
     str = [options objectForKey:OPT_AUTO_SHOW_INTERSTITIAL];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         isInterstitialAutoShow = [str boolValue];
     }
 
     str = [options objectForKey:OPT_TAPPX_ID_IOS];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         tappxId = str;
         hasTappx = true;
         tappxShare = 0.5;
     }
 
     str = [options objectForKey:OPT_TAPPX_SHARE];
-    if (str) {
+    if (str && ![str isEqual:[NSNull null]]) {
         tappxShare = [str doubleValue];
         hasTappx = true;
     }