rhodes 2.3.2 → 2.4.0.beta.1

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -833,7 +833,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -854,7 +854,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -916,7 +916,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -1128,8 +1128,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
-				CODE_SIGN_IDENTITY = "Don't Code Sign";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				EXTENSIONS_LDFLAGS = "-filelist $(TARGET_TEMP_DIR)/rhodeslibs.txt";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

data/platform/iphone/rhosynclib/rhosynclib.xcodeproj/project.pbxproj

@@ -310,7 +310,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
 			};
 			name = Debug;
 		};
@@ -328,7 +328,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 			};
 			name = Release;
 		};
@@ -392,7 +392,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rhosynclib;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 			};
 			name = Distribution;
 		};

data/platform/shared/SyncClient/SyncClient.cpp

@@ -129,10 +129,16 @@ void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
 void rho_syncclient_database_full_reset_and_logout()
 {
     rho_sync_logout();
-	rho_syncclient_database_full_reset();
+	rho_syncclient_database_full_reset(false);
+}
+
+void rho_syncclient_database_fullclient_reset_and_logout()
+{
+	rho_sync_logout();
+	rho_syncclient_database_full_reset(true);
 }
 	
-void rho_syncclient_database_full_reset()
+void rho_syncclient_database_full_reset(bool bClientReset)
 {
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
     oUserDB.executeSQL("UPDATE client_info SET reset=1");
@@ -144,7 +150,8 @@ void rho_syncclient_database_full_reset()
 
     Vector<String> arExclude;
     arExclude.addElement("sources");
-    arExclude.addElement("client_info");
+	if (!bClientReset)
+		arExclude.addElement("client_info");
 
     Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
     for( int i = 0; i < (int)arPartNames.size(); i++ )
@@ -212,7 +219,7 @@ void db_insert_into_table( db::CDBAdapter& db, const String& table, Hashtable<St
     db.executeSQLEx(query.c_str(), vals);
 }
 
-unsigned long rhom_make_object(rho::db::CDBResult& res1, int nSrcID, bool isSchemaSrc)
+unsigned long rhom_make_object(IDBResult& res1, int nSrcID, bool isSchemaSrc)
 {
     unsigned long item = 0;
     if ( res1.isEnd() )
@@ -279,7 +286,7 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
 {
     String src_name = szModel;
 
-    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -331,7 +338,7 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
 		}
     }
 
-    IDBResult  res1 = db.executeSQLEx(sql.c_str(), arValues ) );
+    IDBResult  res1 = db.executeSQLEx(sql.c_str(), arValues );
 
     if ( nCount == 1 )
     {
@@ -823,7 +830,7 @@ namespace rho {
 		return String();
 	}
 	
-	/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(net::INetResponse& resp)
+	/*static*/ int  _CRhoAppAdapter::getErrorFromResponse(NetResponse& resp)
 	{
 		if ( !resp.isResponseRecieved())
 			return ERR_NETWORK;
@@ -841,6 +848,11 @@ namespace rho {
 	{
 		
 	}
+
+	/*static*/ void  _CRhoAppAdapter::loadAllSyncSources()
+	{
+		
+	}
 	
     /*static*/ const char* _CRhoAppAdapter::getRhoDBVersion()
 	{
@@ -849,7 +861,7 @@ namespace rho {
 	
 	/*static*/ void _CRhoAppAdapter::resetDBOnSyncUserChanged()
 	{
-		rho_syncclient_database_full_reset();
+		rho_syncclient_database_full_reset(false);
 	}	
 }
 

data/platform/shared/SyncClient/SyncClient.h

@@ -39,7 +39,8 @@ void rho_syncclient_initmodel(RHOM_MODEL* model);
 void rho_syncclient_init(RHOM_MODEL* pModels, int nModels);
 void rho_syncclient_destroy();
 void rho_syncclient_database_full_reset_and_logout();
-void rho_syncclient_database_full_reset();
+void rho_syncclient_database_fullclient_reset_and_logout();
+void rho_syncclient_database_full_reset(bool bClientReset);
 	
 void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify);
 void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify);

data/platform/shared/common/RhoDefs.h

@@ -78,6 +78,10 @@ typedef int LogSeverity;
 #define _CRT_NONSTDC_NO_WARNINGS 1
 #endif //_CRT_NONSTDC_NO_WARNINGS
 
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE 1
+#endif //_CRT_SECURE_NO_DEPRECATE
+
 #endif
 
 #if !defined(OS_ANDROID)

data/platform/shared/common/RhoPort.h

@@ -8,6 +8,28 @@
 #include <windows.h>
 #include <time.h>
 
+#if defined(OS_PLATFORM_CE)
+#ifdef __cplusplus
+extern "C"{
+#endif
+time_t time(time_t *);
+struct tm * __cdecl localtime(const time_t *);
+size_t strftime(char *, size_t, const char *,
+	const struct tm *);
+struct tm * gmtime(const time_t *);
+time_t mktime(struct tm *);
+
+_CRTIMP extern char * tzname[2];
+
+extern int _daylight;
+#define daylight _daylight
+
+extern long _timezone;
+#ifdef __cplusplus
+};
+#endif
+#endif
+
 #if defined(OS_WINDOWS)
 #define _USE_MATH_DEFINES
 #endif

data/platform/shared/common/RhoStd.h

@@ -111,6 +111,11 @@ public:
         }
     }
 
