rhodes 3.2.3 → 3.3.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java

@@ -62,7 +62,11 @@ public class ContactAccessorOld implements ContactAccessor {
 	public ContactAccessorOld() {
 		cr = RhodesService.getInstance().getContentResolver();
 	}
-	
+
+    private static String getConditionString(Map<String,Object> conditionsMap) {
+        return null;
+    }
+
 	private void fillPhones(String id, Contact contact) {
 		Cursor cursor = cr.query(Contacts.Phones.CONTENT_URI,
 				new String[] {Phones.NUMBER, Phones.TYPE},
@@ -94,7 +98,7 @@ public class ContactAccessorOld implements ContactAccessor {
 	}
 
 	@Override
-	public int getCount(int offset, int max_results) {
+	public int getCount(int offset, int max_results, Map<String, Object> conditions) {
 		StringBuilder sortMode = new StringBuilder();
 		if (max_results > 0 || offset > 0) {
 			sortMode.append(People._ID).append(" ASC");
@@ -114,7 +118,7 @@ public class ContactAccessorOld implements ContactAccessor {
 	}
 
 	@Override
-	public Map<String, Contact> getContacts(int offset, int max_results, List<String> select) throws Exception {
+	public Map<String, Contact> getContacts(int offset, int max_results, List<String> select, Map<String, Object> conditions) throws Exception {
 		Map<String, Contact> contacts = new HashMap<String, Contact>();
 		
 		Cursor cursor = cr.query(People.CONTENT_URI, null, null, null, null);
@@ -136,10 +140,11 @@ public class ContactAccessorOld implements ContactAccessor {
 	
 				//contact.setField(PB_COMPANY_NAME, cursor.getString(cursor.getColumnIndex(People.COMPANY)));
 	
-				contact.setField(Phonebook.PB_FIRST_NAME, "");
-				contact.setField(Phonebook.PB_LAST_NAME, "");
+				//contact.setField(Phonebook.PB_FIRST_NAME, "");
+				//contact.setField(Phonebook.PB_LAST_NAME, "");
 				String name = cursor.getString(cursor.getColumnIndex(People.NAME));
 				if (name != null) {
+				    contact.setField(Phonebook.PB_DISPLAY_NAME, name);
 					String[] names = name.split(" ");
 	
 					if (names.length == 1) {
@@ -220,7 +225,7 @@ public class ContactAccessorOld implements ContactAccessor {
 	
 	@Override
 	public Contact getContact(String id) throws Exception {
-		Map<String, Contact> allContacts = getContacts(0, -1, null);
+		Map<String, Contact> allContacts = getContacts(0, -1, null, null);
 		/*TODO: implement old API getContact by id. */
 		return allContacts.get(id);
 	}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java

@@ -96,11 +96,11 @@ public class Phonebook {
 		}
 	}
 	
-	public int queryContactCount(int offset, int limit) {
+	public int queryContactCount(int offset, int limit, Map<String,Object> conditions) {
 		int res = 0;
 		if (checkState()) {
 			try {
-				res = accessor.getCount(offset, limit);
+				res = accessor.getCount(offset, limit, conditions);
 			} catch (Exception e) {
 				Logger.E(TAG, e);
 			}
@@ -119,15 +119,15 @@ public class Phonebook {
 			PB_BUSINESS_NUMBER,
 			PB_EMAIL_ADDRESS,
 			PB_COMPANY_NAME };
-		queryContacts(0, -1, Arrays.asList(allColumns));
+		queryContacts(0, -1, Arrays.asList(allColumns), null);
 	}
 
-	public void queryContacts(int offset, int max_results, List<String> select) {
+	public void queryContacts(int offset, int max_results, List<String> select, Map<String,Object> conditions) {
 		if (!checkState())
 			return;
 		try {
 			Logger.I(TAG, "queryContacts()");
-			contactList = accessor.getContacts(offset, max_results, select);
+			contactList = accessor.getContacts(offset, max_results, select, conditions);
 		}
 		catch (Exception e) {
 			Logger.E(TAG, e);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java

@@ -28,6 +28,7 @@ package com.rhomobile.rhodes.webview;
 
 import com.rhomobile.rhodes.RhodesActivity;
 
+import android.app.Activity;
 import android.view.Window;
 import android.webkit.JsResult;
 import android.webkit.WebChromeClient;
@@ -35,7 +36,7 @@ import android.webkit.WebView;
 
 public class ChromeClientOld extends WebChromeClient {
 	
-	private RhodesActivity mRhodesActivity;
+	private Activity mRhodesActivity;
 	
 	public ChromeClientOld(RhodesActivity rhodesActivity) {
 		mRhodesActivity = rhodesActivity;

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java

@@ -0,0 +1,125 @@
+package com.rhomobile.rhodes.webview;
+
+import java.lang.reflect.Constructor;
+
+import com.rhomobile.rhodes.RhodesActivity;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Build;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.webkit.WebViewClient;
+
+public class GoogleWebView implements WebView {
+
+    private static WebChromeClient mChromeClient;
+    private static WebViewClient mWebViewClient;
+    private static RhoWebSettings mWebSettings;
+    private static Boolean mInitialized = false;
+
+    private android.webkit.WebView mWebView; 
+
+    public GoogleWebView(Activity activity) {
+        synchronized(mInitialized) {
+            if (!mInitialized) {
+                initWebStuff(activity);
+            }
+        }
+        mWebView = new android.webkit.WebView(activity);
+        mWebSettings.setWebSettings(mWebView);
+        mWebView.setWebChromeClient(mChromeClient);
+        mWebView.setWebViewClient(mWebViewClient);
+        mWebView.clearCache(true);
+    }
+
+    private static void initWebStuff(Activity activity) {
+        String ccName;
+        String wsName;
+        int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+        if (sdkVersion < Build.VERSION_CODES.ECLAIR_MR1) {
+            ccName = "ChromeClientOld";
+            wsName = "RhoWebSettingsOld";
+        }
+        else {
+            ccName = "ChromeClientNew";
+            wsName = "RhoWebSettingsNew";
+        }
+        
+        try {
+            String pkgname = ChromeClientOld.class.getPackage().getName();
+            String fullName = pkgname + "." + ccName;
+            Class<? extends WebChromeClient> ccClass =
+                Class.forName(fullName).asSubclass(WebChromeClient.class);
+            
+            Constructor<? extends WebChromeClient> ctor = ccClass.getConstructor(RhodesActivity.class);
+            mChromeClient = ctor.newInstance(activity);
+            
+            pkgname = RhoWebSettings.class.getPackage().getName();
+            fullName = pkgname + "." + wsName;
+            Class<? extends RhoWebSettings> wsClass =
+                Class.forName(fullName).asSubclass(RhoWebSettings.class);
+            mWebSettings = wsClass.newInstance();
+            
+            mWebViewClient = new RhoWebViewClient();
+            
+            mInitialized = true;
+        }
+        catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @Override
+    public View getView() {
+        return mWebView;
+    }
+
+    @Override
+    public boolean canGoBack() {
+        return mWebView.canGoBack();
+    }
+
+    @Override
+    public void goBack() {
+        mWebView.goBack();
+    }
+
+    @Override
+    public void goForward() {
+        mWebView.goForward();
+    }
+
+    @Override
+    public void reload() {
+        mWebView.reload();
+    }
+
+    @Override
+    public void clear() {
+        mWebView.clearView();
+        mWebView.clearCache(true);
+        mWebView.invalidate();
+        mWebView.loadData("", "", "");
+    }
+
+    @Override
+    public String getUrl() {
+        return mWebView.getUrl();
+    }
+
+    @Override
+    public void loadUrl(String url) {
+        mWebView.loadUrl(url);
+    }
+
+    @Override
+    public void loadData(String data, String mime, String encoding) {
+        mWebView.loadData(data, mime, encoding);
+    }
+
+    @Override
+    public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl) {
+        mWebView.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
+    }
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java

@@ -37,11 +37,10 @@ public class RhoWebSettingsOld implements RhoWebSettings {
 		webSettings.setSaveFormData(false);
 		webSettings.setJavaScriptEnabled(true);
 		webSettings.setJavaScriptCanOpenWindowsAutomatically(false);
-		webSettings.setSupportZoom(false);
-		//webSettings.setCacheMode(WebSettings.LOAD_NO_CACHE);
+		webSettings.setSupportZoom(true);
+		webSettings.setBuiltInZoomControls(true);
 		webSettings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
 		webSettings.setSupportMultipleWindows(false);
-		// webSettings.setLoadsImagesAutomatically(true);
 
 		w.setVerticalScrollBarEnabled(true);
 		w.setHorizontalScrollBarEnabled(true);

data/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/WebView.java

@@ -0,0 +1,16 @@
+package com.rhomobile.rhodes.webview;
+
+import android.view.View;
+
+public interface WebView {
+    View getView();
+    boolean canGoBack();
+    void goBack();
+    void goForward();
+    void reload();
+    void clear();
+    String getUrl();
+    void loadUrl(String url);
+    void loadData(String data, String mime, String encoding);
+    void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl);
+}

data/platform/android/build/RhodesSRC_build.files

@@ -95,3 +95,17 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettings.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebSettingsOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/RhoWebViewClient.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/webview/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality01.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality02.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality03.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality04.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality05.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality06.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality07.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality08.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality09.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionality10.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/osfunctionality/AndroidFunctionalityManager.java

data/platform/android/build/android.rake

@@ -80,7 +80,8 @@ ANDROID_PERMISSIONS = {
   'bluetooth' => ['BLUETOOTH_ADMIN', 'BLUETOOTH'],
   'calendar' => ['READ_CALENDAR', 'WRITE_CALENDAR'],
   'sdcard' => 'WRITE_EXTERNAL_STORAGE',
-  'push' => proc do |manifest| add_push(manifest) end
+  'push' => proc do |manifest| add_push(manifest) end,
+  'webkit_browser' => nil
 }
 
 ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
@@ -345,6 +346,43 @@ namespace "config" do
   
     Rake::Task["config:common"].invoke
 
+    $java = $config["env"]["paths"]["java"]
+
+    $androidsdkpath = $config["env"]["paths"]["android"]
+    unless File.exists? $androidsdkpath
+      puts "Missing or invalid 'android' section in rhobuild.yml: '#{$androidsdkpath}'"
+      exit 1
+    end
+
+    $androidndkpath = $config["env"]["paths"]["android-ndk"]
+    unless File.exists? $androidndkpath
+      puts "Missing or invalid 'android-ndk' section in rhobuild.yml: '#{$androidndkpath}'"
+      exit 1
+    end
+
+    errfmt = "WARNING!!! Path to Android %s contain spaces! It will not work because of the Google toolchain restrictions. Move it to another location and reconfigure rhodes."
+    if $androidndkpath =~ /\s/
+      puts(errfmt % "NDK")
+      exit 1
+    end
+
+    $min_sdk_level = $app_config["android"]["minSDK"] unless $app_config["android"].nil?
+    $min_sdk_level = $config["android"]["minSDK"] if $min_sdk_level.nil? and not $config["android"].nil?
+    $min_sdk_level = $min_sdk_level.to_i unless $min_sdk_level.nil?
+    $min_sdk_level = ANDROID_SDK_LEVEL if $min_sdk_level.nil?
+    
+    $max_sdk_level = $app_config["android"]["maxSDK"] unless $app_config["android"].nil?
+
+    $androidplatform = AndroidTools.fill_api_levels $androidsdkpath
+    if $androidplatform == nil
+        puts "No Android platform found at SDK path: '#{$androidsdkpath}'"
+        exit 1
+    end
+
+    android_api_levels = AndroidTools.get_installed_api_levels
+    android_api_levels.sort!
+    $found_api_level = android_api_levels.last
+
     $ext_android_rhodes_activity_listener = []
     $ext_android_manifest_changes= []
     $ext_android_resources_addons = []
@@ -369,20 +407,13 @@ namespace "config" do
 
     puts "Use Google addon API: #{$use_google_addon_api}" if USE_TRACES
 
-    $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
-    $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
-
     $uri_scheme = $app_config["android"]["URIScheme"] unless $app_config["android"].nil?
     $uri_scheme = "http" if $uri_scheme.nil?
 
     $uri_host = $app_config["android"]["URIHost"] unless $app_config["android"].nil?
 
-    $min_sdk_level = $app_config["android"]["minSDK"] unless $app_config["android"].nil?
-    $min_sdk_level = $config["android"]["minSDK"] if $min_sdk_level.nil? and not $config["android"].nil?
-    $min_sdk_level = $min_sdk_level.to_i unless $min_sdk_level.nil?
-    $min_sdk_level = ANDROID_SDK_LEVEL if $min_sdk_level.nil?
-    
-    $max_sdk_level = $app_config["android"]["maxSDK"] unless $app_config["android"].nil?
+    $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
+    $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
 
     # Here is switch between release/debug configuration used for
     # building native libraries
@@ -392,29 +423,6 @@ namespace "config" do
       $build_release = !$app_config["debug"].to_i
     end
 
-    $androidsdkpath = $config["env"]["paths"]["android"]
-    unless File.exists? $androidsdkpath
-      puts "Missing or invalid 'android' section in rhobuild.yml: '#{$androidsdkpath}'"
-      exit 1
-    end
-
-    $androidndkpath = $config["env"]["paths"]["android-ndk"]
-    unless File.exists? $androidndkpath
-      puts "Missing or invalid 'android-ndk' section in rhobuild.yml: '#{$androidndkpath}'"
-      exit 1
-    end
-
-    errfmt = "WARNING!!! Path to Android %s contain spaces! It will not work because of the Google toolchain restrictions. Move it to another location and reconfigure rhodes."
-    #if $androidsdkpath =~ /\s/
-    #  puts(errfmt % "SDK")
-    #  exit 1
-    #end
-    if $androidndkpath =~ /\s/
-      puts(errfmt % "NDK")
-      exit 1
-    end
-
-    $java = $config["env"]["paths"]["java"]
     $androidpath = Jake.get_absolute $config["build"]["androidpath"]
     $bindir = File.join($app_path, "bin")
     $rhobindir = File.join($androidpath, "bin")
@@ -478,40 +486,20 @@ namespace "config" do
     end
 
     puts "+++ Looking for platform..." if USE_TRACES
-    napilevel = $min_sdk_level
+#    napilevel = $min_sdk_level
     
-    android_api_levels = Array.new
-    
-    Dir.glob(File.join($androidsdkpath, "platforms", "*")).each do |platform|
-      props = File.join(platform, "source.properties")
-      unless File.file? props
-        puts "+++ WARNING! No source.properties found in #{platform}"
-        next
-      end
-
-      apilevel = -1
-      marketversion = nil
-      File.open(props, "r") do |f|
-        while line = f.gets
-          apilevel = $1.to_i if line =~ /^\s*AndroidVersion\.ApiLevel\s*=\s*([0-9]+)\s*$/
-          marketversion = $1 if line =~ /^\s*Platform\.Version\s*=\s*([^\s]*)\s*$/
+    $emuversion = AndroidTools.get_market_version($min_sdk_level) if $emuversion.nil?
+    if $emuversion.nil?
+      android_api_levels.each do |v|
+        puts "Check api level for emulator '#{v}'"
+        if v >= $min_sdk_level
+          $emuversion = AndroidTools.get_market_version(v)
+          puts "emulator version will used: '#{$emuversion}'"
+          break
         end
       end
-
-      puts "+++ API LEVEL of #{platform}: #{apilevel}" if USE_TRACES
-      android_api_levels.push apilevel
-
-      if apilevel >= napilevel
-        napilevel = apilevel
-        $androidplatform = File.basename(platform)
-        $found_api_level = apilevel
-      end
     end
-
-    android_api_levels.sort!
-
-    $emuversion = get_market_version($min_sdk_level) if $emuversion.nil?
-    requested_api_level = get_api_level($emuversion)
+    requested_api_level = AndroidTools.get_api_level($emuversion)
 
     if USE_TRACES
       puts "Found API levels:"
@@ -592,12 +580,6 @@ namespace "config" do
     $storealias = $config["android"]["production"]["alias"] if $storealias.nil? and !$config["android"].nil? and !$config["android"]["production"].nil?
     $storealias = "rhomobile.keystore" if $storealias.nil?
 
-#    $app_config["capabilities"] = [] if $app_config["capabilities"].nil?
-#    $app_config["capabilities"] = [] unless $app_config["capabilities"].is_a? Array
-#    if $app_config["android"] and $app_config["android"]["capabilities"]
-#      $app_config["capabilities"] += $app_config["android"]["capabilities"]
-#      $app_config["android"]["capabilities"] = nil
-#    end
     $app_config["capabilities"] += ANDROID_CAPS_ALWAYS_ENABLED
     $app_config["capabilities"].map! { |cap| cap.is_a?(String) ? cap : nil }.delete_if { |cap| cap.nil? }
     $use_google_addon_api = true unless $app_config["capabilities"].index("push").nil?
@@ -676,6 +658,11 @@ namespace "config" do
       end
     end
 
+    if $min_sdk_level > $found_api_level
+        puts "Latest installed Android platform '#{$androidplatform}' does not meet minSdk '#{$min_sdk_level}' requirement"
+        exit 1
+    end
+
     $emuversion = $emuversion.to_s
     $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
     $avdname += "ext" if $use_google_addon_api
@@ -708,13 +695,6 @@ namespace "config" do
 
     $extensionsdir = $bindir + "/libs/" + $confdir + "/" + $ndkabi + "/" + $ndkgccver + "/extensions"
 
-    #$app_config["extensions"] = [] if $app_config["extensions"].nil?
-    #$app_config["extensions"] = [] unless $app_config["extensions"].is_a? Array
-    #if $app_config["android"] and $app_config["android"]["extensions"]
-    #  $app_config["extensions"] += $app_config["android"]["extensions"]
-    #  $app_config["android"]["extensions"] = nil
-    #end
-
     $push_sender = nil
     $push_sender = $config["android"]["push"]["sender"] if !$config["android"].nil? and !$config["android"]["push"].nil?
     $push_sender = $app_config["android"]["push"]["sender"] if !$app_config["android"].nil? and !$app_config["android"]["push"].nil?
@@ -723,9 +703,7 @@ namespace "config" do
     $push_notifications = nil
     $push_notifications = $app_config["android"]["push"]["notifications"] if !$app_config["android"].nil? and !$app_config["android"]["push"].nil?
     $push_notifications = "none" if $push_notifications.nil?
-    $push_notifications = $push_notifications
-
-    
+    $push_notifications = $push_notifications    
 
     mkdir_p $bindir if not File.exists? $bindir
     mkdir_p $rhobindir if not File.exists? $rhobindir
@@ -774,25 +752,7 @@ namespace "build" do
 
       File.open(File.join(assets, "name"), "w") { |f| f.write($appname) }
       
-      psize = assets.size + 1
-
-      File.open(File.join(assets, 'rho.dat'), 'w') do |dat|
-        Dir.glob(File.join(assets, '**/*')).sort.each do |f|
-          relpath = f[psize..-1]
-
-          if File.directory?(f)
-            type = 'dir'
-          elsif File.file?(f)
-            type = 'file'
-          else
-            next
-          end
-          size = File.stat(f).size
-          tm = File.stat(f).mtime.to_i
-
-          dat.puts "#{relpath}\t#{type}\t#{size.to_s}\t#{tm.to_s}"
-        end
-      end
+      Jake.build_file_map(assets, "rho.dat")
     end
 
     task :extensions => :genconfig do
@@ -814,59 +774,69 @@ namespace "build" do
       mkdir_p $extensionsdir unless File.directory? $extensionsdir
 
       $app_config["extensions"].each do |ext|
+        puts "#{ext} is processing..."
         $app_config["extpaths"].each do |p|
           extpath = File.join(p, ext, 'ext')
 
-          extyml = File.join(p, ext,"ext.yml")
-          if File.file? extyml
-            extconf = Jake.config(File.open(extyml))
+          puts "Checking extpath: #{extpath}"
 
-            android_listener = extconf["android_rhodes_activity_listener"]
-            $ext_android_rhodes_activity_listener << android_listener unless android_listener.nil?
+          if File.exists? extpath and File.directory? extpath
+            puts "#{extpath} is building..."
+            extyml = File.join(p, ext,"ext.yml")
+            if File.file? extyml
+                puts "#{extyml} is processing..."
+                extconf = Jake.config(File.open(extyml))
 
-            android_manifest_changes = extconf["android_manifest_changes"]
-            if android_manifest_changes != nil
-              android_manifest_changes = File.join(p, ext, android_manifest_changes)
-              $ext_android_manifest_changes << android_manifest_changes
-            end
+                android_listener = extconf["android_rhodes_activity_listener"]
+                $ext_android_rhodes_activity_listener << android_listener unless android_listener.nil?
 
-            android_resources_addons = extconf["android_resources_addons"]
-            if android_resources_addons != nil
-              android_resources_addons = File.join(p, ext, android_resources_addons)
-              $ext_android_resources_addons << android_resources_addons
-            end
+                android_manifest_changes = extconf["android_manifest_changes"]
+                if android_manifest_changes != nil
+                  android_manifest_changes = File.join(p, ext, android_manifest_changes)
+                  $ext_android_manifest_changes << android_manifest_changes
+                end
 
-            android_additional_sources_list = extconf["android_additional_sources_list"]
-            if android_additional_sources_list != nil
-              android_additional_sources_list = File.join(p, ext, android_additional_sources_list)
+                android_resources_addons = extconf["android_resources_addons"]
+                if android_resources_addons != nil
+                  android_resources_addons = File.join(p, ext, android_resources_addons)
+                  $ext_android_resources_addons << android_resources_addons
+                end
 
-              File.open(android_additional_sources_list, "r") do |f|
-                  while line = f.gets
-                    $ext_android_additional_sources_list << File.join(p, ext, line)
-                  end
-              end
+                android_additional_sources_list = extconf["android_additional_sources_list"]
+                if android_additional_sources_list != nil
+                  android_additional_sources_list = File.join(p, ext, android_additional_sources_list)
 
+                  File.open(android_additional_sources_list, "r") do |f|
+                    while line = f.gets
+                      $ext_android_additional_sources_list << File.join(p, ext, line)
+                    end
+                  end
+                end
+                puts  "#{extyml} is processed"
             end
-          end
 
-          if RUBY_PLATFORM =~ /(win|w)32$/
-            next unless File.exists? File.join(extpath, 'build.bat')
-          else
-            next unless File.executable? File.join(extpath, 'build')
-          end
+            if RUBY_PLATFORM =~ /(win|w)32$/
+                next unless File.exists? File.join(extpath, 'build.bat')
+            else
+                next unless File.executable? File.join(extpath, 'build')
+            end
 
-          ENV['TEMP_FILES_DIR'] = File.join(ENV["TARGET_TEMP_DIR"], ext)
+            ENV['TEMP_FILES_DIR'] = File.join(ENV["TARGET_TEMP_DIR"], ext)
 
-          if RUBY_PLATFORM =~ /(win|w)32$/
-            puts Jake.run('build.bat', [], extpath)
-          else
-            puts Jake.run('./build', [], extpath)
-          end
-          exit 1 unless $?.success?
-        end
-      end
+            if RUBY_PLATFORM =~ /(win|w)32$/
+                Jake.run('build.bat', [], extpath)
+            else
+                Jake.run('./build', [], extpath)
+            end
+            exit 1 unless $?.success?
 
-    end
+            puts "#{extpath} is built"
+            # to prevent to build 2 extensions with same name
+            break
+          end # exists?
+        end # $app_config["extpaths"].each
+      end # $app_config["extensions"].each
+    end #task :extensions
 
     task :libsqlite => "config:android" do
       srcdir = File.join($shareddir, "sqlite")
@@ -1079,6 +1049,8 @@ namespace "build" do
         regenerate = true if caps_already_enabled[k].nil? or caps_enabled[k] != caps_already_enabled[k]
       end
 
+      puts caps_enabled.inspect
+
       if regenerate
         puts "Need to regenerate genconfig.h"
         $stdout.flush
@@ -1128,7 +1100,9 @@ namespace "build" do
         f.puts "package #{JAVA_PACKAGE_NAME};"
         f.puts "public class Capabilities {"
         ANDROID_PERMISSIONS.keys.sort.each do |k|
-          f.puts "  public static boolean #{k.upcase}_ENABLED = true;"
+          val = 'false'
+          val = 'true' if caps_enabled[k]
+          f.puts "  public static final boolean #{k.upcase}_ENABLED = #{val};"
         end
         f.puts "}"
       end
@@ -1752,30 +1726,30 @@ namespace "run" do
         end
 
         puts "start read log"
-        
+
+        io = File.new(log_name, 'r:UTF-8')
         end_spec = false
         while !end_spec do
-            io = File.new(log_name, "r")
         
             io.each do |line|
                 #puts line
                 
-                end_spec = !Jake.process_spec_output(line)
+                end_spec = !Jake.process_spec_output(line) if line.valid_encoding?
                 break if end_spec
             end
-            io.close
             
             break unless AndroidTools.application_running($device_flag, $app_package_name)
             sleep(5) unless end_spec
         end
+        io.close
 
         Jake.process_spec_results(start)        
         
         # stop app
-        do_uninstall($device_flag)
         if $device_flag == '-e'
             AndroidTools.kill_adb_and_emulator
         else
+            do_uninstall($device_flag)
             AndroidTools.kill_adb
         end
 
@@ -1790,13 +1764,19 @@ namespace "run" do
       task :device do
         $device_flag = "-d"
         Jake.run_spec_app('android','phone_spec')
-        exit $failed.to_i unless $dont_exit_on_failure
+        unless $dont_exit_on_failure
+          exit 1 if $total.to_i==0
+          exit $failed.to_i 
+        end
       end
 
       task :emulator do
         $device_flag = "-e"
         Jake.run_spec_app('android','phone_spec')
-        exit $failed.to_i unless $dont_exit_on_failure
+        unless $dont_exit_on_failure
+          exit 1 if $total.to_i==0
+          exit $failed.to_i
+        end
       end
     end
 
@@ -1804,13 +1784,19 @@ namespace "run" do
       task :device do
         $device_flag = "-d"
         Jake.run_spec_app('android','framework_spec')
-        exit $failed.to_i unless $dont_exit_on_failure
+        unless $dont_exit_on_failure
+          exit 1 if $total.to_i==0
+          exit $failed.to_i 
+        end
       end
 
       task :emulator do
         $device_flag = "-e"
         Jake.run_spec_app('android','framework_spec')
-        exit $failed.to_i unless $dont_exit_on_failure
+        unless $dont_exit_on_failure
+          exit 1 if $total.to_i==0
+          exit $failed.to_i 
+        end
       end
     end
 
@@ -1831,6 +1817,7 @@ namespace "run" do
       puts "Agg Total: #{$total}"
       puts "Agg Passed: #{$passed}"
       puts "Agg Failed: #{$failed}"
+      exit 1 if $total.to_i==0
       exit $failed.to_i
     end
 
@@ -1850,6 +1837,17 @@ namespace "run" do
         Rake::Task["run:rhosimulator"].invoke            
     end
 
+    task :rhosimulator_debug => ["config:set_android_platform","config:common"] do    
+    
+        $emuversion = $app_config["android"]["version"] unless $app_config["android"].nil?
+        $emuversion = $config["android"]["version"] if $emuversion.nil? and !$config["android"].nil?
+    
+        $rhosim_config = "platform='android'\r\n"
+        $rhosim_config += "os_version='#{$emuversion}'\r\n" if $emuversion
+        
+        Rake::Task["run:rhosimulator_debug"].invoke            
+    end
+    
     task :get_info => "config:android" do
         $androidtargets.each do |level|
             puts "#{get_market_version(level[0])}"
@@ -1926,6 +1924,10 @@ namespace "run" do
         cmd << " -no-window" if options[:hidden]
         cmd << " -avd #{$avdname}"
         Thread.new { system(cmd) }
+
+        puts "Waiting for emulator..."
+        puts Jake.run($adb, ['wait-for-device'] )
+
         puts "Waiting up to 180 seconds for emulator..."
         startedWaiting = Time.now
         adbRestarts = 1