rhodes 3.3.3.beta.4 → 3.3.3

data/platform/shared/ruby/gc.c

@@ -24,6 +24,7 @@
 #include <sys/types.h>
 
 //RHO
+#include "tcmalloc/rhomem.h"
 int rhoRubyFPrintf(FILE *, const char *, ...);
 int rhoRubyPrintf(const char *, ...);
 #ifndef USE_STD_PRINTF

data/platform/shared/ruby/regint.h

@@ -85,10 +85,12 @@
 /* escape other system UChar definition */
 #ifndef RUBY_DEFINES_H
 #include "ruby/ruby.h"
-#undef xmalloc
-#undef xrealloc
-#undef xcalloc
-#undef xfree
+//RHO
+//#undef xmalloc
+//#undef xrealloc
+//#undef xcalloc
+//#undef xfree
+//RHO
 #endif
 #ifdef ONIG_ESCAPE_UCHAR_COLLISION
 #undef ONIG_ESCAPE_UCHAR_COLLISION

data/platform/shared/ruby/vm.c

@@ -18,6 +18,7 @@
 #include "eval_intern.h"
 
 //RHO
+#include "tcmalloc/rhomem.h"
 int rhoRubyFPrintf(FILE *, const char *, ...);
 #ifndef USE_STD_PRINTF
 #define fprintf rhoRubyFPrintf

data/platform/shared/ruby/wince/wince.h

@@ -4,7 +4,7 @@
 
 #include <tchar.h>
 #include <winsock2.h>
-#include "tcmalloc/rhomem.h"
+//#include "tcmalloc/rhomem.h"
 
 #ifndef _OFF_T_DEFINED
 

data/platform/shared/rubyext/System.cpp

@@ -134,7 +134,7 @@ VALUE rho_sys_get_property(char* szPropName)
         return rho_ruby_create_boolean(passed);
     }
 
-	if (strcasecmp("is_moto_device",szPropName) == 0)
+	if (strcasecmp("is_motorola_device",szPropName) == 0)
 #ifdef APP_BUILD_CAPABILITY_MOTOROLA
         return rho_ruby_create_boolean(1);
 #else

data/platform/shared/shttpd/src/rdispatcher.c

@@ -11,7 +11,7 @@
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "RDispatcher"
 
-#if defined(__SYMBIAN32__) || defined(OS_WINDOWS) || defined(OS_WINCE)
+#if defined(__SYMBIAN32__) || defined(WINDOWS_PLATFORM)
 extern char* get_home_url();
 #else
 /*static char* localhost = "http://localhost:8080";*/
@@ -274,7 +274,7 @@ char* rho_resolve_url(char* url, const char* root,const char *index_names) {
 		}
 	}
 	
-#if defined(__SYMBIAN32__) || defined(OS_WINDOWS) || defined(OS_WINCE)	
+#if defined(__SYMBIAN32__) || defined(WINDOWS_PLATFORM)	
 	full_len = strlen(get_home_url())+strlen(tmp_url)+1;
 	ret = malloc(full_len);
 	_shttpd_snprintf(ret, full_len, "%s%s", get_home_url(), tmp_url);	
@@ -408,7 +408,7 @@ void rho_create_write_state(struct shttpd_arg *arg, VALUE data)
 
     state->data = data;
     state->nDataLen = getStringLenFromValue(data);
-#if defined(OS_WINDOWS)
+#if defined(OS_WINDOWS_DESKTOP)
 	{
 		char* reply = getStringFromValue(state->data);
 		RAWTRACE1("Reply: [%s]",reply);

data/platform/shared/shttpd/src/std_includes.h

@@ -11,7 +11,7 @@
 #ifndef STD_HEADERS_INCLUDED
 #define	STD_HEADERS_INCLUDED
 
-#include "tcmalloc/rhomem.h"
+//#include "tcmalloc/rhomem.h"
 #include "config.h"
 
 #ifdef __SYMBIAN32__

data/platform/shared/sqlite/sqlite3.c

@@ -25,6 +25,7 @@
 #define SQLITE_OMIT_UTF16
 #define SQLITE_TEMP_STORE 2
 #define SQLITE_HAS_CODEC 1
+#include "tcmalloc/rhomem.h"
 // RHO
 
 #define SQLITE_CORE 1

data/platform/shared/statistic/test/TestProfiling.cpp

@@ -27,7 +27,7 @@
 #include "statistic/RhoProfiler.h"
 #include "logging/RhoLog.h"
 
-#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#if !defined(WINDOWS_PLATFORM)
 #include <unistd.h>
 #define Sleep sleep
 #endif

data/platform/shared/sync/SyncEngine.cpp

@@ -252,7 +252,10 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
 
         const char* szData = null;
         if ( strTestResp.length() > 0 )
+        {
             szData = strTestResp.c_str();
+            getNotify().setFakeServerResponse(true);
+        }
         else
             szData = resp.getCharData();
 
@@ -311,15 +314,6 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
             pSrc->processServerResponse_ver3(oSrcArr);
 
             nSearchCount += pSrc->getCurPageCount();
-
-            if ( pSrc->getServerError().length() > 0 )
-            {
-                if ( m_strServerError.length() > 0 )
-                    m_strServerError +=  "&";
-
-                m_strServerError += pSrc->getServerError();
-                m_nErrCode = pSrc->getErrorCode();
-            }
         }
 
         if ( nSearchCount == 0 )
