Merge pull request #71 from thomashilzendegen/master

cordova-ios 4 compatibility and missing parameter in watch method added
apla · Jan 6, 2016 · 0ba3293 · 0ba3293
2 parents 4cb7247 + fd0c652
commit 0ba3293
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/ios/AppPreferences.m b/src/ios/AppPreferences.m
@@ -21,7 +21,12 @@ - (void)pluginInitialize
 - (void)defaultsChanged:(NSNotification *)notification {
 
 	NSString * jsCallBack = [NSString stringWithFormat:@"cordova.fireDocumentEvent('preferencesChanged');"];
+
+#ifdef __CORDOVA_4_0_0
+	[self.webViewEngine evaluateJavaScript:jsCallBack completionHandler:nil];
+#else
 	[self.webView stringByEvaluatingJavaScriptFromString:jsCallBack];
+#endif
 }
 
 
@@ -38,7 +43,7 @@ - (void)watch:(CDVInvokedUrlCommand*)command
 	}
 
 	if (watchChanges) {
-		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(defaultsChanged) name:NSUserDefaultsDidChangeNotification object:nil];
+		[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(defaultsChanged:) name:NSUserDefaultsDidChangeNotification object:nil];
 	} else {
 		[[NSNotificationCenter defaultCenter] removeObserver:self];
 	}

diff --git a/www/apppreferences.js b/www/apppreferences.js
@@ -303,11 +303,14 @@ successCallback, errorCallback
  * ```
  */
 AppPreferences.prototype.watch = platform.watch || function (
-	successCallback, errorCallback
+	successCallback, errorCallback, subscribe
 ) {
+	if (typeof subscribe === "undefined") {
+		subscribe = true;
+	}
 
 	var nativeExec = function (resolve, reject) {
-		return platform.nativeExec (resolve, reject, "AppPreferences", "watch", []);
+		return platform.nativeExec (resolve, reject, "AppPreferences", "watch", [subscribe]);
 	}
 
 	nativeExec (successCallback, errorCallback);