rhodes 5.5.0.7 → 5.5.0.22

data/platform/iphone/rbuild/putsOverride.rake

@@ -0,0 +1,8 @@
+def puts(o=nil)
+    if o != nil
+        $stdout.puts(o)
+        if $out_file_buf_enable
+            $out_file_buf << o.to_s
+        end
+    end
+end

data/platform/shared/common/RhoTime.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,13 +20,39 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
 #include "common/RhoTime.h"
 #include "common/RhodesApp.h"
 
+#include "common/RhoConf.h"
+
+
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "RhoTimer"
+
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
+
+
 namespace rho{
 namespace common{
 
@@ -143,33 +169,34 @@ boolean CRhoTimer::checkTimers()
     for( int i = (int)m_arItems.size()-1; i >= 0; i--)
     {
         CTimerItem oItem = m_arItems.elementAt(i);
-		if(oItem.m_overflow==false)
-		{
-
-			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-                RAWTRACE("CRhoTimer::checkTimers: firing timer");
-				m_arItems.removeElementAt(i);
-				if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-					bRet = true;
-			}
-
-		}
-		else
-		{
-			if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-				{
+        
+            if(oItem.m_overflow==false)
+            {
+                
+                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+                {
                     RAWTRACE("CRhoTimer::checkTimers: firing timer");
-					m_arItems.removeElementAt(i);
-					if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
-						bRet = true;
-				}
-
-			}
-
-		}
+                    m_arItems.removeElementAt(i);
+                    if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                        bRet = true;
+                }
+                
+            }
+            else
+            {
+                if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+                {
+                    if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+                    {
+                        RAWTRACE("CRhoTimer::checkTimers: firing timer");
+                        m_arItems.removeElementAt(i);
+                        if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                            bRet = true;
+                    }
+                    
+                }
+                
+            }
     }
 
     for( int i = (int)m_arNativeItems.size()-1; i >= 0; i--)
@@ -177,28 +204,42 @@ boolean CRhoTimer::checkTimers()
         CNativeTimerItem oItem = m_arNativeItems.elementAt(i);
         
         if(oItem.m_overflow==false)
-		{
+        {
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
             {
                 RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                 m_arNativeItems.removeElementAt(i);
-                if ( oItem.m_pCallback->onTimer() )
+                if (is_net_trace()) {
+                    RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 1 TIMER");
+                }
+                if ( oItem.m_pCallback->onTimer() ) {
                     bRet = true;
+                }
+                if (is_net_trace()) {
+                    RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 1 TIMER");
+                }
             }
         }
         else
         {
             if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
-			{
-				if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
-				{
+            {
+                if((curTime.toULong()-oItem.m_oFireTime.toULong())<=oItem.m_nInterval)
+                {
                     RAWTRACE("CRhoTimer::checkTimers: firing native timer");
                     m_arNativeItems.removeElementAt(i);
-                    if ( oItem.m_pCallback->onTimer() )
+                    if (is_net_trace()) {
+                        RAWTRACE("$NetRequestProcess$ PRE ONTIMER CRhoTimer::checkTimers() 2 TIMER");
+                    }
+                    if ( oItem.m_pCallback->onTimer() ) {
                         bRet = true;
-				}
-
-			}
+                    }
+                    if (is_net_trace()) {
+                        RAWTRACE("$NetRequestProcess$ POST ONTIMER CRhoTimer::checkTimers() 2 TIMER");
+                    }
+                }
+                
+            }
         }
     }
 

data/platform/shared/common/RhodesApp.cpp

@@ -353,10 +353,10 @@ void CAppCallbacksQueue::processCommand(IQueueCommand* pCmd)
                 {
                     processUiCreated();
                 }
-                if (!RHODESAPP().getApplicationEventReceiver()->onAppStateChange(rho::common::applicationStateActivated))
-                {
-                    callCallback("/system/activateapp");
-                }
+
+                RHODESAPP().getApplicationEventReceiver()->onAppStateChange(rho::common::applicationStateActivated);
+                callCallback("/system/activateapp");
+
                 m_expected = app_deactivated;
             }
             break;
@@ -388,15 +388,15 @@ void CAppCallbacksQueue::processUiCreated()
     #endif
 
     // at this point JS app is unlikely to set its own handler, just navigate to overriden start path
-    if (!RHODESAPP().getApplicationEventReceiver()->onUIStateChange(rho::common::UIStateCreated))
-    {
+    RHODESAPP().getApplicationEventReceiver()->onUIStateChange(rho::common::UIStateCreated);
+
         if ( rho_ruby_is_started() )
             callCallback("/system/uicreated");
 #if !defined(APP_BUILD_CAPABILITY_SHARED_RUNTIME) || !defined(OS_ANDROID)
         else
             rho_webview_navigate(startPath.c_str(), 0);
 #endif
-    }
+
     m_uistate = ui_created_processed;
 }
 
@@ -742,16 +742,15 @@ void CRhodesApp::callUiDestroyedCallback()
     if ( m_bExit/* || !rho_ruby_is_started()*/ )
         return;
     
-    if (!RHODESAPP().getApplicationEventReceiver()->onUIStateChange(rho::common::UIStateDestroyed))
+    
+    RHODESAPP().getApplicationEventReceiver()->onUIStateChange(rho::common::UIStateDestroyed);
+    if ( rho_ruby_is_started() )
     {
-        if ( rho_ruby_is_started() )
+        String strUrl = m_strHomeUrl + "/system/uidestroyed";
+        NetResponse resp = getNetRequest().pullData( strUrl, null );
+        if ( !resp.isOK() )
         {
-          String strUrl = m_strHomeUrl + "/system/uidestroyed";
-          NetResponse resp = getNetRequest().pullData( strUrl, null );
-          if ( !resp.isOK() )
-          {
-              LOG(ERROR) + "UI destroy callback failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
-          }
+            LOG(ERROR) + "UI destroy callback failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
         }
     }
 }
