Merge pull request #12 from Telerik-Verified-Plugins/master

String comparison: equals vs ==
Paldom · Dec 13, 2014 · f9cf4f0 · f9cf4f0
2 parents b6cbcfc + 30d99da
commit f9cf4f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/src/android/SpinnerDialog.java b/src/android/SpinnerDialog.java
@@ -19,15 +19,12 @@ public class SpinnerDialog extends CordovaPlugin {
 	public SpinnerDialog() {
 	}
 
-	public boolean execute(String action, JSONArray args,
-			final CallbackContext callbackContext) throws JSONException {
+	public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
 		if (action.equals("show")) {
 
-			final String title = args.getString(0) == "null" ? null : args
-					.getString(0);
-			final String message = args.getString(1) == "null" ? null : args
-					.getString(1);
-            final boolean isFixed = args.getBoolean(2);
+			final String title = "null".equals(args.getString(0)) ? null : args.getString(0);
+			final String message = "null".equals(args.getString(1)) ? null : args.getString(1);
+			final boolean isFixed = args.getBoolean(2);
 
 			final CordovaInterface cordova = this.cordova;
 			Runnable runnable = new Runnable() {
@@ -78,4 +75,4 @@ public void run() {
 		return true;
 	}
 
-}
+}
diff --git a/src/ios/CDVSpinnerDialog.m b/src/ios/CDVSpinnerDialog.m
@@ -29,7 +29,7 @@ @implementation CDVSpinnerDialog
 @synthesize messageView = _messageView;
 
 -(CGRect)rectForView {
-    if ((NSFoundationVersionNumber <= NSFoundationVersionNumber_iOS_7_1) && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
+    if ((NSFoundationVersionNumber <= 1047.25 /* 7.1 */) && UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
         return CGRectMake( 0.0f, 0.0f, [[UIScreen mainScreen]bounds].size.height, [UIScreen mainScreen].bounds.size.width);
     }
     return CGRectMake( 0.0f, 0.0f, [[UIScreen mainScreen]bounds].size.width, [UIScreen mainScreen].bounds.size.height);