rhodes 2.4.1 → 3.0.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/Alert.java

@@ -21,8 +21,10 @@
 package com.rhomobile.rhodes.alert;
 
 import android.content.Context;
+import android.content.Intent;
 import android.media.MediaPlayer;
 
+import android.os.Bundle;
 import android.os.Vibrator;
 
 import com.rhomobile.rhodes.Capabilities;
@@ -120,5 +122,14 @@ public class Alert {
 			reportFail("playFile", e);
 		}
 	}
+	public static void showNotification(Context ctx, int id,
+								 String title, String text,
+								 Bundle extras)
+	{
+		Intent notificationIntent = new Intent(ctx, RhodesService.class);
+		if(extras != null)
+			notificationIntent.putExtras(extras);
+		StatusNotification.simpleNotification(TAG, id, ctx, notificationIntent, title, text);
+	}
 	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/alert/StatusNotification.java

@@ -0,0 +1,49 @@
+package com.rhomobile.rhodes.alert;
+
+import com.rhomobile.rhodes.AndroidR;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+public class StatusNotification
+{
+	public static Notification makeNotification(String text)
+	{
+		Notification notification = new Notification(
+				AndroidR.drawable.icon,
+				text,
+				System.currentTimeMillis());
+		return notification;
+	}
+	public static Notification simpleNotification(String tag, int notificationId, Context ctx, Intent intent, String title, String text)
+	{
+		Notification notification = makeNotification(text);
+		PendingIntent contentIntent = PendingIntent.getService(ctx, 0, intent, 0);
+		
+		notification.setLatestEventInfo(ctx, title, text, contentIntent);
+		notification.defaults = Notification.DEFAULT_ALL;
+		notification.flags |= Notification.FLAG_AUTO_CANCEL;
+		
+		customNotification(tag, notificationId, ctx,notification);
+		
+		return notification;
+	}
+	public static void customNotification(String tag, int notificationId, Context ctx, Notification customNotification)
+	{
+		NotificationManager mNm = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE);
+		mNm.notify(tag, notificationId, customNotification);
+	}
+	public static void cancelNotification(String tag, int notificationId, Context ctx)
+	{
+		NotificationManager mNm = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE);
+		mNm.cancel(tag, notificationId);
+	}
+	public static void cancelAllNotifications(Context ctx)
+	{
+		NotificationManager mNm = (NotificationManager) ctx.getSystemService(Context.NOTIFICATION_SERVICE);
+		mNm.cancelAll();
+	}
+}

data/platform/android/Rhodes/src/com/rhomobile/rhodes/mainview/SimpleMainView.java

