rhodes 3.0.0 → 3.0.1.beta.2

data/platform/iphone/Info.plist

@@ -38,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3.0.0</string>
+	<string>3.0.1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

data/platform/shared/common/RhodesApp.cpp

@@ -296,8 +296,11 @@ void CRhodesApp::run()
     LOG(INFO) + "RhodesApp thread shutdown";
 
     rubyext::CGeoLocation::Destroy();
-    RhoRubyStop();
     sync::CSyncThread::Destroy();
+
+    net::CAsyncHttp::Destroy();
+
+    RhoRubyStop();
 }
 
 CRhodesApp::~CRhodesApp(void)
@@ -341,7 +344,7 @@ void CRhodesApp::stopApp()
         stop(2000);
     }
 
-    net::CAsyncHttp::Destroy();
+//    net::CAsyncHttp::Destroy();
 }
 
 template <typename T>
@@ -958,7 +961,10 @@ boolean CRhodesApp::sendLog()
 
     boolean bOldSaveToFile = LOGCONF().isLogToFile();
     LOGCONF().setLogToFile(false);
-    NetResponse resp = getNetRequest().pushMultipartData( strQuery, oItem, &(rho::sync::CSyncThread::getSyncEngine()), null );
+    NetRequest oNetRequest;
+    oNetRequest.setSslVerifyPeer(false);
+
+    NetResponse resp = getNetRequest(&oNetRequest).pushMultipartData( strQuery, oItem, &(rho::sync::CSyncThread::getSyncEngine()), null );
     LOGCONF().setLogToFile(bOldSaveToFile);
 
     if ( !resp.isOK() )

data/platform/shared/curl/lib/rhossl.c

@@ -142,8 +142,11 @@ void Curl_rhossl_close(struct connectdata *conn, int sockindex)
 int Curl_rhossl_shutdown(struct connectdata *conn, int sockindex)
 {
     struct ssl_connect_data *connssl = &conn->ssl[sockindex];
-    rho_ssl_shutdown(connssl->storage);
-    rho_ssl_free_storage(connssl->storage);
+    if(connssl->storage != 0) {
+        rho_ssl_shutdown(connssl->storage);
+        rho_ssl_free_storage(connssl->storage);
+        connssl->storage = NULL;
+    }
     return 0;
 }
 

data/platform/shared/db/DBAdapter.cpp

@@ -975,6 +975,15 @@ int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB)
     return 0;
 }
 
+int rho_db_close(void* pDB)
+{
+    rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);
+    db.close();
+
+    //TODO: get error code from DBException
+    return 0;
+}
+
 int rho_db_startTransaction(void* pDB)
 {
     rho::db::CDBAdapter& db = *((rho::db::CDBAdapter*)pDB);

data/platform/shared/net/CURLNetRequest.cpp

@@ -171,7 +171,7 @@ INetResponse* CURLNetRequest::doRequest(const char *method, const String& strUrl
                                         Hashtable<String,String>* pHeaders)
 {
     INetResponse* pResp = doPull(method, strUrl, strBody, null, oSession, pHeaders);
-	return pResp;
+    return pResp;
 }
 
 CURLcode CURLNetRequest::doCURLPerform(const String& strUrl)
@@ -198,8 +198,12 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
     if (oFile)
         nStartFrom = oFile->size();
 
-	if( !net::URI::isLocalHost(strUrl.c_str()) )	
-	   rho_net_impl_network_indicator(1);
+	if( !net::URI::isLocalHost(strUrl.c_str()) )
+    {
+        //Log every non localhost requests
+        RAWLOG_INFO2("%s request (Pull): %s", method, strUrl.c_str());
+        rho_net_impl_network_indicator(1);
+    }
 
     Hashtable<String,String> h;
     if (pHeaders)
@@ -277,6 +281,7 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
     int nRespCode = -1;
     String strRespBody;
     
+    RAWLOG_INFO1("POST request (Push): %s", strUrl.c_str());
     rho_net_impl_network_indicator(1);
     
     curl_slist *hdrs = m_curl.set_options("POST", strUrl, String(), oSession, pHeaders);

data/platform/shared/net/iphone/sslimpl.cpp

@@ -39,12 +39,13 @@ static void report_error(const char *s, CFStreamError *e)
 
 void * SSLImpl::createStorage()
 {
-    return malloc(sizeof(ssl_data_t));
+    return calloc(1, sizeof(ssl_data_t));
 }
 
 void SSLImpl::freeStorage(void *ptr)
 {
-    free(ptr);
+    if (ptr)
+        free(ptr);
 }
     
 CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)

