rhodes 3.4.2 → 3.5.1.12

data/platform/shared/sync/SyncSource.h

@@ -145,7 +145,7 @@ public:
     int  getTotalCount(){return m_nTotalCount;}
 
     void processServerResponse_ver3(json::CJSONArrayIterator& oJsonArr);
-    void processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttrib, const String& strValue);//throws Exception
+    void processServerCmd_Ver3(const String& strCmd, const String& strObject, const String& strAttrib, const String& strValue, boolean bCheckUIRequest);//throws Exception
 
     String makeFileName(const CAttrValue& value);//throws Exception
     boolean downloadBlob(CAttrValue& value);//throws Exception
@@ -159,7 +159,7 @@ public:
 
     void processSyncCommand(const String& strCmd, json::CJSONEntry oCmdEntry, boolean bCheckUIRequest );
 
-    void processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, json::CJSONStructIterator& attrIter);//throws Exception
+    void processServerCmd_Ver3_Schema(const String& strCmd, const String& strObject, json::CJSONStructIterator& attrIter, boolean bCheckUIRequest);//throws Exception
 
     void parseAssociations(const String& strAssociations);
     void processAssociations(const String& strOldObject, const String& strNewObject);
@@ -169,13 +169,16 @@ public:
     void processServerErrors(json::CJSONEntry& oCmds);
 
     void checkProgressStepNotify(boolean bEndTransaction);
+    boolean checkFreezedProps(String strProp);
+	
+	bool haveChangedValues();
 
 private:
     CSyncEngine& getSync(){ return m_syncEngine; }
     CSyncNotify& getNotify();
     net::CNetRequestWrapper getNet();
     ISyncProtocol& getProtocol();
-
+	
 };
 
 }

data/platform/shared/sync/SyncThread.cpp

@@ -139,7 +139,7 @@ int CSyncThread::getLastPollInterval()
 void CSyncThread::onTimeout()//throws Exception
 {
     if ( isNoCommands() && getPollInterval()>0 )
-        addQueueCommandInt(new CSyncCommand(scSyncAll,false,""));
+        addQueueCommandInt(new CSyncCommand(scSyncAll,false,"",false));
 }
 
 void CSyncThread::checkShowStatus(CSyncCommand& oSyncCmd)
@@ -158,7 +158,7 @@ void CSyncThread::processCommand(IQueueCommand* pCmd)
     {
     case scSyncAll:
         checkShowStatus(oSyncCmd);
-        m_oSyncEngine.doSyncAllSources(oSyncCmd.m_strQueryParams);
+        m_oSyncEngine.doSyncAllSources(oSyncCmd.m_strQueryParams,oSyncCmd.m_bSyncOnlyChangedSources);
         break;
     case scSyncOne:
         {
@@ -255,9 +255,9 @@ extern "C" {
 using namespace rho::sync;
 using namespace rho::db;
 	
-unsigned long rho_sync_doSyncAllSources(int show_status_popup, const char * query_params/* = 0*/)
+unsigned long rho_sync_doSyncAllSources(int show_status_popup, const char * query_params/* = 0*/, int sync_only_changed_sources)
 {
-    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncAll,show_status_popup!=0,query_params));
+    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncAll,show_status_popup!=0,query_params,sync_only_changed_sources!=0));
 
     return CSyncThread::getInstance()->getRetValue();
 }
@@ -278,7 +278,7 @@ unsigned long rho_sync_doSyncSourceByName(const char* szSrcName)
 unsigned long rho_sync_doSyncSource(unsigned long nSrcID,int show_status_popup, const char * query_params/* = 0*/)
 {
     CRhoRubyStringOrInt oSrcID = rho_ruby_getstringorint(nSrcID);
-    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncOne, oSrcID.m_szStr, (int)oSrcID.m_nInt, show_status_popup!=0, query_params ) );
+    CSyncThread::getInstance()->addQueueCommand(new CSyncThread::CSyncCommand(CSyncThread::scSyncOne, oSrcID.m_szStr, (int)oSrcID.m_nInt, show_status_popup!=0, query_params, false ) );
 
     return CSyncThread::getInstance()->getRetValue();
 }	