@@ -110,7 +110,7 @@ public class SimpleMainView implements MainView {
 	private class ActionExit implements View.OnClickListener {
 		public void onClick(View v) {
 			restoreWebView();
-			RhodesService.getInstance().getRhodesApplication().exit();
+			RhodesService.exit();
 		}
 	};
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/socket/SSLImpl.java

@@ -1,5 +1,6 @@
 package com.rhomobile.rhodes.socket;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.Socket;
@@ -53,7 +54,7 @@ public class SSLImpl {
 	};
 	
 	private static void reportFail(String name, Exception e) {
-		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
+		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getClass().getSimpleName() + ": " + e.getMessage());
 	}
 	
 	private static SSLSocketFactory getFactory(boolean verify) throws NoSuchAlgorithmException, KeyManagementException {
@@ -93,6 +94,9 @@ public class SSLImpl {
 			if (sock != null)
 				sock.close();
 		}
+		catch (IOException e) {
+		    Logger.I(TAG, "shutdown fails: IOException: " + e.getMessage());
+		}
 		catch (Exception e) {
 			reportFail("shutdown", e);
 		}

data/platform/android/build/RhodesSRC_build.files

@@ -24,6 +24,7 @@ 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/alert/StatusNotification.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 

data/platform/android/build/android.rake

@@ -7,7 +7,7 @@ USE_TRACES = false
 
 ANDROID_API_LEVEL_TO_MARKET_VERSION = {}
 ANDROID_MARKET_VERSION_TO_API_LEVEL = {}
-{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3", 10 => "2.3.3", 11 => "3.0" }.each do |k,v|
+{2 => "1.1", 3 => "1.5", 4 => "1.6", 5 => "2.0", 6 => "2.0.1", 7 => "2.1", 8 => "2.2", 9 => "2.3.1", 10 => "2.3.3", 11 => "3.0" }.each do |k,v|
   ANDROID_API_LEVEL_TO_MARKET_VERSION[k] = v
   ANDROID_MARKET_VERSION_TO_API_LEVEL[v] = k
 end
@@ -215,7 +215,7 @@ def set_app_name_android(newname)
 
   provider.add_element "grant-uri-permission", { "android:pathPrefix" => "/rhodes/apps/" }
 
-  #manifest.elements.each('uses-permission') { |e| manifest.delete e }
+  manifest.elements.each('uses-permission') { |e| manifest.delete e }
 
   caps.sort.each do |cap|
     element = REXML::Element.new('uses-permission')
@@ -367,6 +367,9 @@ namespace "config" do
 
     puts "+++ Looking for platform..." if USE_TRACES
     napilevel = ANDROID_API_LEVEL
+    
+    cur_api_levels = Array.new
+    
     Dir.glob(File.join($androidsdkpath, "platforms", "*")).each do |platform|
       props = File.join(platform, "source.properties")
       unless File.file? props
@@ -384,6 +387,7 @@ namespace "config" do
       end
 
       puts "+++ API LEVEL of #{platform}: #{apilevel}" if USE_TRACES
+      cur_api_levels.push apilevel
 
       if apilevel > napilevel
         napilevel = apilevel
@@ -392,6 +396,36 @@ namespace "config" do
       end
     end
 
+    $emuversion = get_market_version($found_api_level) if $emuversion.nil?
+    requested_api_level = get_api_level($emuversion)
+
+    if USE_TRACES
+      puts "Found API levels:"
+      cur_api_levels.each do |level|
+        puts level
+      end
+      puts "Requested version: #{$emuversion}"
+      puts "Corresponding API level #{requested_api_level}"
+    end
+
+    if requested_api_level.nil?
+      puts "ERROR!!! Wrong Android API version: #{$emuversion}"
+      exit 1
+    end
+
+    is_api_level_installed = false
+    cur_api_levels.each do |level|
+      if level == requested_api_level
+        is_api_level_installed = true
+        break
+      end
+    end
+
+    if !is_api_level_installed
+      puts "ERROR!!! API version is not found in installed Android SDK: #{$emuversion}"
+      exit 1
+    end
+
     if $androidplatform.nil?
       ajar = File.join($androidsdkpath, 'platforms', 'android-' + ANDROID_API_LEVEL_TO_MARKET_VERSION[ANDROID_API_LEVEL], 'android.jar')
       $androidplatform = 'android-' + ANDROID_API_LEVEL_TO_MARKET_VERSION[ANDROID_API_LEVEL] if File.file?(ajar)
@@ -524,14 +558,13 @@ namespace "config" do
       end
     end
 
-    $emuversion = get_market_version($found_api_level) if $emuversion.nil?
     $emuversion = $emuversion.to_s
     $avdname = "rhoAndroid" + $emuversion.gsub(/[^0-9]/, "")
     $avdname += "ext" if $use_google_addon_api
     $avdtarget = $androidtargets[get_api_level($emuversion)]
 
-    $appavdname = $app_config["android"]["emulator"] if $app_config["android"] != nil
-    $appavdname = $config["android"]["emulator"] if $appavdname.nil? and !$config["android"].nil?
+    $appavdname = $app_config["android"]["emulator"] if $app_config["android"] != nil && $app_config["android"].length > 0
+    $appavdname = $config["android"]["emulator"] if $appavdname.nil? and !$config["android"].nil? and $config["android"].length > 0
 
     setup_ndk($androidndkpath, ANDROID_API_LEVEL)
     
@@ -569,6 +602,13 @@ namespace "config" do
     $push_sender = $app_config["android"]["push"]["sender"] if !$app_config["android"].nil? and !$app_config["android"]["push"].nil?
     $push_sender = "support@rhomobile.com" if $push_sender.nil?
 
+    $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
+
+    
+
     mkdir_p $bindir if not File.exists? $bindir
     mkdir_p $rhobindir if not File.exists? $rhobindir
     mkdir_p $targetdir if not File.exists? $targetdir
@@ -941,6 +981,11 @@ namespace "build" do
         f.puts "package #{JAVA_PACKAGE_NAME};"
         f.puts "public class Push {"
         f.puts "  public static final String SENDER = \"#{$push_sender}\";"
+        if $push_notifications.nil?
+            f.puts "  public static final String PUSH_NOTIFICATIONS =  \"none\";"
+        else
+            f.puts "  public static final String PUSH_NOTIFICATIONS =  \"#{$push_notifications}\";"
+        end
         f.puts "};"
       end
 
@@ -1490,7 +1535,7 @@ def logcat(device_flag = '-e', log_path = $applog_path)
 end
 
 def logclear(device_flag = '-e')
-  Thread.new { Jake.run($adb, [device_flag, 'logcat', '-c'], nil, true) }
+  Jake.run($adb, [device_flag, 'logcat', '-c'], nil, true) 
 end
 
 namespace "run" do
@@ -1585,6 +1630,48 @@ namespace "run" do
         load_app_and_run
     end
 
+    task :get_info => "config:android" do
+        $androidtargets.each do |level|
+            puts "#{get_market_version(level[0])}"
+        end
+
+        emu_version = $emuversion
+        
+        puts ""        
+        cur_name = ""
+        
+        `"#{$androidbin}" list avd`.split(/\n/).each do |line|
+            line.each_line do |item|
+                ar = item.split(':')
+                ar[0].strip!
+                if ar[0] == "Name"
+                    cur_name = ar[1].strip!
+                    puts "#{cur_name}"
+                end
+                
+                if $appavdname && cur_name == $appavdname && (ar[0] == "Target" || ar.length == 1)
+                    
+                    text = ar[0] == "Target" ? ar[1] : ar[0]
+                    
+                    nAnd = text.index("Android")
+                    if nAnd
+                        nAnd = text.index(" ", nAnd)
+                        nAnd1 = text.index("-", nAnd+1)                    
+                        nAnd1 = text.index(" ", nAnd+1) unless nAnd1
+                        emu_version = text[nAnd+1, nAnd1-nAnd-1]
+                    end    
+                end
+                
+            end    
+        end
+
+        puts ""
+
+        puts "#{emu_version}"
+        puts "#{$appavdname}"
+
+    end
+
     def  kill_adb
         # stop app
         if RUBY_PLATFORM =~ /windows|cygwin|mingw/

data/platform/bb/RubyVM/src/com/rho/RhodesApp.java

@@ -116,10 +116,11 @@ public class RhodesApp
     
     boolean isExternalUrl(String strUrl)
     {
-    	return strUrl.startsWith("http://") || strUrl.startsWith("https://") ||
-    		strUrl.startsWith("javascript:") || strUrl.startsWith("mailto:")
-    		 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:") ||
-    		 strUrl.startsWith("sms:");    
+    	return strUrl.indexOf(':') != -1;
+    	//strUrl.startsWith("http://") || strUrl.startsWith("https://") ||
+    	//	strUrl.startsWith("javascript:") || strUrl.startsWith("mailto:")
+    	//	 || strUrl.startsWith("tel:")|| strUrl.startsWith("wtai:") ||
+    	//	 strUrl.startsWith("sms:");    
     }
     
     public String canonicalizeRhoUrl(String url) 

data/platform/bb/RubyVM/src/com/rho/file/RhoFile.java

@@ -97,4 +97,14 @@ public class RhoFile
 				try{ oFile.close();}catch(Exception e){}
 		}
 	}