data/platform/shared/net/ssl.cpp

@@ -1,37 +1,45 @@
 #include "net/ssl.h"
 #include "common/IRhoClassFactory.h"
 
+#include "logging/RhoLog.h"
+
 extern "C" {
 
 #define GETSSL rho_get_RhoClassFactory()->createSSLEngine()
 
 void *rho_ssl_create_storage()
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_create_storage");
     return GETSSL->createStorage();
 }
 
 void rho_ssl_free_storage(void *ptr)
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_free_storage");
     return GETSSL->freeStorage(ptr);
 }
 
 CURLcode rho_ssl_connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_connect");
     return GETSSL->connect(sockfd, nonblocking, done, ssl_verify_peer, storage);
 }
 
 void rho_ssl_shutdown(void *storage)
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_shutdown");
     return GETSSL->shutdown(storage);
 }
 
 ssize_t rho_ssl_send(const void *mem, size_t len, void *storage)
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_send");
     return GETSSL->send(mem, len, storage);
 }
 
 ssize_t rho_ssl_recv(char *buf, size_t size, int *wouldblock, void *storage)
 {
+    RAWTRACEC("rho_ssl", "rho_ssl_recv");
     return GETSSL->recv(buf, size, wouldblock, storage);
 }
 

data/platform/shared/ruby/ext/rho/rhoruby.c

@@ -501,6 +501,16 @@ int rho_ruby_unpack_byte_array(VALUE array_value, unsigned char* buf, int max_le
 	return size;
 }
 
