rhodes 2.1.0 → 2.2.0.beta.1

data/platform/osx/Rhodes Debugger/NoodleLineNumberView.m

@@ -197,7 +197,8 @@
 		
 	view = [self clientView];
 	visibleRect = [[[self scrollView] contentView] bounds];
-	
+	visibleRect.origin.y -= 235;
+
 	lines = [self lineIndices];
 
 	location += NSMinY(visibleRect);
@@ -403,7 +404,7 @@
 		
 		yinset = [view textContainerInset].height;        
         visibleRect = [[[self scrollView] contentView] bounds];
-
+		visibleRect.origin.y -= 235;
         textAttributes = [self textAttributes];
 		
 		lines = [self lineIndices];

data/platform/shared/common/AutoPointer.h

@@ -51,6 +51,9 @@ public:
     CAutoPtr( const CAutoPtr& orig){ *this = orig; }
     CAutoPtr& operator=( const CAutoPtr& orig)
     {
+        if ( CBaseAutoPointer<PTRTYPE>::m_ptr ) 
+            FreePtr(); 
+
         CBaseAutoPointer<PTRTYPE>::m_ptr = orig.m_ptr;
         const_cast<CAutoPtr&>(orig).m_ptr = 0;
         return *this;

data/platform/shared/common/RhoConf.cpp

@@ -210,7 +210,8 @@ int rho_conf_is_property_exists(const char* name)
 }
 
 void rho_conf_freeString(char* str) {
-	free(str);
+	if ( str )
+		free(str);
 }
 
 void rho_conf_setString(const char* szName, const char* value){

data/platform/shared/common/RhoThread.h

@@ -25,7 +25,7 @@ public:
     virtual void start(EPriority ePriority);
     virtual void stop(unsigned int nTimeoutToKill){ m_nState |= TS_STOPPING; if (m_nState&TS_RUNNING) m_pImpl->stop(nTimeoutToKill); m_nState &= ~TS_STOPPING; }
     virtual void wait(unsigned int nTimeout){ m_nState |= TS_WAIT; if ((m_nState&TS_RUNNING) && !(m_nState&TS_STOPPING) ) m_pImpl->wait(nTimeout); m_nState &= ~TS_WAIT; }
-    virtual void stopWait(){ if (isWaiting()) m_pImpl->stopWait(); }
+    virtual void stopWait(){ /*if (isWaiting())*/ m_pImpl->stopWait(); }
     virtual void sleep(unsigned int nTimeout){ m_pImpl->sleep(nTimeout); }
     virtual void run() = 0;
     virtual void runObject()

data/platform/shared/common/RhoTime.h

@@ -47,14 +47,14 @@ public:
             locTime = localtime(&tv.tv_sec);
 
             if (inFileFormat)
-                nSize = sprintf(timeBuf, "%02d%02d%04d%02d%02d%02d%03d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900,
+                nSize = sprintf(timeBuf, "%02d%02d%04d%02d%02d%02d%03d", locTime->tm_mon+1, locTime->tm_mday, locTime->tm_year + 1900,
                         locTime->tm_hour, locTime->tm_min, locTime->tm_sec, (int)tv.tv_usec/1000 );
             else
-                nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d:%03d", locTime->tm_mon, locTime->tm_mday, locTime->tm_year + 1900,
+                nSize = sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d:%03d", locTime->tm_mon+1, locTime->tm_mday, locTime->tm_year + 1900,
                         locTime->tm_hour, locTime->tm_min, locTime->tm_sec, (int)tv.tv_usec/1000 );
 #else
             SYSTEMTIME st; 
-            GetSystemTime( &st ); 
+            GetLocalTime( &st ); 
 
             if (inFileFormat)
                 nSize = sprintf(timeBuf, "%02d%02d%04d%02d%02d%02d%03d", st.wMonth, st.wDay, st.wYear,

data/platform/shared/common/RhodesApp.cpp

@@ -56,6 +56,7 @@ CRhodesApp::CRhodesApp(const String& strRootPath) : CRhodesAppBase(strRootPath)
 {
     m_bExit = false;
     m_bDeactivationMode = false;
+    m_activateCounter = 0;
 
     m_ptrFactory = rho_impl_createClassFactory();
     m_NetRequest = m_ptrFactory->createNetRequest();
@@ -92,16 +93,13 @@ void CRhodesApp::run()
     LOG(INFO) + "RhoRubyInitApp...";
     RhoRubyInitApp();
 
-    //LOG(INFO) + "activate app";
-    //rho_ruby_activateApp();
-
-    getSplashScreen().hide();
 
+    //rho_clientregister_create("iphone_client");
+#if defined( OS_WINCE ) || defined( OS_WINDOWS )
     LOG(INFO) + "navigate to first start url";
-    navigateToUrl(getFirstStartUrl());
+    RHODESAPP().navigateToUrl(RHODESAPP().getFirstStartUrl());
+#endif
 
-    //rho_clientregister_create("iphone_client");
-    
     while (!m_bExit) {
         m_httpServer->run();
         if (m_bExit)
@@ -217,6 +215,16 @@ public:
     {
         while (!rho_is_local_server_started())
             thisThread.wait(1);
+
+        static bool navigated = false;
+        if (!navigated)
+        {
+            LOG(INFO) + "navigate to first start url";
+            RHODESAPP().navigateToUrl(RHODESAPP().getFirstStartUrl());
+            navigated = true;
+        }
+	  //  RHODESAPP().getSplashScreen().hide();
+
         common::CAutoPtr<common::IRhoClassFactory> factory = rho_impl_createClassFactory();
         common::CAutoPtr<net::INetRequest> pNetRequest = factory->createNetRequest();
         NetResponse(resp, pNetRequest->pullData( m_strUrl, null ) );
@@ -228,9 +236,12 @@ public:
 void CRhodesApp::callAppActiveCallback(boolean bActive)
 {
     LOG(INFO) + "callAppActiveCallback";
+    int stop = !rho_conf_getBool("dont_stop_local_server_in_background");
     if (bActive)
     {
-        this->stopWait();
+        if (stop)
+            if (m_activateCounter++ > 0)
+                this->stopWait();
         
         String strUrl = m_strHomeUrl + "/system/activateapp";
         // Activation callback need to be runned in separate thread
@@ -252,7 +263,8 @@ void CRhodesApp::callAppActiveCallback(boolean bActive)
         NetResponse(resp,getNet().pullData( strUrl, null ));
         if ( !resp.isOK() )
             LOG(ERROR) + "deactivate app failed. Code: " + resp.getRespCode() + "; Error body: " + resp.getCharData();
-        m_httpServer->stop();
+        if (stop)
+            m_httpServer->stop();
         m_bDeactivationMode = false;
     }
 }
@@ -312,6 +324,13 @@ void CRhodesApp::callDateTimeCallback(String strCallbackUrl, long lDateTime, con
     NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
 }
 
+void CRhodesApp::callBluetoothCallback(String strCallbackUrl, const char* body) {
+	strCallbackUrl = canonicalizeRhoUrl(strCallbackUrl);
+	String strBody = body;
+	strBody += "&rho_callback=1";
+	NetRequest( getNet().pushData( strCallbackUrl, strBody, null ) );
+}
+
 void CRhodesApp::callPopupCallback(String strCallbackUrl, const String &id, const String &title)
 {
     if ( strCallbackUrl.length() == 0 )
@@ -338,8 +357,8 @@ static void callback_redirect_to(void *arg, String const &strQuery )
 
     if ( strUrl.length() == 0 )
         strUrl = "/app/";
-
-    rho_http_redirect(arg, strUrl.c_str());
+	
+    rho_http_redirect(arg, (rho::net::URI::urlDecode(strUrl)).c_str());
 }
 
 static void callback_map(void *arg, String const &query )
@@ -447,29 +466,42 @@ const char* CRhodesApp::getFreeListeningPort()
     
     if (noerrors)
     {
+        int listenPort = rho_conf_getInt("local_server_port");
+        if (listenPort < 0)
+            listenPort = 0;
+        if (listenPort > 65535)
+            listenPort = 0;
         memset((void *) &serv_addr, 0, sizeof(serv_addr));
 #if defined(OS_MACOSX)
         serv_addr.sin_len = sizeof(serv_addr);
 #endif
         serv_addr.sin_family = AF_INET;
         serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-        serv_addr.sin_port = htons(8080);
+        serv_addr.sin_port = htons((short)listenPort);
         
-        LOG(INFO) + "Trying to bind on 8080 port...";
+        LOG(INFO) + "Trying to bind of " + listenPort + " port...";
 
         if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) != 0 )
         {
-            // Fill serv_addr again but with dynamically selected port
+            if (listenPort != 0)
+            {
+                // Fill serv_addr again but with dynamically selected port
 #if defined(OS_MACOSX)
-            serv_addr.sin_len = sizeof(serv_addr);
+                serv_addr.sin_len = sizeof(serv_addr);
 #endif
-            serv_addr.sin_family = AF_INET;
-            serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-            serv_addr.sin_port = htons(0);
-            
-            LOG(INFO) + "Trying to bind on dynamic port...";
+                serv_addr.sin_family = AF_INET;
+                serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+                serv_addr.sin_port = htons(0);
+
+                LOG(INFO) + "Trying to bind on dynamic port...";
             
-            if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) != 0 )
+                if ( bind( sockfd, (struct sockaddr *) &serv_addr, sizeof( serv_addr ) ) != 0 )
+                {
+                    LOG(WARNING) + "Unable to bind";
+                    noerrors = 0;
+                }
+            }
+            else
             {
                 LOG(WARNING) + "Unable to bind";
                 noerrors = 0;
@@ -515,8 +547,12 @@ void CRhodesApp::initAppUrls()
 {
     CRhodesAppBase::initAppUrls(); 
     m_currentTabIndex = 0;
-    
+
+#if defined( OS_WINCE ) || defined( OS_WINDOWS )
     m_strHomeUrl = "http://localhost:";
+#else
+    m_strHomeUrl = "http://127.0.0.1:";
+#endif
     m_strHomeUrl += getFreeListeningPort();
 
     m_strLoadingPagePath = "file://" + getRhoRootPath() + "apps/app/loading.html";
@@ -615,7 +651,7 @@ const String& CRhodesApp::getRhobundleReloadUrl()
 
 void CRhodesApp::navigateToUrl( const String& strUrl)
 {
-    rho_webview_navigate(strUrl.c_str(), 0);
+    rho_webview_navigate(strUrl.c_str(), -1);
 }
 
 void CRhodesApp::navigateBack()
@@ -976,6 +1012,10 @@ void rho_rhodesapp_callDateTimeCallback(const char* strCallbackUrl, long lDateTi
     RHODESAPP().callDateTimeCallback(strCallbackUrl, lDateTime, szData, bCancel != 0);
 }
 
+void rho_rhodesapp_callBluetoothCallback(const char* strCallbackUrl, const char* body) {
+	RHODESAPP().callBluetoothCallback(strCallbackUrl, body);
+}
+
 void rho_rhodesapp_callPopupCallback(const char *strCallbackUrl, const char *id, const char *title)
 {
     RHODESAPP().callPopupCallback(strCallbackUrl, id, title);
@@ -1110,6 +1150,13 @@ void rho_net_request(const char *url)
     request->pullData(url, null);
 }
 
+void rho_net_request_with_data(const char *url, const char *str_body) {
+    rho::common::CAutoPtr<rho::common::IRhoClassFactory> factory = rho_impl_createClassFactory();
+    rho::common::CAutoPtr<rho::net::INetRequest> request = factory->createNetRequest();
+    request->pushData(url, str_body, null);
+}
+	
+	
 void rho_rhodesapp_load_url(const char *url)
 {
     RHODESAPP().loadUrl(url);
@@ -1148,4 +1195,9 @@ unsigned long long rho_cur_time()
 }
 #endif
 
+void rho_free_callbackdata(void* pData)
+{
+	//It is used in SyncClient.
+}
+	
 } //extern "C"

data/platform/shared/common/RhodesApp.h

@@ -52,6 +52,7 @@ private:
     String m_strScreenRotationCallback, m_strScreenRotationCallbackParams;
     
     boolean m_bDeactivationMode;
+    int m_activateCounter;
 
 public:
     ~CRhodesApp(void);
@@ -84,6 +85,7 @@ public:
     void callCameraCallback(String strCallbackUrl, const String& strImagePath, const String& strError, boolean bCancel );
     void callSignatureCallback(String strCallbackUrl, const String& strSignaturePath, const String& strError, boolean bCancel );
     void callDateTimeCallback(String strCallbackUrl, long lDateTime, const char* szData, int bCancel );
+	void callBluetoothCallback(String strCallbackUrl, const char* body);
     void callAppActiveCallback(boolean bActive);
     void callPopupCallback(String strCallbackUrl, const String &id, const String &title);
 
@@ -160,6 +162,7 @@ void rho_rhodesapp_callCameraCallback(const char* strCallbackUrl, const char* st
 void rho_rhodesapp_callSignatureCallback(const char* strCallbackUrl, const char* strSignaturePath, 
   const char* strError, int bCancel );
 void rho_rhodesapp_callDateTimeCallback(const char* strCallbackUrl, long lDateTime, const char* szData, int bCancel );
+void rho_rhodesapp_callBluetoothCallback(const char* strCallbackUrl, const char* body);
 void rho_rhodesapp_callAppActiveCallback(int nActive);
 unsigned long rho_rhodesapp_GetCallbackObject(int nIndex);
 
@@ -177,6 +180,7 @@ int rho_base64_encode(const char *src, int srclen, char *dst);
 int rho_base64_decode(const char *src, int srclen, char *dst);
 
 void rho_net_request(const char *url);
+void rho_net_request_with_data(const char *url, const char *str_body);
 
 void rho_rhodesapp_load_url(const char *url);
 

data/platform/shared/common/RhodesAppBase.h

@@ -59,6 +59,8 @@ const char* rho_native_rhopath();
 const char* rho_rhodesapp_getplatform();
 int rho_unzip_file(const char* szZipPath);
 
+void rho_free_callbackdata(void* pData);
+	
 #ifdef __cplusplus
 };
 #endif //__cplusplus

data/platform/shared/common/ThreadQueue.cpp

@@ -15,28 +15,33 @@ CThreadQueue::~CThreadQueue(void)
 {
 }
 
+void CThreadQueue::addQueueCommandInt(IQueueCommand* pCmd)
+{
+    synchronized(m_mxStackCommands);
+
+	boolean bExist = false;
+    if ( isSkipDuplicateCmd() )
+    {
+	    for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
+	    {
+		    if ( m_stackCommands.get(i)->equals(*pCmd) )
+		    {
+			    bExist = true;
+			    break;
+		    }
+	    }
+    }
+
+	if ( !bExist )
+		m_stackCommands.add(pCmd);
+
+}
+
 void CThreadQueue::addQueueCommand(IQueueCommand* pCmd)
 { 
     LOG(INFO) + "addCommand: " + pCmd->toString();
-	{
-        synchronized(m_mxStackCommands);
 
-		boolean bExist = false;
-        if ( isSkipDuplicateCmd() )
-        {
-		    for ( int i = 0; i < (int)m_stackCommands.size(); i++ )
-		    {
-			    if ( m_stackCommands.get(i)->equals(*pCmd) )
-			    {
-				    bExist = true;
-				    break;
-			    }
-		    }
-        }
-
-		if ( !bExist )
-    		m_stackCommands.add(pCmd);
-	}
+    addQueueCommandInt(pCmd);
 
     if ( isNoThreadedMode()  )
         processCommands();

data/platform/shared/common/ThreadQueue.h

@@ -57,6 +57,8 @@ protected:
 
     virtual void processCommands();
 
+    void addQueueCommandInt(IQueueCommand* pCmd);
+
     boolean isNoCommands();
 };
 

data/platform/shared/db/res/db/syncdb.schema

@@ -1,44 +1,44 @@
 CREATE TABLE client_info (
- client_id VARCHAR(255) default NULL,
- session VARCHAR(255) default NULL,
- token VARCHAR(255) default NULL,
- token_sent BIGINT default 0,
- reset BIGINT default 0,
- port VARCHAR(10) default NULL,
- last_sync_success VARCHAR(100) default NULL);
+ "client_id" VARCHAR(255) default NULL,
+ "session" VARCHAR(255) default NULL,
+ "token" VARCHAR(255) default NULL,
+ "token_sent" BIGINT default 0,
+ "reset" BIGINT default 0,
+ "port" VARCHAR(10) default NULL,
+ "last_sync_success" VARCHAR(100) default NULL);
 CREATE TABLE object_values (
- source_id BIGINT default NULL,
- attrib varchar(255) default NULL,
- object varchar(255) default NULL,
- value varchar default NULL);
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL);
 CREATE TABLE changed_values (
- source_id BIGINT default NULL,
- attrib varchar(255) default NULL,
- object varchar(255) default NULL,
- value varchar default NULL,
- attrib_type varchar(255) default NULL,
- update_type varchar(255) default NULL,
- sent BIGINT default 0);
+ "source_id" BIGINT default NULL,
+ "attrib" varchar(255) default NULL,
+ "object" varchar(255) default NULL,
+ "value" varchar default NULL,
+ "attrib_type" varchar(255) default NULL,
+ "update_type" varchar(255) default NULL,
+ "sent" BIGINT default 0);
 CREATE TABLE sources (
- source_id BIGINT PRIMARY KEY,
- name VARCHAR(255) default NULL,
- token BIGINT default NULL,
- sync_priority BIGINT,
- partition VARCHAR(255),
- sync_type VARCHAR(255),
- metadata varchar default NULL, 
- last_updated BIGINT default 0,
- last_inserted_size BIGINT default 0,
- last_deleted_size BIGINT default 0,
- last_sync_duration BIGINT default 0,
- last_sync_success BIGINT default 0,
- backend_refresh_time BIGINT default 0,
- source_attribs varchar default NULL,
- schema varchar default NULL,
- schema_version varchar default NULL,
- associations varchar default NULL,
- blob_attribs varchar default NULL);
-CREATE INDEX by_src_id on object_values (source_id);
-CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);
-CREATE INDEX by_src_value ON object_values (attrib, source_id, value);
+ "source_id" BIGINT PRIMARY KEY,
+ "name" VARCHAR(255) default NULL,
+ "token" BIGINT default NULL,
+ "sync_priority" BIGINT,
+ "partition" VARCHAR(255),
+ "sync_type" VARCHAR(255),
+ "metadata" varchar default NULL, 
+ "last_updated" BIGINT default 0,
+ "last_inserted_size" BIGINT default 0,
+ "last_deleted_size" BIGINT default 0,
+ "last_sync_duration" BIGINT default 0,
+ "last_sync_success" BIGINT default 0,
+ "backend_refresh_time" BIGINT default 0,
+ "source_attribs" varchar default NULL,
+ "schema" varchar default NULL,
+ "schema_version" varchar default NULL,
+ "associations" varchar default NULL,
+ "blob_attribs" varchar default NULL);
+CREATE INDEX by_src_id on object_values ("source_id");
+CREATE UNIQUE INDEX by_src_object ON object_values ("object", "attrib", "source_id");
+CREATE INDEX by_src_value ON object_values ("attrib", "source_id", "value");