+	
+	public static void deleteFile(String szFilePath)
+	{
+		try{
+			RhoClassFactory.createFile().delete(szFilePath);
+		}catch(Exception exc)
+		{
+			LOG.ERROR("deleteFile failed.", exc);			
+		}
+	}
 }

data/platform/bb/RubyVM/src/com/rho/sync/SyncEngine.java

@@ -908,7 +908,7 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    FilePath oFilePath = new FilePath(strDbPath);
 	    return oFilePath.changeBaseName(strNewName+strExt);
 	}
-	
+/*	
 	int getStartSource()
 	{
 	    for( int i = 0; i < m_sources.size(); i++ )
@@ -920,15 +920,15 @@ public class SyncEngine implements NetRequest.IRhoSession
 	
 	    return -1;
 	}
-
-	boolean syncOneSource(int i)throws Exception
+*/
+	void syncOneSource(int i)throws Exception
 	{
     	SyncSource src = null;
-    	boolean bError = false;
+    	//boolean bError = false;
     	try{
 		    src = (SyncSource)m_sources.elementAt(i);
 		    if ( src.getSyncType().compareTo("bulk_sync_only")==0 )
-		        return true;
+		        return;
 	
 		    if ( isSessionExist() && getState() != esStop )
 		        src.sync();
@@ -939,31 +939,32 @@ public class SyncEngine implements NetRequest.IRhoSession
 	    	if ( src.m_nErrCode == RhoAppAdapter.ERR_NONE )
 	    		src.m_nErrCode = RhoAppAdapter.ERR_RUNTIME;
 	    	
-	    	setState(esStop);
-    		throw exc;
+	    	//setState(esStop);
+    		//throw exc;
+	    	LOG.ERROR("Sync of source '" + src.getName()+ "' failed.", exc);
     	}finally{
     		getNotify().onSyncSourceEnd( i, m_sources );
-    		bError = src.m_nErrCode != RhoAppAdapter.ERR_NONE;
+    		//bError = src.m_nErrCode != RhoAppAdapter.ERR_NONE;
     	}
     	
-	    return !bError;
+	    //return !bError;
 	}
 	
 	void syncAllSources()throws Exception
 	{
-	    boolean bError = false;
+//	    boolean bError = false;
 
-	    int nStartSrc = getStartSource();
-	    if ( nStartSrc >= 0 )
-	        bError = !syncOneSource(nStartSrc);
+//	    int nStartSrc = getStartSource();
+//	    if ( nStartSrc >= 0 )
+//	        bError = !syncOneSource(nStartSrc);
 
 	    //TODO: do not stop on error source
 	    for( int i = 0; i < (int)m_sources.size() && isContinueSync(); i++ )
 	    {
-	        bError = !syncOneSource(i);
+	        /*bError = !*/syncOneSource(i);
 	    }
 
-	    if ( !bError && !isSchemaChanged() )
+	    if ( !isSchemaChanged() )
 	    	getNotify().fireSyncNotification(null, true, RhoAppAdapter.ERR_NONE, RhoAppAdapter.getMessageText("sync_completed"));
 	}
 	