+int rho_ruby_array_get_size(VALUE ar) {
+    int size = 0;
+	if (TYPE(ar) != T_ARRAY) {
+		return -1;
+	}
+	size = RARRAY_LEN(ar);
+    return size;    
+}
+
+
 
 
 VALUE rho_ruby_createHash() {

data/platform/shared/ruby/ext/rho/rhoruby.h

@@ -54,6 +54,7 @@ VALUE addStrToHashLen(VALUE hash, const char* key, const char* val, int len);
 VALUE addHashToHash(VALUE hash, const char* key, VALUE val);	
 VALUE rho_ruby_hash_aref(VALUE hash, const char* key);
 VALUE rho_ruby_array_get(VALUE ar, int nIndex);
+int rho_ruby_array_get_size(VALUE ar);
 
 char* getStringFromValue(VALUE val);
 int getStringLenFromValue(VALUE val);

data/platform/shared/ruby/ext/sqlite3_api/sqlite3_api_wrap.c

@@ -9,7 +9,7 @@ static VALUE mSqlite3;
 static VALUE mDatabase;
 
 extern int rho_db_open(const char* szDBPath, const char* szDBPartition, void** ppDB);
-//extern int rho_sync_closeDB();
+extern int rho_db_close(void* pDB);
 extern int rho_db_startTransaction(void* pDB);
 extern int rho_db_commitTransaction(void* pDB);
 extern int rho_db_rollbackTransaction(void* pDB);
@@ -60,9 +60,8 @@ static VALUE db_close(int argc, VALUE *argv, VALUE self){
 	
 	Data_Get_Struct(self, void *, ppDB);
 	
-    //do not close sync db, close it at exit
-	rc = 0;//rho_sync_closeDB();//sqlite3_close(db);
-	
+    rc = rho_db_close(*ppDB);
+
 	return INT2NUM(rc);
 }
 

data/platform/wm/build/wm.rake

@@ -163,6 +163,12 @@ namespace "build" do
     task :rhosimulator => ["config:set_win32_platform", "config:wm"] do
         chdir $config["build"]["wmpath"]
 
+        qtdir = ENV['QTDIR']
+        unless (qtdir !~/^\s*$/) and File.directory?(qtdir)
+          puts "\nPlease, set QTDIR environment variable to Qt root directory path"
+          exit 1
+        end
+
         args = ['/M4', 'rhodes.sln', '"EmulatorRelease|win32"']
         puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
         puts Jake.run($vcbuild,args)
@@ -173,9 +179,27 @@ namespace "build" do
           puts "Error building"
           exit 1
         end
-        
-        cp File.join($startdir, $vcbindir, "win32/rhodes/EmulatorRelease/rhosimulator.exe"), 
-            File.join( $startdir, "platform/win32/RhoSimulator/")
+
+        target_path = File.join( $startdir, "platform/win32/RhoSimulator/")
+        if not File.directory?(target_path)
+          Dir.mkdir(target_path)
+        end
+        cp File.join($startdir, $vcbindir, "win32/rhodes/EmulatorRelease/rhosimulator.exe"), target_path
+
+        cp File.join(qtdir, "bin/QtCore4.dll"), target_path
+        cp File.join(qtdir, "bin/QtGui4.dll"), target_path
+        cp File.join(qtdir, "bin/QtNetwork4.dll"), target_path
+        cp File.join(qtdir, "bin/QtWebKit4.dll"), target_path
+        target_if_path = File.join(target_path, 'imageformats/')
+        if not File.directory?(target_if_path)
+          Dir.mkdir(target_if_path)
+        end
+        cp File.join(qtdir, "plugins/imageformats/qgif4.dll"), target_if_path
+        cp File.join(qtdir, "plugins/imageformats/qico4.dll"), target_if_path
+        cp File.join(qtdir, "plugins/imageformats/qjpeg4.dll"), target_if_path
+        cp File.join(qtdir, "plugins/imageformats/qmng4.dll"), target_if_path
+        cp File.join(qtdir, "plugins/imageformats/qsvg4.dll"), target_if_path
+        cp File.join(qtdir, "plugins/imageformats/qtiff4.dll"), target_if_path
     end
 
   end

data/platform/wm/rhodes/Rhodes.cpp

@@ -314,6 +314,10 @@ public :
         rho_clientregister_destroy();
 #endif
 
+#ifdef RHODES_EMULATOR
+        m_appWindow.DestroyUi();
+#endif
+
         rho::common::CRhodesApp::Destroy();
 
         net::CNetRequestImpl::deinitConnection();

data/platform/wm/rhodes/emulator/MainWindowCallback.h

@@ -11,6 +11,7 @@ public:
     virtual void logEvent(const ::std::string& message) = 0;
     virtual void createCustomMenu(void) = 0;
     virtual void onCustomMenuItemCommand(int nItemPos) = 0;
+    virtual void onWindowClose(void) = 0;
 protected:
     virtual ~IMainWindowCallback() {};
 };

data/platform/wm/rhodes/emulator/MainWindowProxy.cpp

@@ -33,7 +33,7 @@ CMainWindowProxy::~CMainWindowProxy(void)
 void CMainWindowProxy::navigate(const wchar_t* url)
 {
     LOG(INFO) + "navigate: '"+url+"'";
-    ((QtMainWindow*)qtMainWindow)->navigate(QUrl(QString::fromWCharArray(url)));
+    ((QtMainWindow*)qtMainWindow)->navigate(QString::fromWCharArray(url));
 }
 
 void CMainWindowProxy::setCallback(IMainWindowCallback* callback)
@@ -44,6 +44,8 @@ void CMainWindowProxy::setCallback(IMainWindowCallback* callback)
 void* CMainWindowProxy::init(IMainWindowCallback* callback, const wchar_t* title)
 {
     int argc = 0;
+	QCoreApplication::setOrganizationName("Rhomobile");
+	QCoreApplication::setApplicationName("RhoSimulator");
     qtApplication = (void*)new QApplication(argc, 0);
     qtMainWindow = (void*)new QtMainWindow();
     ((QtMainWindow*)qtMainWindow)->setWindowTitle(QString::fromWCharArray(title));

data/platform/wm/rhodes/emulator/MainWindowQt.cpp

@@ -20,6 +20,8 @@ extern "C" void rho_geoimpl_turngpsoff();
 int CMainWindow::m_screenWidth;
 int CMainWindow::m_screenHeight;
 
+bool CMainWindow::mainWindowClosed = false;
+
 CMainWindow::CMainWindow() { }
 
 CMainWindow::~CMainWindow() { }
@@ -114,6 +116,15 @@ void CMainWindow::onCustomMenuItemCommand(int nItemPos)
     oMenuItem.processCommand();
 }
 