@@ -333,6 +327,9 @@ void CSyncEngine::doSearch(rho::Vector<rho::String>& arSources, String strParams
 
             break;
         }
+
+        if ( strTestResp.length() > 0 )
+            break;
     }  
 
     getNotify().fireAllSyncNotifications(true, m_nErrCode, m_strError, m_strServerError);
@@ -637,7 +634,7 @@ void CSyncEngine::doBulkSync()//throws Exception
     if (isContinueSync())
     {
         RHOCONF().setInt("bulksync_state", 1, true);
-        getNotify().fireBulkSyncNotification(true, "", "", RhoAppAdapter.ERR_NONE);
+        getNotify().fireBulkSyncNotification(true, "complete", "", RhoAppAdapter.ERR_NONE);
     }
 }
 
@@ -687,7 +684,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     if ( strCmd.compare("nop") == 0)
     {
 	    LOG(INFO) + "Bulk sync return no data.";
-      	getNotify().fireBulkSyncNotification(true, "", strPartition, RhoAppAdapter.ERR_NONE);
+      	getNotify().fireBulkSyncNotification(true, "ok", strPartition, RhoAppAdapter.ERR_NONE);
 
 	    return;
     }
@@ -734,7 +731,7 @@ void CSyncEngine::loadBulkPartition(const String& strPartition )
     processServerSources(String("{\"partition\":\"") + strPartition + "\"}");
 
 	LOG(INFO) + "Bulk sync: end change db";
-   	getNotify().fireBulkSyncNotification(false, "", strPartition, RhoAppAdapter.ERR_NONE);
+   	getNotify().fireBulkSyncNotification(false, "ok", strPartition, RhoAppAdapter.ERR_NONE);
 }
 
 String CSyncEngine::makeBulkDataFileName(String strDataUrl, String strDbPath, String strExt)

data/platform/shared/sync/SyncNotify.cpp

@@ -31,6 +31,10 @@
 #include "common/RhoAppAdapter.h"
 #include "common/RhodesApp.h"
 
+#ifndef RHO_NO_RUBY
+    #include "rubyext/WebView.h"
+#endif
+
 namespace rho {
 namespace sync {
 IMPLEMENT_LOGCLASS(CSyncNotify,"Sync");
@@ -163,7 +167,9 @@ void CSyncNotify::fireObjectsNotification()
         callNotify( CSyncNotification(strUrl,"",false), strBody);
     }else if (m_pObjectNotify->m_cCallback)
     {
+        m_isInsideCallback = true;
         (*m_pObjectNotify->m_cCallback)(strBody.c_str(), m_pObjectNotify->m_cCallbackData);
+        m_isInsideCallback = false;
         //callNotify( CSyncNotification(m_pObjectNotify->m_cCallback,m_pObjectNotify->m_cCallbackData,false), strBody);
     }
 }
@@ -438,6 +444,11 @@ CSyncNotification* CSyncNotify::getSyncNotifyBySrc(CSyncSource* src)
     return pSN != null ? pSN : &m_emptyNotify;
 }
 
+void CSyncNotify::fireSyncNotification2( CSyncSource* src, boolean bFinish, int nErrCode, String strServerError)
+{
+    doFireSyncNotification(src, bFinish, nErrCode, "", "", strServerError);
+}
+
 void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int nErrCode, String strError, String strParams, String strServerError)
 {
 	if ( getSync().isStoppedByUser() )
@@ -495,8 +506,6 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
 
                     if ( strServerError.length() > 0 )
                         strBody += "&" + strServerError;
-                    else if ( src != null && (*src).m_strServerError.length() > 0  )
-                        strBody += "&" + (*src).m_strServerError;
 	            }
 
                 if ( src != null )
@@ -523,22 +532,45 @@ void CSyncNotify::doFireSyncNotification( CSyncSource* src, boolean bFinish, int
         clearNotification(src);
 }
 
