rhodes 2.0.0.beta1 → 2.0.0.beta2

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/Annotation.java

@@ -1,6 +1,7 @@
 package com.rhomobile.rhodes.mapview;
 
 public class Annotation {
+	public String type = null;
 	public double latitude = 0;
 	public double longitude = 0;
 	public String address = null;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java

@@ -1,13 +1,14 @@
 package com.rhomobile.rhodes.mapview;
 
-import java.io.InputStream;
-import java.net.URL;
+import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
+import android.location.Address;
+import android.location.Geocoder;
 import android.os.Bundle;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.RelativeLayout;
@@ -30,6 +31,9 @@ public class MapView extends MapActivity {
 	private com.google.android.maps.MapView view;
 	private AnnotationsOverlay annOverlay;
 	
+	private double spanLat = 0;
+	private double spanLon = 0;
+	
 	private String apiKey;
 	
 	private Vector<Annotation> annotations;
@@ -64,13 +68,35 @@ public class MapView extends MapActivity {
 					intent.putExtra(SETTINGS_PREFIX + "shows_user_location", ((String)shows_user_location).equalsIgnoreCase("true"));
 				
 				Object region = hash.get("region");
-				if (region != null && (region instanceof Vector<?>)) {
-					Vector<String> reg = (Vector<String>)region;
-					if (reg.size() == 4) {
-						intent.putExtra(SETTINGS_PREFIX + "region.latitude", reg.elementAt(0));
-						intent.putExtra(SETTINGS_PREFIX + "region.longitude", reg.elementAt(1));
-						intent.putExtra(SETTINGS_PREFIX + "region.latSpan", reg.elementAt(2));
-						intent.putExtra(SETTINGS_PREFIX + "region.lonSpan", reg.elementAt(3));
+				if (region != null) {
+					if (region instanceof Vector<?>) {
+						Vector<String> reg = (Vector<String>)region;
+						if (reg.size() == 4) {
+							intent.putExtra(SETTINGS_PREFIX + "region", "square");
+							intent.putExtra(SETTINGS_PREFIX + "region.latitude", reg.elementAt(0));
+							intent.putExtra(SETTINGS_PREFIX + "region.longitude", reg.elementAt(1));
+							intent.putExtra(SETTINGS_PREFIX + "region.latSpan", reg.elementAt(2));
+							intent.putExtra(SETTINGS_PREFIX + "region.lonSpan", reg.elementAt(3));
+						}
+					}
+					else if (region instanceof Map<?,?>) {
+						Map<Object, Object> reg = (Map<Object,Object>)region;
+						String center = null;
+						String radius = null;
+						
+						Object centerObj = reg.get("center");
+						if (centerObj != null && (centerObj instanceof String))
+							center = (String)centerObj;
+						
+						Object radiusObj = reg.get("radius");
+						if (radiusObj != null && (radiusObj instanceof String))
+							radius = (String)radiusObj;
+						
+						if (center != null && radius != null) {
+							intent.putExtra(SETTINGS_PREFIX + "region", "circle");
+							intent.putExtra(SETTINGS_PREFIX + "region.center", center);
+							intent.putExtra(SETTINGS_PREFIX + "region.radius", radius);
+						}
 					}
 				}
 			}
@@ -145,13 +171,8 @@ public class MapView extends MapActivity {
 		//boolean scroll_enabled = extras.getBoolean(SETTINGS_PREFIX + "scroll_enabled");
 		//boolean shows_user_location = extras.getBoolean(SETTINGS_PREFIX + "shows_user_location");
 		
-		String latitude = extras.getString(SETTINGS_PREFIX + "region.latitude");
-		String longitude = extras.getString(SETTINGS_PREFIX + "region.longitude");
-		String latSpan = extras.getString(SETTINGS_PREFIX + "region.latSpan");
-		String lonSpan = extras.getString(SETTINGS_PREFIX + "region.lonSpan");
-		
 		// Extract annotations
-		int size = extras.getInt(ANNOTATIONS_PREFIX + "size");
+		int size = extras.getInt(ANNOTATIONS_PREFIX + "size") + 1;
 		annotations = new Vector<Annotation>(size);
 		for (int i = 0; i < size; ++i) {
 			Annotation ann = new Annotation();
@@ -176,10 +197,13 @@ public class MapView extends MapActivity {
 				catch (NumberFormatException e) {}
 			}
 			
+			ann.type = "ann";
 			ann.address = extras.getString(prefix + "address");
 			ann.title = extras.getString(prefix + "title");
 			ann.subtitle = extras.getString(prefix + "subtitle");
-			ann.url = RhodesInstance.getInstance().normalizeUrl(extras.getString(prefix + "url"));
+			ann.url = extras.getString(prefix + "url");
+			if (ann.url != null)
+				ann.url = RhodesInstance.getInstance().normalizeUrl(ann.url);
 			annotations.addElement(ann);
 		}
 		
@@ -200,25 +224,50 @@ public class MapView extends MapActivity {
 		view.setStreetView(false);
 		
 		MapController controller = view.getController();
-		if (latitude != null && longitude != null) {
-			try {
-				double lat = Double.parseDouble(latitude);
-				double lon = Double.parseDouble(longitude);
-				controller.setCenter(new GeoPoint((int)(lat*1000000), (int)(lon*1000000)));
+		String type = extras.getString(SETTINGS_PREFIX + "region");
+		if (type.equals("square")) {
+			String latitude = extras.getString(SETTINGS_PREFIX + "region.latitude");
+			String longitude = extras.getString(SETTINGS_PREFIX + "region.longitude");
+			if (latitude != null && longitude != null) {
+				try {
+					double lat = Double.parseDouble(latitude);
+					double lon = Double.parseDouble(longitude);
+					controller.setCenter(new GeoPoint((int)(lat*1000000), (int)(lon*1000000)));
+				}
+				catch (NumberFormatException e) {
+					Logger.E(TAG, "Wrong region center: " + e.getMessage());
+				}
 			}
-			catch (NumberFormatException e) {
-				Logger.E(TAG, "Wrong region center: " + e.getMessage());
+			
+			String latSpan = extras.getString(SETTINGS_PREFIX + "region.latSpan");
+			String lonSpan = extras.getString(SETTINGS_PREFIX + "region.lonSpan");
+			if (latSpan != null && lonSpan != null) {
+				try {
+					double lat = Double.parseDouble(latSpan);
+					double lon = Double.parseDouble(lonSpan);
+					controller.zoomToSpan((int)(lat*1000000), (int)(lon*1000000));
+				}
+				catch (NumberFormatException e) {
+					Logger.E(TAG, "Wrong region span: " + e.getMessage());
+				}
 			}
 		}
-		
-		if (latSpan != null && lonSpan != null) {
-			try {
-				double lat = Double.parseDouble(latSpan);
-				double lon = Double.parseDouble(lonSpan);
-				controller.zoomToSpan((int)(lat*1000000), (int)(lon*1000000));
-			}
-			catch (NumberFormatException e) {
-				Logger.E(TAG, "Wrong region span: " + e.getMessage());
+		else if (type.equals("circle")) {
+			String center = extras.getString(SETTINGS_PREFIX + "region.center");
+			String radius = extras.getString(SETTINGS_PREFIX + "region.radius");
+			if (center != null && radius != null) {
+				try {
+					double span = Double.parseDouble(radius);
+					spanLat = spanLon = span;
+					Annotation ann = new Annotation();
+					ann.type = "center";
+					ann.latitude = ann.longitude = 10000;
+					ann.address = center;
+					annotations.insertElementAt(ann, 0);
+				}
+				catch (NumberFormatException e) {
+					Logger.E(TAG, "Wrong region radius: " + e.getMessage());
+				}
 			}
 		}
 		
@@ -247,45 +296,25 @@ public class MapView extends MapActivity {
 			if (ann.address == null)
 				continue;
 			
+			Geocoder gc = new Geocoder(RhodesInstance.getInstance());
 			try {
-				StringBuffer b = new StringBuffer();
-				b.append("http://maps.google.com/maps/geo?q=");
-				b.append(Uri.encode(ann.address));
-				b.append("&output=csv&mobile=false&sensor=false");
-				
-				URL url = new URL(b.toString());
-				
-				b = new StringBuffer();
-				
-				InputStream is = url.openStream();
-				byte[] buf = new byte[128];
-				for (;;) {
-					int n = is.read(buf);
-					if (n == -1)
-						break;
-					
-					String s = new String(buf, 0, n);
-					b.append(s);
-				}
-				
-				String response = b.toString();
-				Vector<String> res = split(response, ",");
-				if (res.size() != 4) {
-					Logger.E(TAG, "Geocoding response parse error. Response: " + response);
+				List<Address> addrs = gc.getFromLocationName(ann.address, 1);
+				if (addrs.size() == 0)
 					continue;
-				}
 				
-				//int statusCode = Integer.parseInt(res.elementAt(0));
-				//int accuracy = Integer.parseInt(res.elementAt(1));
-				double latitude = Double.parseDouble(res.elementAt(2));
-				double longitude = Double.parseDouble(res.elementAt(3));
+				Address addr = addrs.get(0);
 				
-				ann.latitude = latitude;
-				ann.longitude = longitude;
-				annOverlay.addAnnotation(ann);
-			}
-			catch (Exception e) {
-				Logger.E(TAG, "GeoCoding request failed");
+				ann.latitude = addr.getLatitude();
+				ann.longitude = addr.getLongitude();
+				if (ann.type.equals("center")) {
+					MapController controller = view.getController();
+					controller.setCenter(new GeoPoint((int)(ann.latitude*1000000), (int)(ann.longitude*1000000)));
+					controller.zoomToSpan((int)(spanLat*1000000), (int)(spanLon*1000000));
+				}
+				else
+					annOverlay.addAnnotation(ann);
+			} catch (IOException e) {
+				Logger.E(TAG, "GeoCoding request failed: " + e.getMessage());
 			}
 			
 			Rhodes.performOnUiThread(new Runnable() {
@@ -301,21 +330,4 @@ public class MapView extends MapActivity {
 		return false;
 	}
 	
-	private static Vector<String> split(String s, String delimiter) {
-		Vector<String> res = new Vector<String>();
-		for (int start = 0, end = start;;) {
-			end = s.indexOf(delimiter, start);
-			if (end == -1) {
-				res.addElement(s.substring(start));
-				break;
-			}
-			else {
-				res.addElement(s.substring(start, end));
-				start = end + delimiter.length();
-			}
-		}
-
-		return res;
-	}
-	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java

@@ -0,0 +1,52 @@
+/*
+ ============================================================================
+ Author	    : Dmitry Moskalchuk
+ Version	: 1.5
+ Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ============================================================================
+ */
+package com.rhomobile.rhodes.uri;
+
+import com.rhomobile.rhodes.Logger;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+public class SmsUriHandler implements UriHandler {
+	
+	private static final String TAG = "SmsUriHandler";
+	private Context ctx;
+	
+	public SmsUriHandler(Context c) {
+		ctx = c;
+	}
+
+	public boolean handle(String url) {
+		Uri uri = Uri.parse(url);
+		if (!uri.getScheme().equals("sms"))
+			return false;
+		
+		Logger.D(TAG, "This is 'sms' uri, handle it");
+		
+		Intent intent = new Intent(Intent.ACTION_SENDTO);
+		intent.setData(uri);
+		
+		ctx.startActivity(Intent.createChooser(intent, "Send SMS..."));
+		return true;
+	}
+
+}

data/platform/android/build/RhodesSRC_build.files

@@ -40,6 +40,7 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/ui/AboutDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogOptionsDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/ui/LogViewDialog.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/MailUriHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/uri/SmsUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/TelUriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/UriHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/uri/VideoUriHandler.java

data/platform/android/build/android.rake

@@ -1,5 +1,6 @@
 #
 require File.dirname(__FILE__) + '/androidcommon.rb'
+require 'pathname'
 
 USE_STLPORT = true
 USE_TRACES = false
@@ -831,12 +832,19 @@ namespace "build" do
         exit 1
       end
 
-      puts "all_files_mask: #{$all_files_mask}"
-      args = ["cf","../../Rhodes.jar", $all_files_mask]
-      puts Jake.run($jarbin, args, "#{$tmpdir}/Rhodes/")
-      unless $? == 0
-        puts "Error running jar"
-        exit 1
+      files = []
+      Dir.glob(File.join($tmpdir, "Rhodes", "*")).each do |f|
+        relpath = Pathname.new(f).relative_path_from(Pathname.new(File.join($tmpdir, "Rhodes"))).to_s
+        files << relpath
+      end
+      unless files.empty?
+        args = ["cf", "../../Rhodes.jar"]
+        args += files
+        puts Jake.run($jarbin, args, File.join($tmpdir, "Rhodes"))
+        unless $? == 0
+          puts "Error running jar"
+          exit 1
+        end
       end
     end
 
@@ -870,20 +878,36 @@ namespace "package" do
     args = ["package", "-f", "-M", manifest, "-S", resource, "-A", assets, "-I", $androidjar, "-F", resourcepkg]
     puts Jake.run($aapt, args)
     unless $? == 0
-      puts "Error running AAPT"
+      puts "Error running AAPT (1)"
       exit 1
     end
 
-    rm_rf $bindir + "/lib"
-    mkdir_p $bindir + "/lib/armeabi"
-    cp_r $bindir + "/libs/" + $confdir + "/librhodes.so", $bindir + "/lib/armeabi"
-    cc_run($stripbin, [$bindir + "/lib/armeabi/librhodes.so"])
+    # Workaround: manually add files starting with '_' because aapt silently ignore such files when creating package
+    rm_rf File.join($tmpdir, "assets")
+    cp_r assets, $tmpdir
+    Dir.glob(File.join($tmpdir, "assets/**/*")).each do |f|
+      next unless File.basename(f) =~ /^_/
+      relpath = Pathname.new(f).relative_path_from(Pathname.new($tmpdir)).to_s
+      puts "Add #{relpath} to #{resourcepkg}..."
+      args = ["add", resourcepkg, relpath]
+      puts Jake.run($aapt, args, $tmpdir)
+      unless $? == 0
+        puts "Error running AAPT (2)"
+        exit 1
+      end
+    end
+
+    # Add native librhodes.so
+    rm_rf File.join($tmpdir, "lib")
+    mkdir_p File.join($tmpdir, "lib/armeabi")
+    cp_r File.join($bindir, "libs", $confdir, "librhodes.so"), File.join($tmpdir, "lib/armeabi")
+    cc_run($stripbin, [$tmpdir + "/lib/armeabi/librhodes.so"])
     args = ["add", resourcepkg, "lib/armeabi/librhodes.so"]
-    puts Jake.run($aapt, args, $bindir)
+    puts Jake.run($aapt, args, $tmpdir)
     err = $?
-    rm_rf $bindir + "/lib"
+    rm_rf $tmpdir + "/lib"
     unless err == 0
-      puts "Error running AAPT"
+      puts "Error running AAPT (3)"
       exit 1
     end
   end

data/platform/bb/RubyVM/RubyVM.jdp

@@ -61,6 +61,7 @@ ExcludeFromBuildAll=0
 ..\..\shared\rubyJVM\src\com\rho\RhoThread.java
 ..\..\shared\rubyJVM\src\com\rho\Sprintf.java
 ..\..\shared\rubyJVM\src\com\rho\StringScanner.java
+..\..\shared\rubyJVM\src\com\rho\Capabilities.java
 ..\..\shared\rubyJVM\src\com\rho\sync\ClientRegister.java
 ..\..\shared\rubyJVM\src\com\rho\sync\ISyncStatusListener.java
 ..\..\shared\rubyJVM\src\com\rho\sync\JSONArrayIterator.java

data/platform/bb/build/RubyVM_build.files

@@ -37,6 +37,7 @@ platform\shared\rubyJVM\src\com\rho\RhoProfiler.java
 platform\shared\rubyJVM\src\com\rho\RhoRuby.java
 platform\shared\rubyJVM\src\com\rho\RhoThread.java
 platform\shared\rubyJVM\src\com\rho\StringScanner.java
+platform\shared\rubyJVM\src\com\rho\Capabilities.java
 platform\shared\rubyJVM\src\com\rho\sync\JSONArrayIterator.java
 platform\shared\rubyJVM\src\com\rho\sync\JSONStructIterator.java
 platform\shared\rubyJVM\src\com\rho\sync\JSONEntry.java

data/platform/bb/build/bb.rake

@@ -128,7 +128,8 @@ namespace "config" do
     $preverified = $app_path + "/preverified"
     $targetdir = $bindir + "/target/" + $bbver
     $rubyVMdir = $app_path + "/RubyVM"
-    $excludelib = ['**/singleton.rb','**/rational.rb','**/rhoframework.rb','**/dateOrig.rb']
+    $excludelib = ['**/rational.rb','**/rhoframework.rb','**/dateOrig.rb']
+    $excludeextlib = ['rexml/parsers/baseparser.rb', 'rexml/set.rb']
     $compileERB = $app_path + "/build/compileERB.rb"
     $tmpdir =  $bindir +"/tmp"
 
@@ -223,9 +224,50 @@ namespace "build" do
       sdcardpath = $config["env"]["paths"][$bbver]["jde"] +"/simulator/sdcard/Rho/rhodes/apps/rhoconfig.txt"
       cp $app_path+"/rhoconfig.txt", sdcardpath if File.exists? sdcardpath
     end
+
+    task :gensources => "config:bb" do
+      caps = $app_config["capabilities"]
+      caps = [] if caps.nil?
+      caps = [] unless caps.is_a? Array
+
+      has_push = caps.index("push") != nil
+
+      $service_enabled = has_push
+
+      puts "Modify MANIFEST.MF"
+      $stdout.flush
+      mf = File.join($builddir, "MANIFEST.MF")
+      tmpmf = File.join($builddir, "MANIFEST.MF.new")
+      File.open(tmpmf, "w") do |nf|
+        File.open(mf, "r") do |f|
+          while line = f.gets
+            if line =~ /^\s*RIM-MIDlet-Flags-1\s*:/
+              nf.puts "RIM-MIDlet-Flags-1: 1" if has_push
+            else
+              nf.puts line
+            end
+          end
+        end
+      end
+      rm mf
+      cp tmpmf, mf
+      rm tmpmf
+
+      puts "Modify Capabilities.java"
+      $stdout.flush
+      capabilities = File.join($builddir, "..", "..", "..", "platform", "shared", "rubyJVM", "src", "com", "rho", "Capabilities.java")
+      File.open(capabilities, 'w') do |f|
+        f.puts "package com.rho;"
+        f.puts ""
+        f.puts "public class Capabilities {"
+        f.puts "  public static final boolean ENABLE_PUSH = #{has_push.to_s};"
+        f.puts "  public static final boolean RUNAS_SERVICE = #{has_push.to_s};"
+        f.puts "}"
+      end
+    end
     
 #    desc "Build RubyVM"
-    task :rubyvm => ["config:bb"] do
+    task :rubyvm => [:gensources, "config:bb"] do
       javac = $config["env"]["paths"]["java"] + "/javac.exe"
       jdehome = $config["env"]["paths"][$bbver]["jde"]