+void CMainWindow::DestroyUi(void)
+{
+    rho_rhodesapp_callUiDestroyedCallback();
+}
+
+void CMainWindow::onWindowClose(void)
+{
+     mainWindowClosed = true;
+}
 
 // **************************************************************************
 //
@@ -138,8 +149,6 @@ LRESULT CMainWindow::OnExecuteRunnable(UINT /*uMsg*/, WPARAM wParam, LPARAM lPar
 
 LRESULT CMainWindow::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BOOL& bHandled)
 {
-    rho_rhodesapp_callUiDestroyedCallback();
-
     if(m_logView.IsWindow()) {
         m_logView.DestroyWindow();
     }
@@ -147,8 +156,8 @@ LRESULT CMainWindow::OnDestroy(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam
 
     if (m_alertDialog && m_alertDialog->IsWindow() )
         m_alertDialog->DestroyWindow();
-    if (m_SyncStatusDlg.IsWindow() )
-        m_SyncStatusDlg.DestroyWindow();
+    if (m_SyncStatusDlg && m_SyncStatusDlg->IsWindow() )
+        m_SyncStatusDlg->DestroyWindow();
 
     PostQuitMessage(0);
 
@@ -256,18 +265,20 @@ LRESULT CMainWindow::OnAlertShowPopup (UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM
     StringW strAppName = RHODESAPP().getAppNameW();
     CAlertDialog::Params *params = (CAlertDialog::Params *)lParam;
 
-       if (params->m_dlgType == CAlertDialog::Params::DLG_STATUS) 
+    if (params->m_dlgType == CAlertDialog::Params::DLG_STATUS) 
     {
-        m_SyncStatusDlg.setStatusText(convertToStringW(params->m_message).c_str());
-        m_SyncStatusDlg.setTitle( convertToStringW(params->m_title).c_str() );
-        if ( !m_SyncStatusDlg.m_hWnd )
-            m_SyncStatusDlg.Create(m_hWnd, 0);
+        if (m_SyncStatusDlg == NULL) 
+            m_SyncStatusDlg = new CSyncStatusDlg();
+        m_SyncStatusDlg->setStatusText(convertToStringW(params->m_message).c_str());
+        m_SyncStatusDlg->setTitle( convertToStringW(params->m_title).c_str() );
+        if ( !m_SyncStatusDlg->m_hWnd )
+            m_SyncStatusDlg->Create(m_hWnd, 0);
         else
         {
-            m_SyncStatusDlg.ShowWindow(SW_SHOW);
-            m_SyncStatusDlg.BringWindowToTop();
+            m_SyncStatusDlg->ShowWindow(SW_SHOW);
+            m_SyncStatusDlg->BringWindowToTop();
         }
-    }else if (params->m_dlgType == CAlertDialog::Params::DLG_DEFAULT) {
+    } else if (params->m_dlgType == CAlertDialog::Params::DLG_DEFAULT) {
         MessageBox(convertToStringW(params->m_message).c_str(), strAppName.c_str(), MB_ICONWARNING | MB_OK);
     } else if (params->m_dlgType == CAlertDialog::Params::DLG_CUSTOM) 
     {

data/platform/wm/rhodes/emulator/MainWindowQt.h

@@ -44,14 +44,18 @@ public:
     virtual void logEvent(const ::std::string& message);
     virtual void createCustomMenu(void);
     virtual void onCustomMenuItemCommand(int nItemPos);
+	virtual void onWindowClose(void);
     // public methods:
     void Navigate2(BSTR URL);
     HWND Initialize(const wchar_t* title);
     void MessageLoop(void);
+	void DestroyUi(void);
     void performOnUiThread(rho::common::IRhoRunnable* pTask);
     CNativeToolbar& getToolbar(){ return m_toolbar; }
     CMainWindowProxy &getProxy(){ return m_mainWindowProxy; }
     HWND getWebViewHWND();
+	// for 'main_window_closed' System property
+	static bool mainWindowClosed;
 
     BEGIN_MSG_MAP(CMainWindow)
         MESSAGE_HANDLER(WM_DESTROY, OnDestroy)
@@ -110,7 +114,7 @@ public:
 private:
     rho::Vector<rho::common::CAppMenuItem> m_arAppMenuItems;
     CAlertDialog *m_alertDialog;
-    CSyncStatusDlg m_SyncStatusDlg;
+    CSyncStatusDlg *m_SyncStatusDlg;
 };
 
 #if !defined(_WIN32_WCE)

data/platform/wm/rhodes/emulator/QtMainWindow.cpp

@@ -3,11 +3,20 @@
 #include "ui_QtMainWindow.h"
 #include "ExternalWebView.h"
 #include <QResizeEvent>
+#include <QWebFrame>
+#include <QWebSettings>
+#include <QWebSecurityOrigin>
+#include "ext/rho/rhoruby.h"
 #include "common/RhoStd.h"
 #include "common/RhodesApp.h"
 #include "rubyext/WebView.h"
 #undef null
 
+extern "C" {
+	extern VALUE rb_thread_main(void);
+	extern VALUE rb_thread_wakeup(VALUE thread);
+}
+
 QtMainWindow::QtMainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::QtMainWindow),
@@ -15,8 +24,22 @@ QtMainWindow::QtMainWindow(QWidget *parent) :
     cb(NULL)
 {
     ui->setupUi(this);
-    this->ui->webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+
+    QWebSettings* qs = QWebSettings::globalSettings(); //this->ui->webView->settings();
+    qs->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+    qs->setAttribute(QWebSettings::LocalStorageEnabled, true);
+    qs->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, true);
+    qs->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
+    qs->setOfflineStorageDefaultQuota(1024*1024*1024);
+
+    rho::String rs_dir = RHODESAPP().getRhoRootPath()+RHO_EMULATOR_DIR;
+    qs->setOfflineWebApplicationCachePath(rs_dir.c_str());
+    qs->setLocalStoragePath(rs_dir.c_str());
+    qs->setOfflineStoragePath(rs_dir.c_str());
+
     this->ui->webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
+    this->ui->webView->page()->mainFrame()->securityOrigin().setDatabaseQuota(1024*1024*1024);
+
     this->move(0,0);
     this->ui->toolBar->hide();
     this->ui->toolBarRight->hide();
@@ -52,7 +75,9 @@ void QtMainWindow::showEvent(QShowEvent *)
 
 void QtMainWindow::closeEvent(QCloseEvent *ce)
 {
-    wi->close();
+    rb_thread_wakeup(rb_thread_main());
+    if (cb) cb->onWindowClose();
+	wi->close();
     QMainWindow::closeEvent(ce);
 }
 
@@ -76,8 +101,11 @@ void QtMainWindow::on_webView_linkClicked(const QUrl& url)
         externalWebView->navigate(QUrl(sUrl.remove("rho_open_target=_blank")));
         externalWebView->show();
         externalWebView->activateWindow();
-    } else
-        ui->webView->setUrl(url);
+    } else {
+        sUrl.remove(QRegExp("#+$"));
+        if (sUrl.compare(ui->webView->url().toString())!=0)
+            ui->webView->load(QUrl(sUrl));
+    }
 }
 
 void QtMainWindow::on_webView_loadStarted()
@@ -100,9 +128,14 @@ void QtMainWindow::on_menuMain_aboutToShow()
     if (cb) cb->createCustomMenu();
 }
 
-void QtMainWindow::navigate(QUrl url)
+void QtMainWindow::navigate(QString url)
 {
-    ui->webView->setUrl(url);
+    if (url.startsWith("javascript:", Qt::CaseInsensitive)) {
+        url.remove(0,11);
+        ui->webView->stop();
+        ui->webView->page()->mainFrame()->evaluateJavaScript(url);
+    } else
+        ui->webView->load(QUrl(url));
 }
 
 void QtMainWindow::GoBack(void)