@@ -361,14 +361,12 @@ void rho_sync_set_syncserver(const char* syncserver)
     if ( syncserver && *syncserver )
     {
         CSyncThread::getInstance()->start(CSyncThread::epLow);
-        if ( CClientRegister::getInstance() != null )
-            CClientRegister::getInstance()->startUp();
+        //CClientRegister::Create();
     }
     else
     {
         CSyncThread::getInstance()->stop(CSyncThread::SYNC_WAIT_BEFOREKILL_SECONDS);
-        if ( CClientRegister::getInstance() != null )
-            CClientRegister::getInstance()->stop(CSyncThread::SYNC_WAIT_BEFOREKILL_SECONDS);
+        CClientRegister::Stop();
     }
 }
 
@@ -526,12 +524,7 @@ void rho_sync_set_ssl_verify_peer(int b)
 
 void rho_sync_register_push()
 {
-    if ( CClientRegister::getInstance() != null )
-    {
-        rho::db::CDBAdapter::getUserDB().executeSQL("UPDATE client_info SET token_sent=?", 0 );
-        CClientRegister::getInstance()->startUp();
-    }
-
+    RAWLOG_WARNING("'register_push' is not implemented!");
 }
 
 }

data/platform/shared/sync/SyncThread.h

@@ -55,36 +55,41 @@ public:
 	    int m_nCmdParam;
 	    String m_strCmdParam, m_strQueryParams;
    		boolean m_bShowStatus;
+		boolean m_bSyncOnlyChangedSources;
 
-	    CSyncCommand(int nCode, int nParam, boolean bShowStatus, const char * query_params)
+	    CSyncCommand(int nCode, int nParam, boolean bShowStatus, const char * query_params, boolean bSyncOnlyChangedSources = false)
 	    {
 		    m_nCmdCode = nCode;
 		    m_nCmdParam = nParam;
             m_bShowStatus = bShowStatus;
             m_strQueryParams = query_params ? query_params : "";
+			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
 	    }
-	    CSyncCommand(int nCode, String strParam, boolean bShowStatus, const char * query_params)
+	    CSyncCommand(int nCode, String strParam, boolean bShowStatus, const char * query_params, boolean bSyncOnlyChangedSources = false )
 	    {
 		    m_nCmdCode = nCode;
 		    m_strCmdParam = strParam;
             m_bShowStatus = bShowStatus;
             m_strQueryParams = query_params ? query_params : "";
+			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
 	    }
-	    CSyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus, const char * query_params)
+	    CSyncCommand(int nCode, String strParam, int nCmdParam, boolean bShowStatus, const char * query_params, boolean bSyncOnlyChangedSources = false)
 	    {
 		    m_nCmdCode = nCode;
 		    m_strCmdParam = strParam;
             m_nCmdParam = nCmdParam;
             m_bShowStatus = bShowStatus;
             m_strQueryParams = query_params ? query_params : "";
+			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
 	    }
 
-	    CSyncCommand(int nCode, boolean bShowStatus, const char * query_params)
+	    CSyncCommand(int nCode, boolean bShowStatus, const char * query_params, boolean bSyncOnlyChangedSources = false)
 	    {
 		    m_nCmdCode = nCode;
 		    m_nCmdParam = 0;
             m_bShowStatus = bShowStatus;
             m_strQueryParams = query_params ? query_params : "";
+			m_bSyncOnlyChangedSources = bSyncOnlyChangedSources;
 	    }
 
 	    boolean equals(const IQueueCommand& cmd)
@@ -92,7 +97,8 @@ public:
             const CSyncCommand& oSyncCmd = (const CSyncCommand&)cmd;
 		    return m_nCmdCode == oSyncCmd.m_nCmdCode && m_nCmdParam == oSyncCmd.m_nCmdParam &&
 			    m_strCmdParam == oSyncCmd.m_strCmdParam &&
-                m_strQueryParams == oSyncCmd.m_strQueryParams;
+                m_strQueryParams == oSyncCmd.m_strQueryParams &&
+				m_bSyncOnlyChangedSources == oSyncCmd.m_bSyncOnlyChangedSources;
 	    }
 
         virtual String toString();