+const String& CSyncNotify::getNotifyBody()
+{
+    const static String emptyBody = String();
+    if ( m_arNotifyBody.size() == 0 )
+        return emptyBody;
+
+    if ( isFakeServerResponse() )
+        return m_arNotifyBody[0];
+
+    return m_arNotifyBody[m_arNotifyBody.size()-1];
+}
+
 boolean CSyncNotify::callNotify(const CSyncNotification& oNotify, const String& strBody )
 {
     String strUrl = oNotify.m_strUrl; //Need to copy url since notify may be cleared in callback
     if ( getSync().isNoThreadedMode() )
     {
-        m_strNotifyBody = strBody;
+        m_arNotifyBody.addElement( strBody );
         return false;
     }
     if ( oNotify.m_cCallback )
     {
+        m_isInsideCallback = true;        
         int nRet = (*oNotify.m_cCallback)(strBody.c_str(), oNotify.m_cCallbackData);
+        m_isInsideCallback = false;
         return nRet == 1;
     }
     if ( strUrl.length() == 0 )
         return true;
 
+#ifndef RHO_NO_RUBY
+    if (0 == strUrl.find("javascript:"))
+    {
+        String js = strUrl.substr(11) + "('" + strBody + "');";
+        rho_webview_execute_js(js.c_str(), -1);
+    	return true;
+    }
+#endif
+
     NetResponse resp = getNet().pushData( strUrl, strBody, null );
     if ( !resp.isOK() )
         LOG(ERROR) + "Fire notification failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
@@ -627,6 +659,7 @@ void CSyncNotify::callLoginCallback(const CSyncNotification& oNotify, int nErrCo
 	//	LOG.ERROR("Call Login callback failed.", exc);
 	//}
 }
+
 }
 }
 

data/platform/shared/sync/SyncNotify.h

@@ -104,8 +104,10 @@ private:
     common::CAutoPtr<CSyncNotification> m_pSearchNotification;
     CSyncNotification m_emptyNotify;
     common::CMutex m_mxSyncNotifications;
-    String m_strNotifyBody;
+    Vector<String> m_arNotifyBody;
     String m_strStatusHide;
+    boolean m_bFakeServerResponse;
+    boolean m_isInsideCallback;
 
    	NetRequest     m_NetRequest;
 
@@ -113,7 +115,7 @@ private:
     CSyncEngine& getSync(){ return m_syncEngine; }
 public:
     CSyncNotify( CSyncEngine& syncEngine ) : m_syncEngine(syncEngine), m_bEnableReporting(false), 
-        m_bEnableReportingGlobal(false){}
+        m_bEnableReportingGlobal(false), m_bFakeServerResponse(false), m_isInsideCallback(false) {}
 
     //Object notifications
     void fireObjectsNotification();
@@ -135,6 +137,7 @@ public:
 
     void onSyncSourceEnd( int nSrc, VectorPtr<CSyncSource*>& sources );
     void fireSyncNotification( CSyncSource* psrc, boolean bFinish, int nErrCode, String strMessage);
+    void fireSyncNotification2( CSyncSource* src, boolean bFinish, int nErrCode, String strServerError);
 
     void fireBulkSyncNotification( boolean bFinish, String status, String partition, int nErrCode );
 
@@ -148,12 +151,16 @@ public:
     void enableReporting(boolean bEnable){m_bEnableReporting = bEnable;}
     void enableStatusPopup(boolean bEnable){m_bEnableReportingGlobal = bEnable;}
 
-    const String& getNotifyBody(){ return m_strNotifyBody; }
-    void cleanNotifyBody(){ m_strNotifyBody = ""; }
+    const String& getNotifyBody();
+    void cleanNotifyBody(){ m_arNotifyBody.removeAllElements(); setFakeServerResponse(false); }
+    boolean isFakeServerResponse(){ return m_bFakeServerResponse; }
+    void setFakeServerResponse(boolean bFakeServerResponse){ m_bFakeServerResponse = bFakeServerResponse; }
 
     void fireAllSyncNotifications( boolean bFinish, int nErrCode, String strError, String strServerError );
     void reportSyncStatus(String status, int error, String strDetails);
     void showStatusPopup(const String& status);
+    
+    bool isInsideCallback() const { return m_isInsideCallback; }
 private:
     CSyncNotification* getSyncNotifyBySrc(CSyncSource* src);
 

data/platform/shared/sync/SyncSource.cpp

@@ -329,6 +329,14 @@ void CSyncSource::doSyncClientChanges()
             bSend = true;
         }
     }
+
+    if (!bSend)
+    {
+        //check for push_changes
+        IDBResult res = getDB().executeSQL("SELECT attrib_type FROM changed_values where source_id=? and update_type =?", getID(), "push_changes" );
+        bSend = !res.isEnd();
+    }
+
     strBody += "}";
 
     getDB().Unlock();
