rhodes 2.3.2 → 2.4.0.beta.1

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

@@ -21,7 +21,6 @@ import com.rhomobile.rhodes.BaseActivity;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.mapview.MapTouch.Touch;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 public class MapView extends BaseActivity implements MapTouch {

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

@@ -24,25 +24,12 @@ import android.provider.ContactsContract.RawContacts;
 public class ContactAccessorNew implements ContactAccessor {
 	
 	private static final String TAG = "ContactsAccessorNew";
-	private static final boolean logging_enable = false;
-	
-	/*
-	private static final String PB_ID = Phonebook.PB_ID;
-	private static final String PB_FIRST_NAME = Phonebook.PB_FIRST_NAME;
-	private static final String PB_LAST_NAME = Phonebook.PB_LAST_NAME;
-	private static final String PB_MOBILE_NUMBER = Phonebook.PB_MOBILE_NUMBER;
-	private static final String PB_HOME_NUMBER = Phonebook.PB_HOME_NUMBER;
-	private static final String PB_BUSINESS_NUMBER = Phonebook.PB_BUSINESS_NUMBER;
-	private static final String PB_EMAIL_ADDRESS = Phonebook.PB_EMAIL_ADDRESS;
-	private static final String PB_COMPANY_NAME = Phonebook.PB_COMPANY_NAME;
-	*/
+	private static final boolean DEBUG = false;
 	
 	private ContentResolver cr;
 	private String accName;
 	private String accType;
 	
-	
-	
 	public ContactAccessorNew() throws Exception {
 		Context ctx = RhodesService.getContext();
 		
@@ -61,36 +48,54 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	public void fillName(String id, Contact contact) {
-		if (logging_enable) Logger.I(TAG, "fillName("+id+")");
+		if (DEBUG)
+			Logger.D(TAG, "fillName("+id+")");
+		
 		contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, "");
 		contact.setFieldInner(Phonebook.PB_I_LAST_NAME, "");
 		
 		Cursor cursor = cr.query(Data.CONTENT_URI,
-				new String[] {StructuredName.DISPLAY_NAME},
+				new String[] {StructuredName.GIVEN_NAME, StructuredName.FAMILY_NAME, StructuredName.DISPLAY_NAME},
 				Data.RAW_CONTACT_ID + "=? AND " + Data.MIMETYPE + "=?",
 				new String[] {id, StructuredName.CONTENT_ITEM_TYPE},
 				null);
 		try {
 			if (!cursor.moveToFirst()) {
-				if (logging_enable) Logger.I(TAG, "fillName() not found record with ID");
+				if (DEBUG)
+					Logger.D(TAG, "fillName() not found record with ID");
 				return;
 			}
 			
-			String name = cursor.getString(cursor.getColumnIndex(StructuredName.DISPLAY_NAME));
-			if (name != null) {
-				String[] names = name.split(" ");
-				if (logging_enable) Logger.I(TAG, "fillName() names = "+name);
-				if (names.length == 1) {
-					contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, name);
-				}
-				else if (names.length > 1) {
-					contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, names[0]);
-					contact.setFieldInner(Phonebook.PB_I_LAST_NAME, names[1]);
-				}
+			String firstName = cursor.getString(cursor.getColumnIndex(StructuredName.GIVEN_NAME));
+			String lastName = cursor.getString(cursor.getColumnIndex(StructuredName.FAMILY_NAME));
+			if (firstName != null || lastName != null) {
+				if (DEBUG)
+					Logger.D(TAG, "fillName() firstName=" + firstName + ", lastName=" + lastName);
+				
+				if (firstName != null)
+					contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, firstName);
+				if (lastName != null)
+					contact.setFieldInner(Phonebook.PB_I_LAST_NAME, lastName);
 			}
 			else {
-				if (logging_enable) Logger.I(TAG, "fillName() name == NULL");
+				String displayName = cursor.getString(cursor.getColumnIndex(StructuredName.DISPLAY_NAME));
+				if (DEBUG)
+					Logger.D(TAG, "fillName() displayName=" + displayName);
 				
+				if (displayName != null) {
+					String[] names = displayName.split(" ");
+					if (names.length == 1) {
+						contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, names[0]);
+					}
+					else if (names.length > 1) {
+						contact.setFieldInner(Phonebook.PB_I_FIRST_NAME, names[0]);
+						contact.setFieldInner(Phonebook.PB_I_LAST_NAME, names[1]);
+					}
+				}
+				else {
+					if (DEBUG)
+						Logger.D(TAG, "fillName() name is null");
+				}
 			}
 		}
 		finally {
@@ -198,7 +203,8 @@ public class ContactAccessorNew implements ContactAccessor {
 	}
 	
 	public Contact getContactByID(String id) {
-		if (logging_enable) Logger.I(TAG, "getContactByID("+id+")");
+		if (DEBUG)
+			Logger.D(TAG, "getContactByID("+id+")");
 		
 		Contact contact = null; 
 		
@@ -210,7 +216,8 @@ public class ContactAccessorNew implements ContactAccessor {
 		
 		try {
 			if (!cursor.moveToFirst()) {
-				if (logging_enable) Logger.I(TAG, "getContactByID() not found");
+				if (DEBUG)
+					Logger.D(TAG, "getContactByID() not found");
 				return null;
 			}
 			contact = new Contact();
@@ -222,7 +229,8 @@ public class ContactAccessorNew implements ContactAccessor {
 		finally {
 			cursor.close();
 		}
-		if (logging_enable) Logger.I(TAG, "getContactByID() found");
+		if (DEBUG)
+			Logger.D(TAG, "getContactByID() found");
 		return contact;
 	}
 	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java

@@ -47,6 +47,7 @@ class SignatureView extends SurfaceView implements SurfaceHolder.Callback {
 
 	public static String mStateID = "SignatureViewState";
 
+	@SuppressWarnings("serial")
 	public class SignatureViewState extends Object implements Serializable {
 		public Vector<PointSequence> mSequences;
 

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

@@ -1,10 +1,13 @@
 package com.rhomobile.rhodes.uri;
 
+import java.net.URISyntaxException;
+
 import com.rhomobile.rhodes.Logger;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.webkit.URLUtil;
 
 public class ExternalHttpHandler implements UriHandler {
 	
@@ -15,10 +18,10 @@ public class ExternalHttpHandler implements UriHandler {
 		ctx = c;
 	}
 
-	public boolean handle(String url) {
+	public boolean handle(String url) throws URISyntaxException {
 		Uri uri = Uri.parse(url);
-		String scheme = uri.getScheme();
-		if (!scheme.equals("http") && !scheme.equals("https"))
+
+		if (!URLUtil.isHttpUrl(url) && !URLUtil.isHttpsUrl(url))
 			return false;
 		
 		String target = uri.getQueryParameter("rho_open_target");
@@ -27,10 +30,15 @@ public class ExternalHttpHandler implements UriHandler {
 		
 		Logger.D(TAG, "This is external 'http' uri, handle it");
 		
-		Intent intent = new Intent(Intent.ACTION_VIEW);
-		intent.setData(uri);
+		//Remove 'rho_open_target' parameter from URL
+		final String rhoParam = "rho_open_target=_blank";
+		int pos = url.indexOf(rhoParam);
+		if (pos + rhoParam.length() == url.length())
+		    url = url.substring(0, pos - 1);
+		else
+		    url = url.substring(0, pos) + url.substring(pos + rhoParam.length() + 1 , url.length());
 		
-		ctx.startActivity(Intent.createChooser(intent, "Open in..."));
+		ctx.startActivity(Intent.createChooser(Intent.parseUri(url, 0), "Open in..."));
 		return true;
 	}
 

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

@@ -0,0 +1,46 @@
+package com.rhomobile.rhodes.uri;
+
+import java.io.File;
+import java.net.URISyntaxException;
+
+import com.rhomobile.rhodes.LocalFileProvider;
+import com.rhomobile.rhodes.Logger;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.webkit.URLUtil;
+
+public class LocalFileHandler implements UriHandler
+{
+    private static final String TAG = "LocalFileHandler";
+    private Context ctx;
+    
+    public LocalFileHandler(Context c) {
+        ctx = c;
+    }
+
+    public boolean handle(String url) throws URISyntaxException {
+
+        if(!URLUtil.isFileUrl(url))
+            return false;
+
+        Logger.D(TAG, "This is 'file' URI, handle it: " + url);
+
+        int intentFlags = 0;
+        String path = Uri.parse(url).getPath();
+        File file = new File(path);
+
+        if(path.startsWith(LocalFileProvider.PATH_PREFIX))
+        {
+            url = LocalFileProvider.uriFromLocalFile(file).toString();
+            intentFlags = Intent.FLAG_GRANT_READ_URI_PERMISSION;
+        }
+
+        Intent intent = Intent.parseUri(url, intentFlags);
+        ctx.startActivity(Intent.createChooser(intent, "Open in..."));
+
+        return true;
+    }
+    
+}

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

@@ -20,7 +20,7 @@
  */
 package com.rhomobile.rhodes.uri;
 
-import java.util.Map;
+import java.net.URISyntaxException;
 
 import com.rhomobile.rhodes.Logger;
 
@@ -38,35 +38,15 @@ public class MailUriHandler implements UriHandler {
 		ctx = c;
 	}
 	
-	public boolean handle(String url) {
+	public boolean handle(String url) throws URISyntaxException {
 		if (!MailTo.isMailTo(url))
 			return false;
 	
 		Logger.D(TAG, "This is 'mailto' uri, handle it");
 		
-		MailTo muri = MailTo.parse(url);
-		
-		Intent intent = new Intent(Intent.ACTION_SEND);
-		intent.setType("message/rfc882");
-		
-		String s = muri.getTo();
-		if (s != null) intent.putExtra(Intent.EXTRA_EMAIL, new String[]{s});
-		
-		s = muri.getCc();
-		if (s != null) intent.putExtra(Intent.EXTRA_CC, new String[]{s});
-		
-		s = muri.getSubject();
-		if (s != null) intent.putExtra(Intent.EXTRA_SUBJECT, s);
-		
-		s = muri.getBody();
-		if (s != null) intent.putExtra(Intent.EXTRA_TEXT, s);
-		
-		Map<String,String> headers = muri.getHeaders();
-		s = headers.get("bcc");
-		if (s != null) intent.putExtra(Intent.EXTRA_BCC, new String[]{s});
-		
-		ctx.startActivity(Intent.createChooser(intent, "Send e-mail..."));
+		ctx.startActivity(Intent.createChooser(Intent.parseUri(url, 0), "Open in..."));
 		return true;
+
 	}
 
 }

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

@@ -20,8 +20,10 @@
  */
 package com.rhomobile.rhodes.uri;
 
+import java.net.URISyntaxException;
+
 public interface UriHandler {
 
-	public boolean handle(String uri);
+	public boolean handle(String uri) throws URISyntaxException;
 	
 }

data/platform/android/build/RhodesSRC_build.files

@@ -1,7 +1,29 @@
-platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/AndroidR.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/Base64.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/LocalFileProvider.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/alert/PopupActivity.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/IRhoBluetoothManager.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothDeviceListActivity.java 
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManager.java 
@@ -11,17 +33,15 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.j
 platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/FileList.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCapture.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/camera/ImageCaptureCallback.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePickerScreen.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/Event.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/event/EventStore.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/file/RhoFileApi.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocation.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/HttpLog.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Logger.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/geolocation/GeoLocationImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/MainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/TabbedMainView.java
@@ -33,50 +53,33 @@ platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MapView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/MultiTouchHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/OneTouchHandler.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/mapview/TouchHandler.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NativeBar.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/nativeview/RhoNativeViewManager.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NavBar.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkConnectivityListener.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/NetworkStateTracker.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessor.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactAccessorOld.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/ContactField.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Contact.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/phonebook/Phonebook.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushReceiver.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/PushService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoCryptImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesActivity.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesApplication.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesAppOptions.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhodesService.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoLogConf.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RhoMenu.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/RingtoneManager.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/ImageCapture.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/Signature.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/signature/SignatureView.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSockAddr.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocket.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/socket/RhoSocketImpl.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/SplashScreen.java
 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/ExternalHttpHandler.java
+platform/android/Rhodes/src/com/rhomobile/rhodes/uri/LocalFileHandler.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
 platform/android/Rhodes/src/com/rhomobile/rhodes/util/PerformOnUiThread.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/Utils.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientNew.java
 platform/android/Rhodes/src/com/rhomobile/rhodes/webview/ChromeClientOld.java
-platform/android/Rhodes/src/com/rhomobile/rhodes/WebView.java
 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

data/platform/android/build/android.rake

@@ -179,6 +179,42 @@ def set_app_name_android(newname)
     manifest.delete(e) if name.to_s =~ /\.C2D_MESSAGE$/
   end
 
+  app = doc.elements["manifest/application"]
+
+  app.elements.each("activity") do |a|
+    a.elements.each("intent-filter") do |filter|
+      filter.elements.each("action") do |act|
+        act_name = act.attribute("name", "android")
+        next if act_name.nil?
+        if act_name.to_s =~ /\.VIEW$/
+          default_filter = false
+          browsable_filter = false
+          filter.elements.each("category") do |c|
+            cat_name = c.attribute("name", "android")
+            next if cat_name.nil?
+            default_filter = true if cat_name.to_s =~ /\.DEFAULT$/
+            browsable_filter = true if cat_name.to_s =~ /\.BROWSABLE$/
+          end
+          if default_filter and browsable_filter
+            if $uri_custom.nil?
+              filter.add_element "data", { "android:scheme" => $uri_scheme }
+            else
+              filter.add_element( "data", { "android:scheme" => $uri_scheme, "android:host" => $uri_custom } )
+            end
+          end
+        end
+      end
+    end
+  end
+
+  provider = app.add_element(
+    "provider",
+    { "android:name" => "#{JAVA_PACKAGE_NAME}.LocalFileProvider",
+      "android:authorities" => $app_package_name,
+      "android:grantUriPermissions" => "false" } )
+
+  provider.add_element "grant-uri-permission", { "android:pathPrefix" => "/rhodes/apps/" }
+
   #manifest.elements.each('uses-permission') { |e| manifest.delete e }
 
   caps.sort.each do |cap|
@@ -191,7 +227,12 @@ def set_app_name_android(newname)
     p.call manifest
   end
 
-  File.open($appmanifest, "w") { |f| doc.write f, 2 }
+  puts 'save updated application manifest'
+  app_f = File.open($appmanifest, "w")
+  doc.write app_f, 2
+  app_f.close
+
+  #File.open($appmanifest, "w") { |f| doc.write f, 2 }
 
   buf = File.new($rho_android_r,"r").read.gsub(/^\s*import com\.rhomobile\..*\.R;\s*$/,"\nimport #{$app_package_name}.R;\n")
   File.open($app_android_r,"w") { |f| f.write(buf) }
@@ -228,6 +269,9 @@ namespace "config" do
     $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"]["BundleURLScheme"] unless $app_config["android"].nil?
+    $uri_scheme = $config["android"]["BundleURLScheme"] if $uri_scheme.nil? and not $config["android"].nil?
+
     # Here is switch between release/debug configuration used for
     # building native libraries
     if $app_config["debug"].nil?
@@ -279,6 +323,11 @@ namespace "config" do
     $app_package_name = "com.#{$vendor}." + $appname.downcase.gsub(/[^A-Za-z_0-9]/, '') unless $app_package_name
     $app_package_name.gsub!(/\.[\d]/, "._")
 
+    if $uri_scheme.nil?
+      $uri_custom = $app_package_name 
+      $uri_scheme = "http"
+    end
+
     $rhomanifest = File.join $androidpath, "Rhodes", "AndroidManifest.xml"
     $appmanifest = File.join $tmpdir, "AndroidManifest.xml"
 
@@ -400,6 +449,13 @@ namespace "config" do
     $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?
+ 
+    $applog_path = nil
+    $applog_file = $app_config["applog"]
+
+    if !$applog_file.nil?
+      $applog_path = File.join( $app_path, $applog_file )
+    end 
 
     # Detect android targets
     if $androidtargets.nil?
@@ -474,10 +530,8 @@ namespace "config" do
     $avdname += "ext" if $use_google_addon_api
     $avdtarget = $androidtargets[get_api_level($emuversion)]
 
-    $appavdname = nil
-    if $app_config["android"] != nil
-      $appavdname = $app_config["android"]["emulator"] 
-    end
+    $appavdname = $app_config["android"]["emulator"] if $app_config["android"] != nil
+    $appavdname = $config["android"]["emulator"] if $appavdname.nil? and !$config["android"].nil?
 
     setup_ndk($androidndkpath, ANDROID_API_LEVEL)
     
@@ -1026,15 +1080,85 @@ namespace "build" do
         puts 'ext_build.files found ! Addditional files for compilation :'
         File.open(File.join($extensionsdir, "ext_build.files")) do |f|
           while line = f.gets
-            line=line.gsub("\n","\"")
+            line.chomp!
             puts 'java file : ' + line
-            lines << "\""+line
+            lines << "\""+line+"\""
           end
         end
       else
         puts 'ext_build.files not found - no additional java files for compilation'
       end
 
+      ext_manifest = File.join($extensionsdir, "AndroidManifest.xml")
+      if File.exists? ext_manifest
+        puts 'AndroidManifest.xml from native extension found !'
+
+        #tappmanifest = $appmanifest + '_tmp'
+        
+        #cp_r $appmanifest,tappmanifest
+
+        app_f = File.new($appmanifest)
+        manifest_orig_doc = REXML::Document.new(app_f)
+        app_f.close
+
+        manifest_ext_doc = REXML::Document.new(File.new(ext_manifest))
+        
+        src_manifest =  manifest_ext_doc.elements["manifest"]
+        dst_manifest =  manifest_orig_doc.elements["manifest"]
+        
+
+        src_application =  manifest_ext_doc.elements["manifest/application"]              
+        dst_application =  manifest_orig_doc.elements["manifest/application"]
+
+        if src_application != nil
+            puts 'Extension Manifest process application item :'
+            src_application.elements.each do |e|
+                  puts '         add item ['+e.xpath+']' 
+                  dst_application.add e
+            end
+        end
+
+        puts 'Extension Manifest process root <manifest> item :'
+        src_manifest.elements.each do |e|
+            p = e.xpath
+            if p != '/manifest/application'
+                  dst_e = manifest_orig_doc.elements[p]
+                  if dst_e != nil
+                        if p == '/manifest/uses-sdk' 
+                            puts '         found and delete original item ['+p+']' 
+                            manifest_orig_doc.elements.delete p
+                        end
+                  end
+                  puts '         and new item ['+p+']' 
+                  dst_manifest.add e
+            end
+        end  
+
+        #puts 'Result Manifest :'
+        #manifest_orig_doc.elements['manifest'].elements.each do |e|
+        #   puts '     + '+e.xpath
+        #   if e.xpath == '/manifest/application'
+        #       manifest_orig_doc.elements['manifest/application'].elements.each do |t|
+        #             puts '              + '+t.xpath
+        #       end
+        #   end
+        #end
+
+        puts 'delete original manifest'
+        File.delete($appmanifest)
+
+        updated_f = File.open($appmanifest, "w") 
+        manifest_orig_doc.write updated_f, 2
+        updated_f.close
+
+        #rm tappmanifest
+        puts 'Manifest updated by extension saved!'
+        
+
+      else
+        puts 'AndroidManifest.xml from native extension not found - no any changes in main AndroidManifest.xml'
+      end
+
       File.open(newsrclist, "w") { |f| f.write lines.join("\n") }
       srclist = newsrclist
 
@@ -1114,7 +1238,8 @@ namespace "package" do
 
     puts "Packaging Assets and Jars"
 
-    set_app_name_android($appname)
+    # this task already caaled during build "build:android:all"
+    #set_app_name_android($appname)
 
     args = ["package", "-f", "-M", manifest, "-S", resource, "-A", assets, "-I", $androidjar, "-F", resourcepkg]
     puts Jake.run($aapt, args)
@@ -1347,51 +1472,82 @@ def application_running(flag, pkgname)
   false
 end
 
+def kill_adb_and_emulator
+  if RUBY_PLATFORM =~ /windows|cygwin|mingw/
+    # Windows
+    `taskkill /F /IM adb.exe`
+    `taskkill /F /IM emulator.exe`
+  else
+    `killall -9 adb`
+    `killall -9 emulator`
+  end
+end
+
+def logcat(device_flag = '-e', log_path = $applog_path)
+  if !log_path.nil?
+    Thread.new { Jake.run($adb, [device_flag, 'logcat', '>>', log_path], nil, true) }
+  end
+end
+
+def logclear(device_flag = '-e')
+  Thread.new { Jake.run($adb, [device_flag, 'logcat', '-c'], nil, true) }
+end
+
 namespace "run" do
   namespace "android" do
     
     task :spec => ["device:android:debug"] do
-        run_emulator
-        do_uninstall('-e')
-        
-        log_name  = $app_path + '/RhoLog.txt'
+
+        log_name  = $app_path + '/RhoLogSpec.txt'
         File.delete(log_name) if File.exist?(log_name)
+
+        device_flag = '-e'
+
+        logclear(device_flag)
+        run_emulator :hidden => true
+        do_uninstall(device_flag)
         
         # Failsafe to prevent eternal hangs
         Thread.new {
-          sleep 1000
-
-          if RUBY_PLATFORM =~ /windows|cygwin|mingw/
-            # Windows
-            `taskkill /F /IM adb.exe`
-            `taskkill /F /IM emulator.exe`
-          else
-            `killall -9 adb`
-            `killall -9 emulator`
-          end
+          sleep 2000
+          kill_adb_and_emulator
         }
 
-        load_app_and_run
+        load_app_and_run(device_flag)
+        logcat(device_flag, log_name)
 
         Jake.before_run_spec
         start = Time.now
 
-        puts "waiting for log"
+        puts "waiting for application"
+
+        for i in 0..60
+            if application_running(device_flag, $app_package_name)
+		break
+            else
+                sleep(1)
+            end
+        end
+
+        puts "waiting for log: " + log_name
         
         for i in 0..60
 			if !File.exist?(log_name)
-				get_app_log($appname, false, true)
 				sleep(1)
 			else
 				break
 			end
         end
 
+		if !File.exist?(log_name)
+            puts "Can not read log file: " + log_name
+			exit(1)
+        end
+
         puts "start read log"
         
         end_spec = false
         while !end_spec do
-            get_app_log($appname, false, true)
             io = File.new(log_name, "r")
         
             io.each do |line|
@@ -1402,21 +1558,15 @@ namespace "run" do
             end
             io.close
             
-            break unless application_running('-e', $app_package_name)
+            break unless application_running(device_flag, $app_package_name)
             sleep(5) unless end_spec
         end
 
         Jake.process_spec_results(start)        
         
         # stop app
-        if RUBY_PLATFORM =~ /windows|cygwin|mingw/
-          # Windows
-          `taskkill /F /IM adb.exe`
-          `taskkill /F /IM emulator.exe`
-        else
-          `killall -9 adb`
-          `killall -9 emulator`
-        end
+        do_uninstall(device_flag)
+        kill_adb
 
         $stdout.flush
         
@@ -1435,21 +1585,34 @@ namespace "run" do
         load_app_and_run
     end
 
-    def  run_emulator
+    def  kill_adb
+        # stop app
+        if RUBY_PLATFORM =~ /windows|cygwin|mingw/
+          # Windows
+          `taskkill /F /IM adb.exe`
+        else
+          `killall -9 adb`
+        end
+    end
+
+    def  run_emulator(options = {})
       apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
 
-      Jake.run($adb, ['kill-server'])	
-      #Jake.run($adb, ['start-server'])	
-      #adb_start_server = $adb + ' start-server'
-      Thread.new { Jake.run($adb, ['start-server']) }
+      kill_adb
+      Jake.run($adb, ['start-server'], nil, true)
       puts 'Sleep for 5 sec. waiting for "adb start-server"'
       sleep 5
 
+      if !$applog_file.nil?
+        Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
+      end
+
       if $appavdname != nil
         $avdname = $appavdname
       end
-      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 32M " #--skin HVGA"
-      system(createavd) unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
+
+      createavd = "\"#{$androidbin}\" create avd --name #{$avdname} --target #{$avdtarget} --sdcard 32M "
+      system("echo no | #{createavd}") unless File.directory?( File.join(ENV['HOME'], ".android", "avd", "#{$avdname}.avd" ) )
 
       if $use_google_addon_api
         avdini = File.join(ENV['HOME'], '.android', 'avd', "#{$avdname}.ini")
@@ -1464,26 +1627,39 @@ namespace "run" do
 
       if !running
         # Start the emulator, check on it every 5 seconds until it's running
-        Thread.new { system("\"#{$emulator}\" -cpu-delay 0 -no-boot-anim -avd #{$avdname}") }
+        cmd = "\"#{$emulator}\" -cpu-delay 0 -no-boot-anim"
+        cmd << " -no-window" if options[:hidden]
+        cmd << " -avd #{$avdname}"
+        Thread.new { system(cmd) }
         puts "Waiting up to 180 seconds for emulator..."
         startedWaiting = Time.now
         adbRestarts = 1
         while (Time.now - startedWaiting < 180 )
           sleep 5
           now = Time.now
-          emulatorState = ""
-          Jake.run2($adb,["-e", "get-state"],{:system => false, :hideerrors => :false}) do |line|
-            puts "RET: " + line
-            emulatorState += line
+          #emulatorState = ""
+          #Jake.run2($adb,["-e", "get-state"],{:system => false, :hideerrors => :false}) do |line|
+          #  puts "RET: " + line
+          #  emulatorState += line
+          #end
+          started = false
+          Jake.run2 $adb, ["-e", "shell", "ps"], :system => false, :hideerrors => false do |line|
+            started = true if line =~ /android\.process\.acore/
+            true
           end
-          if emulatorState =~ /unknown/
+          #if emulatorState =~ /unknown/
+          unless started
             printf("%.2fs: ",(now - startedWaiting))
             if (now - startedWaiting) > (60 * adbRestarts)
               # Restart the adb server every 60 seconds to prevent eternal waiting
               puts "Appears hung, restarting adb server"
-              Jake.run($adb, ['kill-server'])
-              Thread.new { Jake.run($adb, ['start-server']) }
+              kill_adb
+              Jake.run($adb, ['start-server'], nil, true)
               adbRestarts += 1
+
+              if !$applog_file.nil?
+                Thread.new { Jake.run($adb, ['logcat', '>>', $applog_path], nil, true) }
+              end
             else
               puts "Still waiting..."
             end
@@ -1506,13 +1682,13 @@ namespace "run" do
       $stdout.flush
     end
     
-    def  load_app_and_run
-      puts "Loading package into emulator"
+    def  load_app_and_run(device_flag = '-e')
+      puts "Loading package"
       apkfile = Jake.get_absolute $targetdir + "/" + $appname + "-debug.apk"
       count = 0
       done = false
       while count < 20
-        f = Jake.run2($adb, ["-e", "install", "-r", apkfile], {:nowait => true})
+        f = Jake.run2($adb, [device_flag, "install", "-r", apkfile], {:nowait => true})
         theoutput = ""
         while c = f.getc
           $stdout.putc c
@@ -1533,7 +1709,7 @@ namespace "run" do
       end
 
       puts "Loading complete, starting application.." if done
-      run_application("-e") if done
+      run_application(device_flag) if done
     end
 
     desc "build and install on device"