rhodes 3.4.2 → 3.5.1.12

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

@@ -61,36 +61,41 @@ public class SyncThread extends ThreadQueue
    		int m_nCmdParam;
    		String m_strCmdParam, m_strQueryParams;
    		boolean m_bShowStatus;
+   		boolean m_bSyncOnlyChangedSources;
    		
-   		SyncCommand(int nCode, int nParam, boolean bShowStatus, String query_params)
+   		SyncCommand(int nCode, int nParam, boolean bShowStatus, String query_params, boolean bSyncOnlyChangedSources)
    		{
    			m_nCmdCode = nCode;
    			m_nCmdParam = nParam;
    			m_bShowStatus = bShowStatus;
    			m_strQueryParams = query_params != null? query_params : "";
+   			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
    		}
-   		SyncCommand(int nCode, String strParam, boolean bShowStatus, String query_params)
+   		SyncCommand(int nCode, String strParam, boolean bShowStatus, String query_params, boolean bSyncOnlyChangedSources)
    		{
    			m_nCmdCode = nCode;
    			m_strCmdParam = strParam;
    			m_bShowStatus = bShowStatus;
    			m_strQueryParams = query_params != null? query_params : "";
+   			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
    		}
-	    SyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus, String query_params)
+	    SyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus, String query_params, boolean bSyncOnlyChangedSources)
 	    {
 		    m_nCmdCode = nCode;
 		    m_strCmdParam = strParam;
             m_nCmdParam = nCmdParam;
             m_bShowStatus = bShowStatus;
             m_strQueryParams = query_params != null? query_params : "";
+            m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
 	    }
    		
-   		SyncCommand(int nCode, boolean bShowStatus, String query_params)
+   		SyncCommand(int nCode, boolean bShowStatus, String query_params, boolean bSyncOnlyChangedSources)
    		{
    			m_nCmdCode = nCode;
    			m_nCmdParam = 0;
    			m_bShowStatus = bShowStatus;
    			m_strQueryParams = query_params != null? query_params : "";
+   			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
    		}
    		
    		public boolean equals(IQueueCommand obj)
@@ -100,7 +105,8 @@ public class SyncThread extends ThreadQueue
    				(m_strCmdParam == oSyncCmd.m_strCmdParam ||
    				(m_strCmdParam != null && oSyncCmd.m_strCmdParam != null && m_strCmdParam.equals(oSyncCmd.m_strCmdParam)))&&
    				(m_strQueryParams == oSyncCmd.m_strQueryParams ||
-   				(m_strQueryParams != null && oSyncCmd.m_strQueryParams != null && m_strQueryParams.equals(oSyncCmd.m_strQueryParams)));  		
+   				(m_strQueryParams != null && oSyncCmd.m_strQueryParams != null && m_strQueryParams.equals(oSyncCmd.m_strQueryParams)))&&
+   			     m_bSyncOnlyChangedSources == oSyncCmd.m_bSyncOnlyChangedSources;  		
    		}
    		
    		public String toString()