@@ -379,6 +387,8 @@ void CSyncSource::doSyncClientChanges()
             }
         }
 
+        if (m_nErrCode == RhoAppAdapter.ERR_NONE)
+            getDB().executeSQL("DELETE FROM changed_values WHERE source_id=? and update_type=?", getID(), "push_changes" );
     }
 
     m_arMultipartItems.removeAllElements();
@@ -554,7 +564,10 @@ void CSyncSource::syncServerChanges()
         const char* szData = null;
         String strTestResp = getSync().getSourceOptions().getProperty(getID(), "rho_server_response");
         if ( strTestResp.length() > 0 )
+        {
             szData = strTestResp.c_str();
+            getNotify().setFakeServerResponse(true);
+        }
         else
             szData = resp.getCharData();
 
@@ -570,6 +583,9 @@ void CSyncSource::syncServerChanges()
 
         if ( getToken() == 0 )
             break;
+
+        if ( strTestResp.length() > 0 )
+            break;
     }
 
     if ( getSync().isSchemaChanged() )
@@ -577,10 +593,10 @@ void CSyncSource::syncServerChanges()
 }
 
 //{"create-error":{"0_broken_object_id":{"name":"wrongname","an_attribute":"error create"},"0_broken_object_id-error":{"message":"error create"}}}
-boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
+void CSyncSource::processServerErrors(CJSONEntry& oCmds)
 {
+    String strServerError;
     const char* arErrTypes[] = {"source-error", "search-error", "create-error", "update-error", "delete-error", "update-rollback", null};
-    boolean bRes = false;
     for( int i = 0; ; i++ )
     {
         if ( arErrTypes[i] == null )
@@ -588,9 +604,6 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
         if ( !oCmds.hasName(arErrTypes[i]) )
             continue;
 
-        bRes = true;
-        m_nErrCode = RhoAppAdapter.ERR_CUSTOMSYNCSERVER;
-
         CJSONEntry errSrc = oCmds.getEntry(arErrTypes[i]);
         CJSONStructIterator errIter(errSrc);
         for( ; !errIter.isEnd(); errIter.next() )
@@ -601,10 +614,10 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
             {
                 if ( errIter.getCurValue().hasName("message") )
                 {
-                    if ( m_strServerError.length() > 0 )
-                        m_strServerError += "&";
+                    if ( strServerError.length() > 0 )
+                        strServerError += "&";
 
-                    m_strServerError += "server_errors[" + URI::urlEncode(strKey) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                    strServerError += "server_errors[" + URI::urlEncode(strKey) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
                 }
             }else
             {
@@ -614,9 +627,9 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
                 if ( String_endsWith(strObject, "-error") )
                 {
                     strObject = strObject.substr(0, strKey.length()-6);
-                    if ( m_strServerError.length() > 0 )
-                        m_strServerError += "&";
-                    m_strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
+                    if ( strServerError.length() > 0 )
+                        strServerError += "&";
+                    strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][message]=" + URI::urlEncode(errIter.getCurValue().getString("message"));
                 }else
                 {
                     CJSONStructIterator attrIter(errIter.getCurValue());
@@ -625,17 +638,18 @@ boolean CSyncSource::processServerErrors(CJSONEntry& oCmds)
                         String strAttrName = attrIter.getCurKey();
                         String strAttrValue = attrIter.getCurString();
 
-                        if ( m_strServerError.length() > 0 )
-                            m_strServerError += "&";
+                        if ( strServerError.length() > 0 )
+                            strServerError += "&";
 
-                        m_strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][attributes][" + URI::urlEncode(strAttrName) + "]=" + URI::urlEncode(strAttrValue);
+                        strServerError += "server_errors[" + String(arErrTypes[i]) + "][" + URI::urlEncode(strObject) + "][attributes][" + URI::urlEncode(strAttrName) + "]=" + URI::urlEncode(strAttrValue);
                     }
                 }
             }
         }
     }
 
-    return bRes;
+    if ( strServerError.length() > 0 )
+        getNotify().fireSyncNotification2(this, true, RhoAppAdapter.ERR_CUSTOMSYNCSERVER, strServerError);
 }
 
 void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
@@ -732,8 +746,10 @@ void CSyncSource::processServerResponse_ver3(CJSONArrayIterator& oJsonArr)
         if ( oCmds.hasName("schema-changed") )
         {
             getSync().setSchemaChanged(true);
-        }else if ( !processServerErrors(oCmds) )
+        }else
         {
+            processServerErrors(oCmds);
+
             getDB().startTransaction();
 
             if (getSync().getSourceOptions().getBoolProperty(getID(), "pass_through"))