+    void removeElementAt(int nItem)
+    {
+        std::vector<Type>::erase( std::vector<Type>::begin() + nItem );
+    }
+
     int indexOf(const Type& item)
     {
         for (int i = 0; i < (int)std::vector<Type>::size(); i++)

data/platform/shared/common/RhoTime.cpp

@@ -0,0 +1,73 @@
+#include "common/RhoTime.h"
+#include "common/RhodesApp.h"
+
+namespace rho{
+namespace common{
+
+CRhoTimer::CTimerItem::CTimerItem(int nInterval, const char* szCallback, const char* szCallbackData): 
+    m_nInterval(nInterval), m_strCallback(szCallback), m_strCallbackData(szCallbackData)
+{
+    m_oFireTime = CTimeInterval::getCurrentTime();
+    m_oFireTime.addMillis(nInterval);
+}
+
+unsigned long CRhoTimer::getNextTimeout()
+{
+    if ( m_arItems.size() == 0 )
+        return 0;
+
+    CTimeInterval curTime = CTimeInterval::getCurrentTime();
+    unsigned long nMinInterval = ((unsigned long)-1);
+
+    for( int i = 0; i < (int)m_arItems.size(); i++ )
+    {
+        unsigned long nInterval = 0;
+        if ( m_arItems.elementAt(i).m_oFireTime.toULong() > curTime.toULong() )
+            nInterval = m_arItems.elementAt(i).m_oFireTime.toULong() - curTime.toULong();
+
+        if ( nInterval < nMinInterval )
+            nMinInterval = nInterval;
+    }
+
+    if ( nMinInterval < 100 )
+        nMinInterval = 100;
+
+    return nMinInterval;
+}
+
+boolean CRhoTimer::checkTimers()
+{
+    boolean bRet = false;
+    CTimeInterval curTime = CTimeInterval::getCurrentTime();
+    for( int i = (int)m_arItems.size()-1; i >= 0; i--)
+    {
+        CTimerItem oItem = m_arItems.elementAt(i);
+        if ( curTime.toULong() >= oItem.m_oFireTime.toULong() )
+        {
+            m_arItems.removeElementAt(i);
+            if ( RHODESAPP().callTimerCallback(oItem.m_strCallback, oItem.m_strCallbackData) )
+                bRet = true;
+        }
+    }
+
+    return bRet;
+}
+
+void CRhoTimer::stopTimer(const char* szCallback)
+{
+    if ( !szCallback || !*szCallback)
+        m_arItems.removeAllElements();
+
+    for( int i = (int)m_arItems.size()-1; i >= 0; i--)
+    {
+        CTimerItem oItem = m_arItems.elementAt(i);
+        if ( oItem.m_strCallback.compare(szCallback) == 0 )
+        {
+            m_arItems.removeElementAt(i);
+        }
+    }
+}
+
+}
+}
+

data/platform/shared/common/RhoTime.h

@@ -1,7 +1,7 @@
 #ifndef _RHOTIME_H_
 #define _RHOTIME_H_
 
-#include "RhoPort.h"
+#include "RhoStd.h"
 
 #if !defined( OS_WINDOWS ) && !defined(OS_WINCE)
 #include <sys/time.h>
@@ -113,6 +113,11 @@ public:
         return *this;
     }
 