data/platform/bb/RubyVM/src/com/rho/sync/SyncNotify.java

@@ -277,7 +277,7 @@ public class SyncNotify {
     void onSyncSourceEnd( int nSrc, Vector/*Ptr<CSyncSource*>&*/ sources )
     {
         SyncSource src = (SyncSource)sources.elementAt(nSrc);
-
+/*
         if ( getSync().getState() == SyncEngine.esStop && src.m_nErrCode != RhoAppAdapter.ERR_NONE )
         {
         	SyncNotification pSN = getSyncNotifyBySrc(src);
@@ -286,7 +286,7 @@ public class SyncNotify {
         	else
         		fireAllSyncNotifications(true, src.m_nErrCode, src.m_strError, "" );
         }
-        else
+        else*/
             fireSyncNotification( src, true, src.m_nErrCode, "");
 
         cleanCreateObjectErrors();

data/platform/bb/RubyVM/src/com/rho/sync/SyncSource.java

@@ -211,10 +211,10 @@ public class SyncSource
 	    //m_bIsSearch = false;
 	    
 	    try{
-	        if ( isTokenFromDB() && getToken() > 1 )
-	            syncServerChanges();  //sync only server changes, which was paused before
-	        else
-	        {
+	        //if ( isTokenFromDB() && getToken() > 1 )
+	        //    syncServerChanges();  //sync only server changes, which was paused before
+	        //else
+	        //{
 		        if ( isEmptyToken() )
 		            processToken(1);
 
@@ -225,10 +225,10 @@ public class SyncSource
 		        if ( !bSyncedServer )
 		        	syncServerChanges();
 		        */
-	        }	        
+	        //}	        
 	    }catch(Exception exc)
 	    {
-	    	getSync().stopSync();
+	    	//getSync().stopSync();
 	    	throw exc;
 	    }finally{
 		   TimeInterval endTime = TimeInterval.getCurrentTime();
@@ -374,7 +374,7 @@ public class SyncSource
 	    try{
 		    checkIgnorePushObjects();
 		    
-		    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+		    for( i = 0; i < 3; i++ )
 		    {
 		        String strBody1;
 		        strBody1 = makePushBody_Ver3(arUpdateTypes[i], true);
@@ -404,7 +404,7 @@ public class SyncSource
 	    	getDB().Unlock();
 	    }
 	    
-	    if ( bSend )
+	    if ( bSend && getSync().isContinueSync() )
 	    {
 	        LOG.INFO( "Push client changes to server. Source: " + getName() + "Size :" + strBody.length() );
 	        LOG.TRACE("Push body: " + strBody);		
@@ -421,7 +421,7 @@ public class SyncSource
 		            NetResponse resp = getNet().pushMultipartData( getProtocol().getClientChangesUrl(), m_arMultipartItems, getSync(), null );
 		            if ( !resp.isOK() )
 		            {
-		                getSync().setState(SyncEngine.esStop);
+		            	//getSync().stopSync();
 		                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
 		                m_strError = resp.getCharData();
 		            }
@@ -430,7 +430,7 @@ public class SyncSource
 		            NetResponse resp = getNet().pushData( getProtocol().getClientChangesUrl(), strBody, getSync());
 		            if ( !resp.isOK() )
 		            {
-		                getSync().setState(SyncEngine.esStop);
+		            	//getSync().stopSync();
 		                m_nErrCode = RhoAppAdapter.ERR_REMOTESERVER;
 		                m_strError = resp.getCharData();
 		            }
@@ -443,12 +443,12 @@ public class SyncSource
 		        
 	    }
 
-	    for( i = 0; i < 3 && getSync().isContinueSync(); i++ )
+	    for( i = 0; i < 3 && m_nErrCode == RhoAppAdapter.ERR_NONE; i++ )
 	    {
 	        if ( arUpdateSent[i] )
 	        {
 	            //oo conflicts
-	            if ( i < 1 ) //create
+	            if ( i < 1 && !getSync().getSourceOptions().getBoolProperty(getID(), "pass_through") ) //create
 	                getDB().executeSQL("UPDATE changed_values SET sent=2 WHERE source_id=? and update_type=? and sent=1", getID(), arUpdateTypes[i] );
 	            else
 	            //
@@ -584,7 +584,8 @@ public class SyncSource
 	{
 		LOG.INFO("Sync server changes source ID :" + getID() );
 		
-	    while( getSync().isContinueSync() )
+	    while( getSync().isContinueSync()&& 
+	    	   ( m_nErrCode == RhoAppAdapter.ERR_NONE || m_nErrCode == RhoAppAdapter.ERR_CUSTOMSYNCSERVER) )
 	    {
 	        setCurPageCount(0);
 	        String strUrl = getProtocol().getServerQueryUrl("");
@@ -603,7 +604,7 @@ public class SyncSource
 	
 		        if ( !resp.isOK() )
 		        {
-		            getSync().stopSync();
+		            //getSync().stopSync();
 		            m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 		            m_strError = resp.getCharData();
 		            continue;
@@ -837,7 +838,7 @@ public class SyncSource
 		            processServerCmd_Ver3_Schema(strCmd,strObject,attrIter);
 		        else
 		        {
-		            for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+		            for( ; !attrIter.isEnd(); attrIter.next() )
 		            {
 		                String strAttrib = attrIter.getCurKey();
 		                String strValue = attrIter.getCurString();
@@ -903,11 +904,11 @@ public class SyncSource
 	    {
 	        Vector/*<String>*/ vecValues = new Vector(), vecAttrs = new Vector();
 	        String strCols = "", strQuest = "", strSet = "";
-	        for( ; !attrIter.isEnd() && getSync().isContinueSync(); attrIter.next() )
+	        for( ; !attrIter.isEnd(); attrIter.next() )
 	        {
 	            CAttrValue oAttrValue = new CAttrValue(attrIter.getCurKey(),attrIter.getCurString());
 	            if ( !processBlob(strCmd,strObject,oAttrValue) )
-	                continue;
+	                break;
 	        	
 	            if ( strCols.length() > 0 )
 	                strCols += ",";
@@ -979,7 +980,7 @@ public class SyncSource
 	        String strSqlUpdate = "UPDATE ";
 	        strSqlUpdate += getName() + " SET " + strSet + " WHERE object=?";
 	        
-	        if ( strSet.length() == 0 || !getSync().isContinueSync() )
+	        if ( strSet.length() == 0 )
 	            return;
 	        
 	        getDB().executeSQL(strSqlUpdate, strObject);
@@ -1219,7 +1220,8 @@ public class SyncSource
 			NetResponse resp = getNet().pullFile(url, fName, getSync(), null);
 	        if ( !resp.isOK() )
 	        {
-	        	getSync().stopSync();
+	        	//getSync().stopSync();
+	        	com.rho.file.RhoFile.deleteFile(fName);
 	        	m_nErrCode = RhoAppAdapter.getErrorFromResponse(resp);
 	        	return false;
 	        }