@@ -789,8 +788,8 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
         m_appCallbacksQueue->addQueueCommand(new CAppCallbacksQueue::Command(CAppCallbacksQueue::app_deactivated));
         
         // TODO: Support stop_local_server command to be parsed from callback result
-        if (!RHODESAPP().getApplicationEventReceiver()->onAppStateChange(rho::common::applicationStateDeactivated))
-        {
+        RHODESAPP().getApplicationEventReceiver()->onAppStateChange(rho::common::applicationStateDeactivated);
+
 #ifndef RHO_NO_RUBY_API 
             if ( rho_ruby_is_started() )
             {
@@ -814,7 +813,6 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
                 }
             }
 #endif
-        }
 
         m_bDeactivationMode = false;
     }

data/platform/shared/db/DBAdapter.cpp

@@ -633,6 +633,39 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
         }
     }
 }
+    
+// add file.blob attrib_type for blob attribs in changed_values
+void CDBAdapter::updateAllBlobAttribChanges()
+    {
+        //Check for attrib = object
+        IDBResult res = executeSQL("SELECT object, source_id, attrib "
+                                   "FROM changed_values where update_type = 'update' and sent=0");
+        
+        if ( res.isEnd() )
+            return;
+        
+        startTransaction();
+        
+        Vector<String> arObj, arAttrib;
+        Vector<int> arSrcID;
+        for( ; !res.isEnd(); res.next() )
+        {
+            arObj.addElement(res.getStringByIdx(0));
+            arSrcID.addElement(res.getIntByIdx(1));
+            arAttrib.addElement(res.getStringByIdx(2));
+        }
+        
+        for( int i = 0; i < (int)arObj.size(); i++ )
+        {
+            String attribType = getAttrMgr().isBlobAttr(arSrcID.elementAt(i), arAttrib.elementAt(i).c_str()) ? "blob.file" : "";
+            if (attribType.length() > 0) {
+                executeSQL("UPDATE changed_values SET attrib_type=? WHERE source_id=? and object=? and attrib=? and sent=0", attribType, arSrcID.elementAt(i), arObj.elementAt(i), arAttrib.elementAt(i));
+            }
+        }
+        
+        endTransaction();
+    }
+    
 
 void CDBAdapter::updateAllAttribChanges()
 {

data/platform/shared/db/DBAdapter.h

@@ -359,7 +359,12 @@ public:
 	
     DBResultPtr prepareStatement( const char* szSt );
     DBResultPtr executeStatement(common::CAutoPtr<CDBResult>& res, const char* szSt);
+
+    // unpack object in changed_values with update_type==create to set of objects's attribs
     void updateAllAttribChanges();
+    
+    // add file.blob attrib_type for blob attribs in changed_values
+    void updateAllBlobAttribChanges();
     void updateFullUpdateChanges(int nSrcID);
 
 	String exportDatabase();

data/platform/shared/net/HttpServer.cpp

@@ -81,6 +81,24 @@ typedef unsigned __int16 uint16_t;
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "HttpServer"
 
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
+
+
 //extern "C" void rho_sync_addobjectnotify_bysrcname(const char* szSrcName, const char* szObject);
 
 namespace rho
@@ -1497,8 +1515,13 @@ bool CHttpServer::decide(String const &method, String const &arg_uri, String con
 #ifdef OS_MACOSX
 String CHttpServer::directRequest( const String& method, const String& uri, const String& query, const HeaderList& headers ,const String& body )
 {
+  if (is_net_trace()) {
+      RAWTRACE1("$NetRequestProcess$ PRE LOCK CHttpServer::directRequest uri = %s", uri.c_str());
+  }
   common::CMutexLock lock(m_mxSyncRequest);
-  
+  if (is_net_trace()) {
+      RAWTRACE1("$NetRequestProcess$ POST LOCK CHttpServer::directRequest uri = %s", uri.c_str());
+  }
   String ret;
   if ( m_pQueue != 0 )
   {
@@ -1526,6 +1549,9 @@ String CHttpServer::directRequest( const String& method, const String& uri, cons
     
     ret = m_pQueue->getResponse();
   }
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ FINISH CHttpServer::directRequest uri = %s", uri.c_str());
+    }
   
   return ret;
  

data/platform/shared/net/INetRequest.cpp

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
@@ -31,6 +31,28 @@
 #include "common/RhoFilePath.h"
 #include "net/URI.h"
 
+#include "common/RhoConf.h"
+#include "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "NetRequestTimer"
+
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
 namespace rho {
 namespace net {
 
@@ -50,12 +72,17 @@ void CNetRequestHolder::setRequest(INetRequestImpl* pReq)
 
 void CNetRequestHolder::cancel()
 {
+    if (is_net_trace()) {
+        RAWTRACE("$NetRequestProcess$ PRE SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
+    }
     synchronized(m_mxReq)
     {
         m_bCancel = true;
         if ( m_pReq != 0 )
             m_pReq->cancel();
-
+        if (is_net_trace()) {
+            RAWTRACE("$NetRequestProcess$ POST SYNCHRONIZED CNetRequestHolder::cancel() TIMER");
+        }
         m_pReq = 0;
     }
 }

data/platform/shared/qt/rhodes/qkineticscroller.cpp

@@ -38,8 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qkineticscroller.h>
-#include <qkineticscroller_p.h>
+#include "qkineticscroller.h"
+#include "qkineticscroller_p.h"
 #include <QMap>
 #include <QApplication>
 #include <QDesktopWidget>