+    void addMillis(int nMs)
+    {
+        m_nativeTime += nMs;
+    }
+
     static CTimeInterval getCurrentTime(){
         CTimeInterval res;
 
@@ -137,67 +142,35 @@ inline CTimeInterval operator-(const CTimeInterval& time1, const CTimeInterval&
     return time1.minus(time2);
 }
 
-#if 0
-class CBaseTime{
-#if defined(OS_WINDOWS) || defined(OS_WINCE) 
-typedef SYSTEMTIME TimeType;
-#else
-#endif
-
-public:
-    CBaseTime(){ memset( &m_nativeTime, 0, sizeof(m_nativeTime) ); }
-/*
-    static int64 getTickCount() {
-        #if defined( OS_WINDOWS ) || defined(OS_WINCE)
-          SYSTEMTIME now;
-          GetSystemTime(&now);
-          return (static_cast<int64>(now.wSecond) * 1000000 +
-                  static_cast<int64>(now.wMilliseconds) * 1000);
-        #else
-          struct timeval tv;
-          gettimeofday(&tv, NULL);
-          return static_cast<int64>(tv.tv_sec) * 1000000 + tv.tv_usec;
-        #endif
-    }
-*/
-    void setToLocalTime(){
-#if defined( OS_WINDOWS ) || defined(OS_WINCE)
-          GetLocalTime(&m_nativeTime);
-#else
-#endif
-    }
-    void setToUTCTime(){
-#if defined( OS_WINDOWS ) || defined(OS_WINCE)
-          GetSystemTime(&m_nativeTime);
-#else
-#endif
-    }
+class CRhoTimer
+{
+    struct CTimerItem
+    {
+        int m_nInterval;
+        CTimeInterval m_oFireTime;
+        String m_strCallback;
+        String m_strCallbackData;
 
-protected:
+        CTimerItem(int nInterval, const char* szCallback, const char* szCallbackData);
+    };
 
-    TimeType m_nativeTime;
-};
+    Vector<CTimerItem> m_arItems;
 
-class CLocalTime : public CBaseTime{
+    void callTimerCallback(CTimerItem& oItem);
 public:
-    CLocalTime(){ setToLocalTime(); }
+    CRhoTimer(){}
 
-    String toString(){ 
-        char timeBuf[100];
-
-#if defined( OS_WINDOWS ) || defined(OS_WINCE)
-        sprintf(timeBuf, "%02d/%02d/%04d %02d:%02d:%02d", m_nativeTime.wMonth, m_nativeTime.wDay, m_nativeTime.wYear,
-            m_nativeTime.wHour, m_nativeTime.wMinute, m_nativeTime.wSecond );
-#else
-#endif
-
-        return String(timeBuf); 
+    void addTimer(int nInterval, const char* szCallback, const char* szCallbackData)
+    {
+        m_arItems.addElement(CTimerItem(nInterval, szCallback, szCallbackData));
     }
 
+    unsigned long getNextTimeout();
+    boolean checkTimers();
+    void stopTimer(const char* szCallback);
 };
 
-#endif //0
 }
 }
 
-#endif //_RHOFILEPATH_H_
+#endif //_RHOTIME_H_

data/platform/shared/common/RhodesApp.cpp

@@ -303,6 +303,17 @@ CRhodesApp::~CRhodesApp(void)
 
 }
 