@@ -105,7 +111,7 @@ public:
 	    String m_strName, m_strPassword;
         common::CAutoPtr<CSyncNotification> m_pNotify;
         CSyncLoginCommand(String name, String password, CSyncNotification* pNotify) : 
-            CSyncCommand(CSyncThread::scLogin,"",false,NULL)
+            CSyncCommand(CSyncThread::scLogin,"",false,"", false)
 	    {
 		    m_strName = name;
 		    m_strPassword = password;
@@ -165,7 +171,7 @@ private:
 extern "C" {
 #endif //__cplusplus
 	
-unsigned long rho_sync_doSyncAllSources(int show_status_popup, const char * query_params);
+unsigned long rho_sync_doSyncAllSources(int show_status_popup, const char * query_params, int sync_only_changed_sources);
 unsigned long rho_sync_doSyncSource(unsigned long nSrcID,int show_status_popup, const char * query_params);
 unsigned long rho_sync_doSyncSourceByID(int nSrcID);
 unsigned long rho_sync_doSyncSourceByName(const char* szSrcName);

data/platform/shared/unzip/unzip.cpp

@@ -3913,7 +3913,7 @@ ZRESULT TUnzip::Open(void *z,unsigned int len,DWORD flags)
 { if (uf!=0 || currentfile!=-1) return ZR_NOTINITED;
   //
 #ifdef ZIP_STD
-  getcwd(rootdir,MAX_PATH-1);
+//  getcwd(rootdir,MAX_PATH-1);
 #else
 #ifdef GetCurrentDirectory
   GetCurrentDirectory(MAX_PATH-1,rootdir);

data/platform/shared/unzip/zip.h

@@ -1,7 +1,6 @@
 #if defined(WIN32) || defined(_WIN32_WCE)
 #else
 #define ZIP_STD
-
 #endif
 
 #ifdef ZIP_STD
@@ -15,6 +14,8 @@
 #include <string.h>
 #include <ctype.h>
 
+#include "../common/RhoDefs.h"
+
 // # i n c l u d e "zip.h"
 //
 typedef unsigned short WORD;
@@ -34,7 +35,11 @@ typedef unsigned short WORD;
 
 //
 #else
+
+#if !defined(OS_WP8)
 #include <windows.h>
+#endif
+
 #include <tchar.h>
 #include <ctype.h>
 #include <stdio.h>
@@ -50,10 +55,12 @@ typedef unsigned short WORD;
 #ifndef MAX_PATH
 #define MAX_PATH 1024
 #endif
+
 typedef unsigned long DWORD;
 typedef char TCHAR;
 typedef FILE* HANDLE;
 typedef time_t FILETIME;
+
 #endif
 
 // ZIP functions -- for creating zip files

data/platform/shared/xruby/src/com/xruby/runtime/builtin/AttrReader.java

@@ -9,6 +9,7 @@ import com.xruby.runtime.lang.RubyBlock;
 import com.xruby.runtime.lang.RubyID;
 import com.xruby.runtime.lang.RubyNoArgMethod;
 import com.xruby.runtime.lang.RubyValue;
+import com.xruby.runtime.lang.RubyMethod;
 
 public class AttrReader extends RubyNoArgMethod {
     private RubyID attrName;
@@ -24,4 +25,16 @@ public class AttrReader extends RubyNoArgMethod {
     protected RubyValue run(RubyValue receiver, RubyBlock block) {
         return receiver.getInstanceVariable(attrName);
     }
+    
+    public RubyMethod clone(){
+    	AttrReader cl = new AttrReader("");
+    	cl.doClone((RubyMethod)this);
+    	return cl;
+    }
+    
+    protected void doClone(RubyMethod orig){
+    	attrName = ((AttrReader)orig).attrName;
+    	
+    	super.doClone(orig);
+    }
 }

data/platform/shared/xruby/src/com/xruby/runtime/builtin/RubyFixnum.java

@@ -31,7 +31,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/shared/xruby/src/com/xruby/runtime/lang/MethodBlockBase.java

@@ -18,6 +18,15 @@ public abstract class MethodBlockBase {
         default_argc_ = default_argc;
     }
 
+    protected void doClone(MethodBlockBase orig)
+    {
+    	argc_ = orig.argc_;
+    	has_asterisk_parameter_ = orig.has_asterisk_parameter_;
+    	default_argc_ = orig.default_argc_;
+    	default_values_ = orig.default_values_;
+    	scopeOfCurrentMethod_= orig.scopeOfCurrentMethod_;
+    }
+
     public int arity() {
         if (has_asterisk_parameter_ || default_argc_ > 0) {
             return -(argc_ - default_argc_) - 1;

data/platform/shared/xruby/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/shared/xruby/src/com/xruby/runtime/lang/RubyBinding.java

@@ -23,6 +23,23 @@ public class RubyBinding extends RubyBasic {
 		super(RubyRuntime.BindingClass);
 	}
 
+    public RubyValue clone(){
+    	RubyBinding cl = new RubyBinding(this.class_);
+    	cl.doClone((RubyValue)this);
+    	return cl;
+    }
+    
+    protected void doClone(RubyValue orig){
+    	RubyBinding cl = (RubyBinding)orig; 
+    	scope_ = (RubyModule)cl.scope_.clone();
+    	self_ = cl.self_.clone();
+    	block_ = cl.block_;
+    	variables_ = (RubyArray)cl.variables_.clone();
+    	names_ = new ArrayList(cl.names_);
+    	
+    	super.doClone(orig);
+    }
+	
 	public boolean hasName(String name) {
 		return names_.indexOf(name) >= 0;
 	}

data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyMethod.java

@@ -21,8 +21,28 @@ public abstract class RubyMethod extends MethodBlockBase implements Cloneable {
         super(argc, has_asterisk_parameter, default_argc);
         access_ = PUBLIC;
     }
+
+    public RubyMethod clone()
+    { 
+    	RubyMethod cl = null;
+    	try{
+    		cl = (RubyMethod)(this.getClass().newInstance());
+    		cl.doClone(this);
+    	}catch(Exception e){
+    		throw new RubyException(RubyRuntime.ExceptionClass, e.toString());    		
+    	}
+    	return cl; 
+    }
     
-    public RubyMethod clone() {
+    protected void doClone(RubyMethod orig)
+    {
+    	access_ = orig.access_;
+    	id_ = orig.id_;
+    	
+    	super.doClone(orig);
+    }    
+    
+    /*public RubyMethod clone() {
     	RubyMethod v;
         try {
             v = (RubyMethod) super.clone();
@@ -30,7 +50,7 @@ public abstract class RubyMethod extends MethodBlockBase implements Cloneable {
             throw new RubyException(RubyRuntime.ExceptionClass, e.toString());
         }
         return v;
-    }
+    }*/
 
     void setID(RubyID id) {
         id_ = id;

data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyModule.java

@@ -49,6 +49,31 @@ public class RubyModule extends RubyBasic {
         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_;
+    	scope_ = m.scope_;
+    	superclass_ = m.superclass_;
+    	current_access_mode_ = m.current_access_mode_;
+    	//instance_varibles_ = m.instance_varibles_;
+    	methods_ = m.methods_;
+    	constants_ = m.constants_;
+    	
+    	super.doClone((RubyObject)orig);
+    }
+
     public String getName() {
         return name_;
     }

data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyObject.java

@@ -19,6 +19,27 @@ 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_ = new HashMap(orig.instance_varibles_);
+    	super.doClone(orig);
+    }
 	
 	@RubyAllocMethod
 	public static RubyValue alloc(RubyValue receiver) {

data/platform/shared/xruby/src/com/xruby/runtime/lang/RubyValue.java

@@ -47,6 +47,9 @@ abstract class BlockCallStatus {
         }
         return returned_in_block_;
     }
+    protected void doClone(BlockCallStatus orig){
+    	setReturnedInBlock(this.returned_in_block_, this.breaked_in_block_, this.do_not_allow_break_);
+    }
 
 }
 
@@ -67,6 +70,11 @@ public abstract class RubyValue extends BlockCallStatus implements Cloneable {
         }
         return v;
     }
+    protected void doClone(RubyValue orig){
+        frozen_ = orig.frozen_;
+        taint_ = orig.taint_;
+        super.doClone(orig);
+    }
 
     public boolean equals(Object o) {
         if (this == o) {