@@ -132,7 +138,7 @@ public class SyncThread extends ThreadQueue
    		/*common::CAutoPtr<C*/SyncNotify.SyncNotification/*>*/ m_pNotify;
    		public SyncLoginCommand(String name, String password, String callback, SyncNotify.SyncNotification pNotify)
    		{
-   			super(scLogin,callback,false,"");
+   			super(scLogin,callback,false,"", false);
    			
    			m_strName = name;
    			m_strPassword = password;
@@ -147,7 +153,7 @@ public class SyncThread extends ThreadQueue
 	    
         public SyncSearchCommand(String from, String params, Vector arSources, boolean sync_changes, int nProgressStep)
 	    {
-        	super(scSearchOne,params,nProgressStep, false, "");
+        	super(scSearchOne,params,nProgressStep, false, "", false);
 		    m_strFrom = from;
 		    m_bSyncChanges = sync_changes;
 		    m_arSources = arSources;
@@ -173,6 +179,7 @@ public class SyncThread extends ThreadQueue
 	public void Destroy()
 	{
 	    m_oSyncEngine.exitSync();
+	    LOG.INFO("Stopping Sync thread");
 	    stop(SYNC_WAIT_BEFOREKILL_SECONDS);
 		
 	    if ( ClientRegister.getInstance() != null )
@@ -246,7 +253,7 @@ public class SyncThread extends ThreadQueue
 	public void onTimeout()//throws Exception
 	{
 	    if ( isNoCommands() && getPollInterval()>0 )
-	        addQueueCommandInt(new SyncCommand(scSyncAll,false, ""));
+	        addQueueCommandInt(new SyncCommand(scSyncAll,false, "", false));
 	}
 	
 	void checkShowStatus(SyncCommand oSyncCmd)
@@ -264,7 +271,7 @@ public class SyncThread extends ThreadQueue
 	    {
 	    case scSyncAll:
 	    	checkShowStatus(oSyncCmd);
-	        m_oSyncEngine.doSyncAllSources(oSyncCmd.m_strQueryParams);
+	        m_oSyncEngine.doSyncAllSources(oSyncCmd.m_strQueryParams,oSyncCmd.m_bSyncOnlyChangedSources);
 	        break;
         case scSyncOne:
 	        {
@@ -313,7 +320,7 @@ public class SyncThread extends ThreadQueue
 	
 	public static void doSyncAllSources(boolean bShowStatus)
 	{
-		getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll,bShowStatus, ""));
+		getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll,bShowStatus, "", false));
 	}
 	
 	public static void doSyncSourceByName(String strSrcName, boolean bShowStatus)
@@ -321,27 +328,45 @@ public class SyncThread extends ThreadQueue
 		if (bShowStatus&&(m_statusListener != null)) {
 			m_statusListener.createStatusPopup(RhoAppAdapter.getMessageText("syncronizing_data"));
 		}
-	    getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strSrcName, (int)0, bShowStatus, "") );		
+	    getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strSrcName, (int)0, bShowStatus, "", false) );		
 	}
 	
 	public static void stopSync()throws Exception
+	{
+		SyncThread.getInstance().stopAll();		
+	}
+	
+	public void stopAll()throws Exception
 	{
 		LOG.INFO("STOP sync");
 		
 		if ( getSyncEngine().isSyncing() )
 		{
 			LOG.INFO("STOP sync in progress.");
+
+            synchronized(getCommandLock())
+	        {
+	            getCommands().clear();
+	        }
 			
 			getSyncEngine().stopSyncByUser();
+			
+			//don't wait if calling from notify callback
+			if ( getSyncEngine().getNotify().isInsideCallback() )
+			{
+				LOG.INFO("STOP sync called inside notify.");
+				return;
+			}
+			
 			getInstance().stopWait();
 			
 			int nWait = 0;
 			//while( nWait < 30000 && getSyncEngine().getState() != SyncEngine.esNone )
-			while( nWait < 30000 && DBAdapter.isAnyInsideTransaction() )
+			while( nWait < 30000 && isWaiting() /*DBAdapter.isAnyInsideTransaction()*/ )
 				try{ Thread.sleep(100); nWait += 100; }catch(Exception e){}
 				
 			//if (getSyncEngine().getState() != SyncEngine.esNone)
-			if ( DBAdapter.isAnyInsideTransaction() )
+			if ( /*DBAdapter.isAnyInsideTransaction()*/ isWaiting() )
 			{
 				getSyncEngine().exitSync();
 				getInstance().stop(0);
@@ -366,6 +391,7 @@ public class SyncThread extends ThreadQueue
 				{
 					boolean bShowStatus = true;
 					String query_params = "";
+					boolean sync_only_changed_sources = false;
 					if ( args != null && args.size() > 0 )
 					{
 						String str = args.get(0).asString();
@@ -373,8 +399,13 @@ public class SyncThread extends ThreadQueue
 					}
 					if ( args != null &&  args.size() > 1 )
 						query_params = args.get(1).asString();
+					if ( args != null &&  args.size() > 2 )
+					{
+						String str = args.get(2).asString();
+						sync_only_changed_sources = args.get(2).equals(RubyConstant.QTRUE)||"true".equalsIgnoreCase(str);
+					}
 					
-					getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll,bShowStatus, query_params));
+					getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncAll,bShowStatus, query_params, sync_only_changed_sources));
 				} catch(Exception e) {
 					LOG.ERROR("dosync failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
@@ -404,7 +435,7 @@ public class SyncThread extends ThreadQueue
 					if ( args.size() > 2 )
 						query_params = args.get(2).asString();
 					
-					getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strName, nSrcID, bShowStatus, query_params) );
+					getInstance().addQueueCommand(new SyncCommand(SyncThread.scSyncOne, strName, nSrcID, bShowStatus, query_params, false) );
 				} catch(Exception e) {
 					LOG.ERROR("dosync_source failed", e);
 					throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
@@ -811,6 +842,22 @@ public class SyncThread extends ThreadQueue
 						}
 					}
 			});