+boolean CRhodesApp::callTimerCallback(const String& strUrl, const String& strData)
+{
+    String strBody = "rho_callback=1";
+		
+    if ( strData.length() > 0 )
+        strBody += "&" + strData;
+
+    String strReply;
+    return m_httpServer->call_ruby_method(strUrl, strBody, strReply);
+}
+
 void CRhodesApp::restartLocalServer(common::CThreadQueue& waitThread)
 {
     LOG(INFO) + "restart local server.";
@@ -793,18 +804,6 @@ void CRhodesApp::keepLastVisitedUrl(String strUrl)
     //LOG(INFO) + "Current URL: " + strUrl;
 
     m_currentUrls[m_currentTabIndex] = canonicalizeRhoUrl(strUrl);
-
-    if ( RHOCONF().getBool("KeepTrackOfLastVisitedPage") )
-    {
-        if ( strUrl.compare( 0, m_strHomeUrl.length(), m_strHomeUrl ) == 0 )
-            strUrl = strUrl.substr(m_strHomeUrl.length());
-
-        size_t nFragment = strUrl.find('#');
-        if ( nFragment != String::npos )
-            strUrl = strUrl.substr(0, nFragment);
-
-        RHOCONF().setString("LastVisitedPage",strUrl, true);		
-    }
 }
 
 void CRhodesApp::setAppBackUrl(const String& url)
@@ -898,20 +897,6 @@ const String& CRhodesApp::getCurrentUrl(int /*index*/)
 { 
     return m_currentUrls[m_currentTabIndex]; 
 }
-/*
-const String& CRhodesApp::getFirstStartUrl()
-{
-    m_strFirstStartUrl = getStartUrl();
-    if ( RHOCONF().getBool("KeepTrackOfLastVisitedPage") ) 
-    {
-        rho::String strLastPage = RHOCONF().getString("LastVisitedPage");
-        if (strLastPage.length() > 0)
-            m_strFirstStartUrl = canonicalizeRhoUrl(strLastPage);
-    }
-
-    LOG(INFO) + "Start url: " + m_strFirstStartUrl;
-    return m_strFirstStartUrl;
-}*/
 
 const String& CRhodesApp::getRhobundleReloadUrl() 
 {
@@ -932,13 +917,15 @@ void CRhodesApp::navigateBack()
         loadUrl(m_strAppBackUrlOrig);
     else if ( strcasecmp(getCurrentUrl().c_str(),getStartUrl().c_str()) != 0 )
 	{
+/* Now JQTouch is fixed for back issue - we do not need make back by this hack
 #ifdef OS_MACOSX
 		if (RHOCONF().getBool("jqtouch_mode"))
 		{
 			rho_webview_execute_js("window.Rho.jqt.goBack()", 0);
 			return;
 		}
-#endif		
+#endif
+*/		
         rho_webview_navigate_back();
 	}
 }
@@ -1048,7 +1035,12 @@ void CRhodesApp::setScreenRotationNotification(String strUrl, String strParams)
 {
     synchronized(m_mxScreenRotationCallback)
     {
-        m_strScreenRotationCallback = canonicalizeRhoUrl(strUrl);
+        if (strUrl.length() > 0) {
+            m_strScreenRotationCallback = canonicalizeRhoUrl(strUrl);
+        }
+        else {
+            m_strScreenRotationCallback = "";
+        }
         m_strScreenRotationCallbackParams = strParams;
     }
 }
@@ -1106,6 +1098,10 @@ void CRhodesApp::loadUrl(String url)
     {
         navigateBack();
         return;
+    }else if ( strcasecmp(url.c_str(), "sync")==0 )
+    {
+        rho_sync_doSyncAllSources(1);
+        return;
     }
 
     url = canonicalizeRhoUrl(url);
@@ -1273,6 +1269,11 @@ const char* rho_rhodesapp_getblobsdirpath()
     return RHODESAPP().getBlobsDirPath().c_str();
 }
 
+const char* rho_rhodesapp_getapprootpath() {
+    return RHODESAPP().getAppRootPath().c_str();
+}
+
+
 void rho_rhodesapp_navigate_back()
 {
     RHODESAPP().navigateBack();