rhodes 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 1.4.2
+* Fix for BB push data
+* Fix issue #2547236 - BB map: incorrect drawing of world bounds (90N/90S, 180W/180E)
+* Fix issue #2539966 - System::get_property('platform') on Android is UNKNOWN
+* Fix issue #2540390 - blackberry map causes exception
+* Fix issue #2547920 - update attributes on new object doesn't call updateobjects
+* Fix issue #2561942 - BB Map: crash in case of wrong input parameters
+* Fix issue #2561958 - iPhone map: crash in case of wrong input parameters
+* Fix issue #2581678 - Android: GPS updates does not work
+
 == 1.4.1
 * fixed issue with empty cookie check failing
 

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.4.1'
+    DBVERSION = '1.4.2'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.4.1'
+    DBVERSION = '1.4.2'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.4.1'
+    DBVERSION = '1.4.2'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="19"
-      android:versionName="1.4.1">
+      android:versionCode="21"
+      android:versionName="1.4.2">
     <uses-sdk android:minSdkVersion="3"></uses-sdk>
     <application android:icon="@drawable/icon" android:multiprocess="true" android:allowTaskReparenting="true" android:debuggable="true"
     			 finishOnTaskLaunch="true" android:label="@string/app_name">

data/platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java

@@ -13,15 +13,13 @@ import android.os.Looper;
 public class GeoLocationImpl implements LocationListener {
 
 	private static final String TAG = "GeoLocationImpl";
+	private static final String PROVIDER = LocationManager.GPS_PROVIDER;
 	private LocationManager locationManager;
 	private double longitude = 0;
 	private double latitude = 0;
 	private boolean determined = false;
-
+	
 	public GeoLocationImpl() {
-
-		Looper.prepare();
-
 		setCurrentGpsLocation(null);
 	}
 
@@ -29,13 +27,10 @@ public class GeoLocationImpl implements LocationListener {
 		Logger.T(TAG, "GeoLocationImpl.setCurrentGpsLocation");
 		try {
 			if (location == null) {
-				locationManager = (LocationManager) RhodesInstance
-						.getInstance().getSystemService(
-								Context.LOCATION_SERVICE);
-				locationManager.requestLocationUpdates(
-						LocationManager.GPS_PROVIDER, 0, 0, this);
-				location = locationManager
-						.getLastKnownLocation(LocationManager.GPS_PROVIDER);
+				locationManager = (LocationManager) RhodesInstance.getInstance()
+					.getSystemService(Context.LOCATION_SERVICE);
+				locationManager.requestLocationUpdates(PROVIDER, 0, 0, this, Looper.getMainLooper());
+				location = locationManager.getLastKnownLocation(PROVIDER);
 			}
 			if (location != null) {
 				longitude = location.getLongitude();
@@ -45,8 +40,7 @@ public class GeoLocationImpl implements LocationListener {
 				determined = false;
 			}
 
-			Logger.T(TAG, "gps enabled: " + new Boolean(locationManager.isProviderEnabled(
-					LocationManager.GPS_PROVIDER)).toString());
+			Logger.T(TAG, "gps enabled: " + new Boolean(locationManager.isProviderEnabled(PROVIDER)).toString());
 			Logger.T(TAG, "determined: " + new Boolean(determined).toString());
 			if (determined) {
 				Logger.T(TAG, "longitude: " + new Double(longitude).toString());

data/platform/bb/rhodes/src/rhomobile/PushListeningThread.java

@@ -93,7 +93,7 @@ public class PushListeningThread extends Thread {
                         }
                         
                         try{
-                        	processPushMessage(data);
+                        	processPushMessage(data, db.getLength());
                         }catch(Exception exc)
                         {
                         	LOG.ERROR("processPushMessage failed.Data: " + new String(data), exc);
@@ -219,14 +219,14 @@ public class PushListeningThread extends Thread {
     	RhodesApplication.getInstance().play_file(file_name, media_type);
     }
    
-    private void processPushMessage(final byte[] data)
+    private void processPushMessage(final byte[] data, int nLen)
     {
        /* Application.getApplication().invokeLater(new Runnable() 
         {
             public void run() 
             {*/
-            	String msg = new String(data);
-            	LOG.INFO("Triger sync on PUSH message [" + msg + " ]\n");
+            	String msg = new String(data, 0, nLen);
+            	LOG.INFO("Triger sync on PUSH message [" + msg + " ]");
 
             	String[] op;
             	String[] ops = split(msg,"\n");

data/platform/bb/rhodes/src/rhomobile/mapview/GoogleMapField.java

@@ -60,7 +60,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	
 	// Mode of decoding EncodedImage to bitmap
 	private static final int DECODE_MODE = EncodedImage.DECODE_NATIVE |
-		EncodedImage.DECODE_NO_DITHER | EncodedImage.DECODE_READONLY;
+		EncodedImage.DECODE_NO_DITHER | EncodedImage.DECODE_READONLY |
+		EncodedImage.DECODE_ALPHA;
 
 	// Static google parameters
 	private static final int MIN_ZOOM = 0;
@@ -69,6 +70,7 @@ public class GoogleMapField extends Field implements RhoMapField {
 	private static final int MAX_GOOGLE_TILE_SIZE = 640;
 	
 	// Constants required to coordinates calculations
+	private static final long MIN_LATITUDE = degreesToPixelsY(90, MAX_ZOOM);
 	private static final long MAX_LATITUDE = degreesToPixelsY(-90, MAX_ZOOM);
 	private static final long MAX_LONGITUDE = degreesToPixelsX(180, MAX_ZOOM);
 	
@@ -81,8 +83,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	
 	//===============================================================================
 	// Coordinates of center in pixels of maximum zoom level
-	private long latitude = 0;
-	private long longitude = 0;
+	private long latitude = degreesToPixelsY(0, MAX_ZOOM);
+	private long longitude = degreesToPixelsX(0, MAX_ZOOM);
 	private int zoom = 0;
 	
 	private int tileSize;
@@ -343,7 +345,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 			url.append("&zoom=" + cmd.zoom);
 			url.append("&size=" + cmd.width + "x" + cmd.height);
 			url.append("&maptype=" + cmd.maptype);
-			url.append("&format=png&mobile=true&sensor=false");
+			url.append("&format=png&sensor=false");
+			url.append("&mobile=" + (cmd.maptype.equals("roadmap") ? "true" : "false"));
 			url.append("&key=" + mapkey);
 			if (!cmd.annotations.isEmpty()) {
 				url.append("&markers=color:blue");
@@ -682,6 +685,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	}
 	
 	private String makeCacheKey(long lat, long lon, int z) {
+		while (lon < 0) lon += MAX_LONGITUDE;
+		while (lon > MAX_LONGITUDE) lon -= MAX_LONGITUDE;
 		long x = lon/tileSize;
 		long y = lat/tileSize;
 		StringBuffer buf = new StringBuffer();
@@ -835,15 +840,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	}
 	
 	private void validateCoordinates() {
-		if (latitude < 0) latitude = 0;
+		if (latitude < MIN_LATITUDE) latitude = MIN_LATITUDE;
 		if (latitude > MAX_LATITUDE) latitude = MAX_LATITUDE;
-		if (longitude < 0) longitude = 0;
-		if (longitude > MAX_LONGITUDE) longitude = MAX_LONGITUDE;
-	}
-	
-	private void validateZoom() {
-		if (zoom < MIN_ZOOM) zoom = MIN_ZOOM;
-		if (zoom > MAX_ZOOM) zoom = MAX_ZOOM;
 	}
 	
 	public void moveTo(double lat, double lon) {
@@ -876,8 +874,9 @@ public class GoogleMapField extends Field implements RhoMapField {
 
 	public void setZoom(int z) {
 		zoom = z;
-		validateZoom();
-		lastFetchCommandSent = 0;
+		if (zoom < MIN_ZOOM) zoom = MIN_ZOOM;
+		if (zoom > MAX_ZOOM) zoom = MAX_ZOOM;
+		lastFetchCommandSent = System.currentTimeMillis() + CACHE_UPDATE_INTERVAL;
 	}
 	
 	public int calculateZoom(double latDelta, double lonDelta) {
@@ -892,6 +891,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	}
 	
 	public void addAnnotation(Annotation ann) {
+		if (ann.street_address == null && ann.coordinates == null)
+			return;
 		if (ann.coordinates != null) {
 			long nlat = degreesToPixelsY(ann.coordinates.latitude, MAX_ZOOM);
 			long nlon = degreesToPixelsX(ann.coordinates.longitude, MAX_ZOOM);
@@ -936,8 +937,8 @@ public class GoogleMapField extends Field implements RhoMapField {
 	}
 
 	private static long degreesToPixelsX(double n, int z) {
-		if (n < -180.0) n = -180.0;
-		if (n > 180.0) n = 180.0;
+		while (n < -180.0) n += 360.0;
+		while (n > 180.0) n -= 360.0;
 		double angleRatio = 360/math_pow(2, z);
 		double val = (n + 180)*GOOGLE_TILE_SIZE/angleRatio;
 		return (long)val;
@@ -957,16 +958,14 @@ public class GoogleMapField extends Field implements RhoMapField {
 	}
 	
 	private static double pixelsToDegreesX(long n, int z) {
-		if (n < 0) n = 0;
-		if (n > MAX_LONGITUDE) n = MAX_LONGITUDE;
+		while (n < 0) n += MAX_LONGITUDE;
+		while (n > MAX_LONGITUDE) n -= MAX_LONGITUDE;
 		double angleRatio = 360/math_pow(2, z);
 		double val = n*angleRatio/GOOGLE_TILE_SIZE - 180.0;
 		return val;
 	}
 	
 	private static double pixelsToDegreesY(long n, int z) {
-		if (n < 0) n = 0;
-		if (n > MAX_LATITUDE) n = MAX_LATITUDE;
 		// Revert calculation of Merkator projection
 		double ath = PI - 2*PI*n/(GOOGLE_TILE_SIZE*math_pow(2, z));
 		double th = math_tanh(ath);

data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java

@@ -16,6 +16,7 @@ import com.xruby.runtime.lang.RubyConstant;
 import com.xruby.runtime.lang.RubyException;
 import com.xruby.runtime.lang.RubyOneArgMethod;
 import com.xruby.runtime.lang.RubyRuntime;
+import com.xruby.runtime.lang.RubySymbol;
 import com.xruby.runtime.lang.RubyTwoArgMethod;
 import com.xruby.runtime.lang.RubyValue;
 import com.xruby.runtime.lang.RubyVarArgMethod;
@@ -72,11 +73,23 @@ public class MapView extends RubyBasic {
 					RubyArray arKeys = hash.keys();
 					RubyArray arValues = hash.values();
 					for (int i = 0; i != arKeys.size(); ++i) {
-						String strKey = arKeys.get(i).toString();
-						if (strKey.equals("settings"))
-							settingsHash = (RubyHash)arValues.get(i);
-						else if (strKey.equals("annotations"))
-							annotationsArray = (RubyArray)arValues.get(i);
+						RubyValue key = arKeys.get(i);
+						RubyValue value = arValues.get(i);
+						if (key == null || value == null)
+							continue;
+						String strKey = key.toString();
+						if (strKey.equals("settings")) {
+							if (!(value instanceof RubyHash))
+								throw new RubyException(RubyRuntime.ArgumentErrorClass,
+										"Wrong 'settings' type, should be Hash");
+							settingsHash = (RubyHash)value;
+						}
+						else if (strKey.equals("annotations")) {
+							if (!(value instanceof RubyArray))
+								throw new RubyException(RubyRuntime.ArgumentErrorClass,
+										"Wrong 'annotations' type, should be Array");
+							annotationsArray = (RubyArray)value;
+						}
 					}
 				}
 				
@@ -84,24 +97,47 @@ public class MapView extends RubyBasic {
 					RubyArray arKeys = settingsHash.keys();
 					RubyArray arValues = settingsHash.values();
 					for (int i = 0; i != arKeys.size(); ++i) {
-						String strKey = arKeys.get(i).toString();
+						RubyValue key = arKeys.get(i);
 						RubyValue value = arValues.get(i);
-						if (strKey.equals("map_type"))
-							settings.put(strKey, value.toString());
+						if (key == null || value == null)
+							continue;
+						String strKey = key.toString();
+						if (strKey.equals("map_type")) {
+							String strValue = value.toString();
+							if (!strValue.equals("roadmap") && !strValue.equals("satellite")
+									&& !strValue.equals("terrain") && !strValue.equals("hybrid"))
+								throw new RubyException(RubyRuntime.ArgumentErrorClass,
+										"Wrong 'map_type' value: " + strValue);
+							settings.put(strKey, strValue);
+						}
 						else if (strKey.equals("zoom_enabled"))
-							settings.put(strKey, new Boolean(((RubyConstant)value).isTrue()));
+							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
 						else if (strKey.equals("scroll_enabled"))
-							settings.put(strKey, new Boolean(((RubyConstant)value).isTrue()));
+							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
 						else if (strKey.equals("shows_user_location"))
-							settings.put(strKey, new Boolean(((RubyConstant)value).isTrue()));
+							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
 						else if (strKey.equals("region")) {
+							if (!(value instanceof RubyArray))
+								throw new RubyException(RubyRuntime.ArgumentErrorClass,
+										"Wrong 'region' type, should be Array");
 							RubyArray arr = (RubyArray)value;
 							if (arr.size() == 4) {
 								Hashtable region = new Hashtable();
-								region.put("latitude", new Double(arr.get(0).toFloat()));
-								region.put("longitude", new Double(arr.get(1).toFloat()));
-								region.put("latDelta", new Double(arr.get(2).toFloat()));
-								region.put("lonDelta", new Double(arr.get(3).toFloat()));
+								double[] cs = {0.0, 0.0, 0.0, 0.0};
+								for (int k = 0; k != 4; ++k) {
+									String v = arr.get(k).toString();
+									try {
+										cs[k] = Double.parseDouble(v);
+									}
+									catch (NumberFormatException e) {
+										throw new RubyException(RubyRuntime.ArgumentErrorClass,
+												"Wrong region value: " + v + ", should be Float");
+									}
+								}
+								region.put("latitude", new Double(cs[0]));
+								region.put("longitude", new Double(cs[1]));
+								region.put("latDelta", new Double(cs[2]));
+								region.put("lonDelta", new Double(cs[3]));
 								settings.put(strKey, region);
 							}
 						}
@@ -111,34 +147,60 @@ public class MapView extends RubyBasic {
 				if (annotationsArray != null) {
 					for (int i = 0; i != annotationsArray.size(); ++i) {
 						Annotation annotation = new Annotation();
-						RubyHash ann = (RubyHash)annotationsArray.get(i);
+						RubyValue val = annotationsArray.get(i);
+						if (!(val instanceof RubyHash))
+							throw new RubyException(RubyRuntime.ArgumentErrorClass,
+									"Wrong annotation value type, should be Hash");
+						RubyHash ann = (RubyHash)val;
 						RubyArray arKeys = ann.keys();
 						RubyArray arValues = ann.values();
 						for (int j = 0, lim = arKeys.size(); j < lim; ++j) {
-							String strKey = arKeys.get(j).toString();
+							RubyValue key = arKeys.get(j);
 							RubyValue value = arValues.get(j);
+							if (key == null || value == null ||
+									key.equals(RubyConstant.QNIL) ||
+									value.equals(RubyConstant.QNIL))
+								continue;
+							String strKey = key.toString();
+							String strValue = value.toString();
 							if (strKey.equals("latitude")) {
+								double v;
+								try {
+									v = Double.parseDouble(strValue);
+								}
+								catch (NumberFormatException e) {
+									throw new RubyException(RubyRuntime.ArgumentErrorClass,
+											"Wrong 'latitude' parameter: " + strValue + ", should be Float");
+								}
 								if (annotation.coordinates == null)
-									annotation.coordinates = new Annotation.Coordinates(value.toFloat(), 0);
+									annotation.coordinates = new Annotation.Coordinates(v, 0);
 								else
-									annotation.coordinates.latitude = value.toFloat();
+									annotation.coordinates.latitude = v;
 							}
 							else if (strKey.equals("longitude")) {
+								double v;
+								try {
+									v = Double.parseDouble(strValue);
+								}
+								catch (NumberFormatException e) {
+									throw new RubyException(RubyRuntime.ArgumentErrorClass,
+											"Wrong 'longitude' parameter: " + strValue + ", should be Float");
+								}
 								if (annotation.coordinates == null)
-									annotation.coordinates = new Annotation.Coordinates(0, value.toFloat());
+									annotation.coordinates = new Annotation.Coordinates(0, v);
 								else
-									annotation.coordinates.longitude = value.toFloat();
+									annotation.coordinates.longitude = v;
 							}
 							else if (strKey.equals("title"))
-								annotation.title = value.toString();
+								annotation.title = strValue;
 							else if (strKey.equals("subtitle"))
-								annotation.subtitle = value.toString();
+								annotation.subtitle = strValue;
 							else if (strKey.equals("street_address"))
-								annotation.street_address = value.toString();
+								annotation.street_address = strValue;
 							else if (strKey.equals("resolved_address"))
-								annotation.resolved_address = value.toString();
+								annotation.resolved_address = strValue;
 							else if (strKey.equals("url"))
-								annotation.url = value.toString();
+								annotation.url = strValue;
 						}
 						annotations.addElement(annotation);
 					}

data/platform/iphone/Classes/MapView/MapViewController.m

@@ -242,38 +242,39 @@ NSMutableArray* parse_annotations(int nannotations, char** annotation) {
 }
 
 NSMutableArray* parse_settings(int nparams, char** params) {
-	if (nparams <= 0) return [NSMutableArray arrayWithCapacity:0];
-	NSMutableArray *settings = [NSMutableArray arrayWithCapacity:nparams];
-	BOOL array_flag = FALSE;
-	for(int i = 0; i < nparams; i++) {
-		if (params[i]) {
-			if (array_flag) {
-				NSMutableArray *arr = [NSMutableArray arrayWithCapacity:1];
-				char **array = (char**)params[i];
-				while(*array) {
-					[arr addObject:[NSString stringWithCString:*array]];
-					array++;
-				}
-				array_flag = FALSE;
-				[settings addObject:arr];
-			} else {
-				if (strcmp(params[i],"region")==0) {
-					array_flag = TRUE;
-				} 
-				[settings addObject:[NSString stringWithCString:params[i]]];
-				printf("param %s\n", params[i]);
-			}
-		} else {
-			if (array_flag) {
-				array_flag = FALSE;
-				NSMutableArray *arr = [NSMutableArray arrayWithCapacity:1];
-				[settings addObject:arr];
-			} else {
-				[settings addObject:@""];
-			}
-		}
-	}
-	return settings;
+    if (nparams <= 0) return [NSMutableArray arrayWithCapacity:0];
+    NSMutableArray *settings = [NSMutableArray arrayWithCapacity:nparams];
+    BOOL array_flag = FALSE;
+    for(int i = 0; i < nparams; i++) {
+        if (params[i]) {
+            if (array_flag) {
+                NSMutableArray *arr = [NSMutableArray arrayWithCapacity:4];
+                char **array = (char**)params[i];
+                while(*array) {
+                    char const *s = *array;
+                    [arr addObject:[NSString stringWithCString:*array]];
+                    array++;
+                    printf("param %s\n", s);
+                }
+                array_flag = FALSE;
+                [settings addObject:arr];
+            } else {
+                if (strcmp(params[i],"region")==0)
+                    array_flag = TRUE;
+                [settings addObject:[NSString stringWithCString:params[i]]];
+                printf("param %s\n", params[i]);
+            }
+        } else {
+            if (array_flag) {
+                array_flag = FALSE;
+                NSMutableArray *arr = [NSMutableArray arrayWithCapacity:1];
+                [settings addObject:arr];
+            } else {
+                [settings addObject:@""];
+            }
+        }
+    }
+    return settings;
 }
 
 #endif

data/platform/iphone/Classes/WebViewController.m

@@ -97,8 +97,10 @@ char* get_current_location() {
 
 -(void)navigateRedirect:(NSString*)url {
     //RAWLOG_INFO1("Navigate (redirect) to: %s", [url cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-	NSString* escapedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; 
-	NSString* redirector = [@"http://localhost:8080/system/redirect_to?url=" stringByAppendingString:escapedUrl];
+	NSString* escapedUrl = [url stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+	NSString* homeurl = [NSString stringWithCString:rho_rhodesapp_gethomeurl() encoding:[NSString defaultCStringEncoding]];
+	NSString* redirector1 = [@"/system/redirect_to?url=" stringByAppendingString:escapedUrl];
+	NSString* redirector = [homeurl stringByAppendingString:redirector1];
 	[webView loadRequest:[NSURLRequest requestWithURL: [NSURL URLWithString:redirector]]];
 }
 

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundleSignature</key>
   <string>????</string>
   <key>CFBundleVersion</key>
-  <string>1.4.1</string>
+  <string>1.4.2</string>
   <key>LSRequiresIPhoneOS</key>
   <true/>
   <key>NSMainNibFile</key>