+		klass.getSingletonClass().defineMethod("get_source_property",
+				new RubyTwoArgMethod() {
+					protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyValue arg1, RubyBlock block) {
+						try{
+							Integer nSrcID = new Integer(arg0.toInt());
+							String strPropName = arg1.toStr();
+							
+							return ObjectFactory.createString(SyncEngine.getSourceOptions().getProperty(nSrcID, strPropName) );
+						}catch(Exception e)
+						{
+							LOG.ERROR("get_src_attrs failed", e);
+							throw (e instanceof RubyException ? (RubyException)e : new RubyException(e.getMessage()));
+						}
+					}
+			});
+		
 		klass.getSingletonClass().defineMethod("set_ssl_verify_peer",
 				new RubyOneArgMethod() {
 					protected RubyValue run(RubyValue receiver, RubyValue arg1, RubyBlock block) {

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/AttrReader.java

@@ -28,7 +28,7 @@ public class AttrReader extends RubyNoArgMethod {
     
     public RubyMethod clone(){
     	AttrReader cl = new AttrReader("");
-    	cl.doClone(this);
+    	cl.doClone((RubyMethod)this);
     	return cl;
     }
     

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyFixnum.java

@@ -30,7 +30,9 @@ public class RubyFixnum extends RubyInteger {
     }
 
 	public RubyValue clone() {
-		throw new RubyException(RubyRuntime.TypeErrorClass, "can't clone " + this.getRubyClass().getName());
+		RubyFixnum cl = new RubyFixnum(this.value_);
+		cl.doClone((RubyValue)this);
+		return cl;
 	}
     
 	public int toInt() {

data/platform/bb/RubyVM/src/com/xruby/runtime/builtin/RubyHash.java

@@ -22,7 +22,7 @@ public class RubyHash extends RubyBasic {
 
     public RubyValue clone() {
     	RubyHash cl = new RubyHash();
-	  	cl.doClone(this);
+	  	cl.doClone((RubyValue)this);
 	  	return cl;
     }
     

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyAPI.java

@@ -234,7 +234,7 @@ public class RubyAPI {
     public static RubyValue callMethod(RubyValue receiver, RubyArray args, RubyBlock block, RubyID mid) 
     {
     	try{
-	    	AssertMe.rho_assert(null == args || args.size() > 1);//use callOneArgMethod if has only one arg
+	    	//AssertMe.rho_assert(null == args || args.size() > 1);//use callOneArgMethod if has only one arg
 	        RubyMethod m = receiver.findMethod(mid);
 	        if (null != m && !UndefMethod.isUndef(m)) {
 	            return m.invoke(receiver, args, block);
@@ -617,6 +617,24 @@ public class RubyAPI {
 
         return RubyConstant.QTRUE;
     }
+
+    public static RubyValue callGlobalNoArgMethod(RubyBlock block, RubyID mid) 
+    {
+		RubyModule module = RubyRuntime.KernelModule;
+    	
+    	try{
+	        RubyMethod m = module.findMethod(mid);
+	        if (null != m && !UndefMethod.isUndef(m)) {
+	            return m.invoke(module, block);
+	        }
+	
+	        return callMethodMissing(module, null, block, mid);
+    	}catch(Exception e)
+		{
+    		return processException(e,module,mid);
+		}
+	        
+    }
     
     private static RubyValue callUninitializedConstant(RubyModule module, String name) 
     {

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBasic.java

@@ -12,6 +12,8 @@ public abstract class RubyBasic extends RubyValue {
     public RubyBasic(RubyClass c) {
 		this.class_ = c;
 	}
+    public RubyBasic() {
+	}
 
     public void setRubyClass(RubyClass c) {
         class_ = c;
@@ -20,4 +22,11 @@ public abstract class RubyBasic extends RubyValue {
     public RubyClass getRubyClass() {
         return class_;
     }
+    
+    protected void doClone(RubyBasic orig)
+    {
+    	class_ = orig.class_;
+    	super.doClone(orig);
+    }
+    
 }

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyBinding.java

@@ -27,16 +27,16 @@ public class RubyBinding extends RubyBasic {
 
     public RubyValue clone(){
     	RubyBinding cl = new RubyBinding(this.class_);
-    	cl.doClone(this);
+    	cl.doClone((RubyValue)this);
     	return cl;
     }
     protected void doClone(RubyValue orig){
     	RubyBinding cl = (RubyBinding)orig; 
     	scope_ = cl.scope_;
-    	self_ = cl.self_;
+    	self_ = cl.self_.clone();
     	block_ = cl.block_;
-    	variables_ = cl.variables_;
-    	names_ = cl.names_;
+    	variables_ = (RubyArray)cl.variables_.clone();
+    	names_ = new ArrayList(cl.names_);
     	
     	super.doClone(orig);
     }

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyModule.java

@@ -53,6 +53,18 @@ public class RubyModule extends RubyObject {
         scope_ = owner;
     }
 
+    public RubyValue clone()
+    { 
+    	RubyModule cl = null;
+    	try{
+    		cl = (RubyModule)(this.getClass().newInstance());
+    		cl.doClone(this);
+    	}catch(Exception e){
+    		throw new RubyException(RubyRuntime.ExceptionClass, e.toString());    		
+    	}
+    	return cl; 
+    }
+    
     protected void doClone(RubyValue orig){
     	RubyModule m = (RubyModule)orig;
     	name_ = m.name_;
@@ -63,7 +75,7 @@ public class RubyModule extends RubyObject {
     	methods_ = m.methods_;
     	constants_ = m.constants_;
     	
-    	super.doClone(orig);
+    	super.doClone((RubyObject)orig);
     }
     
     public String getName() {

data/platform/bb/RubyVM/src/com/xruby/runtime/lang/RubyObject.java

@@ -22,10 +22,25 @@ public class RubyObject extends RubyBasic {
 	public RubyObject(RubyClass c) {
 		super(c);
 	}
+	public RubyObject() {
+		super();
+	}
+	
+    public RubyValue clone()
+    { 
+    	RubyObject cl = null;
+    	try{
+    		cl = (RubyObject)(this.getClass().newInstance());
+    		cl.doClone(this);
+    	}catch(Exception e){
+    		throw new RubyException(RubyRuntime.ExceptionClass, e.toString());    		
+    	}
+    	return cl; 
+    }
 	
     protected void doClone(RubyObject orig)
     {
-    	instance_varibles_ = orig.instance_varibles_;
+    	instance_varibles_ = new HashMap(orig.instance_varibles_);
     	super.doClone(orig);
     }
 	

data/platform/bb/build/bb.rake

@@ -962,6 +962,8 @@ namespace "clean" do
       command =  "clean.bat"
       args = []
       Jake.run2 command, args, {:directory => $bb_sim_path, :system => true}
+      
+      rm_rf $bb_sim_path + "/sdcard/Rho" if File.exists?($bb_sim_path + "/sdcard/Rho")
   end
   
   namespace "bb" do
@@ -1006,7 +1008,7 @@ namespace "run" do
 
       task :spec => ["config:checkbb", "run:bb:stopmdsandsim", "clean:bbsim", "package:bb:production_sim"] do
         cp_r File.join($targetdir,"/."), $bb_sim_path
-        rm_rf $bb_sim_path + "/sdcard/Rho"
+        #rm_rf $bb_sim_path + "/sdcard/Rho"
 
         log_name = $bb_sim_path + "/sdcard/Rho/" + $outfilebase + "/RhoLog.txt"
         puts log_name

data/platform/bb/build/rhodes_build.files

@@ -6,7 +6,6 @@ platform/bb/rhodes/src/com/rho/rubyext/XMLParser.java
 platform/bb/rhodes/src/com/rho/rubyext/Alert.java
 platform/bb/rhodes/src/com/rho/rubyext/RhoPhonebook.java
 platform/bb/rhodes/src/com/rho/rubyext/RhoCalendar.java
-platform/bb/rhodes/src/com/rho/rubyext/PNGEncoder.java
 platform/bb/rhodes/src/com/rho/net/BaseSocket.java
 platform/bb/rhodes/src/com/rho/net/bb/BBHttpConnection.java
 platform/bb/rhodes/src/com/rho/net/bb/NativeBBHttpConnection.java

data/platform/bb/rhodes/platform/4.7/com/rho/rubyext/SignatureCapture.java

@@ -128,25 +128,20 @@ public class SignatureCapture extends MainScreen
 	 */
 	private MenuItem _captureItem = new MenuItem("Capture", 200000, 10) {
 		public void run() {
-			//Create a new instance of the encoder to encode the bitmap into an image
-			PNGEncoder encoder = new PNGEncoder(_bitmap, true);
+	        net.rim.device.api.system.PNGEncodedImage encodedImage = net.rim.device.api.system.PNGEncodedImage.encode(_bitmap);
+			byte[] imageBytes = encodedImage.getData();
 			try {
-				byte[] imageBytes = encoder.encode(true);
-				EncodedImage image = EncodedImage.createEncodedImage(imageBytes, 0, imageBytes.length);
-				try {
-					String fileName = getFilePath();
-					
-					FileConnection fconn = (FileConnection) Connector.open(fileName);
-					if (!fconn.exists())
-						fconn.create();
-					DataOutputStream ds = fconn.openDataOutputStream();
-					ds.write(image.getData());
-					ds.close();
-					fconn.close();
-				} catch (Exception e) {
-					LOG.ERROR("Save signature failed.", e);
-				}
-			} catch (IOException e) {
+				String fileName = getFilePath();
+				
+				FileConnection fconn = (FileConnection) Connector.open(fileName);
+				if (!fconn.exists())
+					fconn.create();
+				java.io.OutputStream outputStream = fconn.openOutputStream();
+				outputStream.write(imageBytes);
+		        outputStream.close();   
+		        
+				fconn.close(); 
+			} catch (Exception e) {
 				LOG.ERROR("Save signature failed.", e);
 			}
 			

data/platform/bb/rhodes/platform/5.0/com/rho/BrowserAdapter5.java

@@ -102,7 +102,7 @@ public class BrowserAdapter5 implements IBrowserAdapter
 			if ( url.startsWith("http:/") && !url.startsWith("http://") )
 				url = RhodesApp.getInstance().getHomeUrl() + url.substring(5);
 				
-    		if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
+    		//if ( RhodesApp.getInstance().isRhodesAppUrl(url) ) //|| URI.isLocalData(url) )
     		{
                 HttpConnection connection = Utilities.makeConnection(url, request.getHeaders(), null, null);
 
@@ -119,8 +119,8 @@ public class BrowserAdapter5 implements IBrowserAdapter
                 }
                 
                 return connection;
-    		}else
-    			return super.handleResourceRequest(request);
+    		}//else
+    		//	return super.handleResourceRequest(request);
 		}
 
 		public void setNavigationRequestHandler(String protocol,
@@ -224,6 +224,16 @@ public class BrowserAdapter5 implements IBrowserAdapter
 		    			m_oMainScreen.add(browserField);
 		    		}
 		     	}
+		    	
+				try {
+					IRhoRubyHelper helper = RhoClassFactory.createRhoRubyHelper();
+					if ( helper != null )
+						helper.wakeUpGeoLocation();
+				}catch(Exception exc)
+				{
+					LOG.ERROR("wakeUpGeoLocation failed", exc);
+				}
+		    	
 		     }
 		};
 		m_oBrowserField.addListener( _listener );