rhodes 3.1.0.beta.2 → 3.1.0.beta.3

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist

@@ -6,15 +6,13 @@
 	<string>rho.icns</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-    <key>CFBundleGetInfoString</key>
+	<key>CFBundleGetInfoString</key>
 	<string>Created by Qt/QMake</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
 	<string>RhoSimulator</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.RhoSimulator</string>
-	<key>NOTE</key>
-	<string>This file was generated by Qt/QMake.</string>
+	<string>com.rhomobile.RhoSimulator</string>
 </dict>
 </plist>

data/platform/shared/common/Android.mk

@@ -0,0 +1,35 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhomain
+LOCAL_SRC_FILES := RhodesApp.cpp RhodesAppBase.cpp
+LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhocommon
+LOCAL_SRC_FILES := \
+    app_build_configs.c \
+    AppMenu.cpp \
+    map/ESRIMapEngine.cpp \
+    map/GoogleMapEngine.cpp \
+    map/MapEngine.cpp \
+    PosixThreadImpl.cpp \
+    RhoConf.cpp \
+    RhoFile.cpp \
+    RhoMath.cpp \
+    rhoparams.cpp \
+    RhoThread.cpp \
+    SplashScreen.cpp \
+    ThreadQueue.cpp \
+    Tokenizer.cpp \
+    RhoTime.cpp
+LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
+    #$(SHARED_PATH_INC)/curl/include
+#    $(SHARED_PATH_INC)/ruby/include \
+#    $(SHARED_PATH_INC)/ruby/linux
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/common/RhodesApp.cpp

@@ -675,10 +675,10 @@ static void callback_getrhomessage(void *arg, String const &strQuery)
         strMsg = rho_ruby_internal_getErrorText(nError);
     }else
     {
-        size_t nErrorPos = strQuery.find("msgid=");
-        if ( nErrorPos != String::npos )
+        size_t nMsgIdPos = strQuery.find("msgid=");
+        if ( nMsgIdPos != String::npos )
         {
-            String strName = strQuery.substr(nErrorPos+6);
+            String strName = strQuery.substr(nMsgIdPos+6);
             strMsg = rho_ruby_internal_getMessageText(strName.c_str());
         }
     }
@@ -736,9 +736,9 @@ void CRhodesApp::initHttpServer()
 const char* CRhodesApp::getFreeListeningPort()
 {
     int sockfd = -1;
-	struct sockaddr_in serv_addr = {0};
+    sockaddr_in serv_addr = sockaddr_in();
     int noerrors = 1;
-    
+
 	if ( m_strListeningPorts.length() > 0 )
 		return m_strListeningPorts.c_str();
 	
@@ -848,7 +848,7 @@ void CRhodesApp::initAppUrls()
 {
     CRhodesAppBase::initAppUrls(); 
     
-#if defined( OS_WINCE ) || defined( __SYMBIAN32__ )
+#if defined( OS_WINCE ) || defined( __SYMBIAN32__ ) || defined( OS_ANDROID )
     m_strHomeUrl = "http://localhost:";
 #else
     m_strHomeUrl = "http://127.0.0.1:";
@@ -877,7 +877,7 @@ const String& CRhodesApp::getCurrentUrl(int index)
 { 
     if (index < 0) index = rho_webview_active_tab();
     if (index < 0) index = 0;
-    if ( index < m_currentUrls.size() )
+    if ( index < static_cast<int>(m_currentUrls.size()) )
         return m_currentUrls[index]; 
 
     return m_EmptyString;
@@ -888,7 +888,7 @@ const String& CRhodesApp::getAppBackUrl()
     int index = rho_webview_active_tab();
     if (index < 0)
         index = 0;
-    if ( index < m_arAppBackUrl.size() )
+    if ( index < static_cast<int>(m_arAppBackUrl.size()) )
         return m_arAppBackUrl[index]; 
 
     return m_EmptyString;
@@ -922,12 +922,15 @@ void CRhodesApp::navigateBack()
 {
     int nIndex = rho_webview_active_tab();
 
-    if ( nIndex < m_arAppBackUrlOrig.size() && m_arAppBackUrlOrig[nIndex].length() > 0 )
+    if((nIndex < static_cast<int>(m_arAppBackUrlOrig.size()))
+        && (m_arAppBackUrlOrig[nIndex].length() > 0))
+    {
         loadUrl(m_arAppBackUrlOrig[nIndex]);
-    else if ( strcasecmp(getCurrentUrl(nIndex).c_str(),getStartUrl().c_str()) != 0 )
-	{
+    }
+    else if(strcasecmp(getCurrentUrl(nIndex).c_str(),getStartUrl().c_str()) != 0)
+    {
         rho_webview_navigate_back();
-	}
+    }
 }
 
 String CRhodesApp::getAppName()
@@ -1054,9 +1057,9 @@ public:
 
         if (m_strCallback.length() > 0) 
         {
-            String body = isOK ? "rho_callback=1&status=ok" : "rho_callback=1&status=error";
+            const char* body = isOK ? "rho_callback=1&status=ok" : "rho_callback=1&status=error";
 
-            rho_net_request_with_data(rho_http_normalizeurl(m_strCallback.c_str()), body.c_str());
+            rho_net_request_with_data(RHODESAPP().canonicalizeRhoUrl(m_strCallback).c_str(), body);
         }
 
         RHODESAPP().setSendingLog(false);

data/platform/shared/common/map/ESRIMapEngine.cpp

@@ -473,8 +473,11 @@ ESRIMapView::ESRIMapView(IDrawingDevice *device)
 
 ESRIMapView::~ESRIMapView()
 {
-    if ( m_map_fetch.get() != 0)
+    if ( m_map_fetch.get() != 0) {
+        m_map_fetch->cancel();
+    
         m_map_fetch->stop(2000);
+    }
 
     if ( m_cache_update.get() != 0)
         m_cache_update->stop(2000);

data/platform/shared/curl/Android.mk

@@ -0,0 +1,88 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := curl
+LOCAL_SRC_FILES := \
+    lib/amigaos.c \
+    lib/base64.c \
+    lib/connect.c \
+    lib/content_encoding.c \
+    lib/cookie.c \
+    lib/curl_addrinfo.c \
+    lib/curl_memrchr.c \
+    lib/curl_rand.c \
+    lib/curl_sspi.c \
+    lib/dict.c \
+    lib/easy.c \
+    lib/escape.c \
+    lib/file.c \
+    lib/formdata.c \
+    lib/ftp.c \
+    lib/getenv.c \
+    lib/getinfo.c \
+    lib/gtls.c \
+    lib/hash.c \
+    lib/hostares.c \
+    lib/hostasyn.c \
+    lib/hostip.c \
+    lib/hostip4.c \
+    lib/hostip6.c \
+    lib/hostsyn.c \
+    lib/hostthre.c \
+    lib/http.c \
+    lib/http_chunks.c \
+    lib/http_digest.c \
+    lib/http_negotiate.c \
+    lib/if2ip.c \
+    lib/inet_ntop.c \
+    lib/inet_pton.c \
+    lib/krb4.c \
+    lib/krb5.c \
+    lib/ldap.c \
+    lib/llist.c \
+    lib/md5.c \
+    lib/memdebug.c \
+    lib/mprintf.c \
+    lib/multi.c \
+    lib/netrc.c \
+    lib/nonblock.c \
+    lib/nss.c \
+    lib/nwlib.c \
+    lib/nwos.c \
+    lib/parsedate.c \
+    lib/progress.c \
+    lib/rawstr.c \
+    lib/rhossl.c \
+    lib/security.c \
+    lib/select.c \
+    lib/sendf.c \
+    lib/share.c \
+    lib/slist.c \
+    lib/socks.c \
+    lib/socks_gssapi.c \
+    lib/socks_sspi.c \
+    lib/speedcheck.c \
+    lib/splay.c \
+    lib/ssh.c \
+    lib/sslgen.c \
+    lib/strdup.c \
+    lib/strequal.c \
+    lib/strerror.c \
+    lib/strtok.c \
+    lib/strtoofft.c \
+    lib/telnet.c \
+    lib/tftp.c \
+    lib/timeval.c \
+    lib/transfer.c \
+    lib/url.c \
+    lib/version.c
+
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH)/include \
+    $(LOACL_PATH)/lib \
+    $(SHARED_PATH_INC)
+
+LOCAL_CFLAGS := -DHAVE_CONFIG_H
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/db/Android.mk

@@ -0,0 +1,12 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhodb
+LOCAL_SRC_FILES := \
+    DBAdapter.cpp \
+    DBAttrManager.cpp \
+    DBResult.cpp
+LOCAL_C_INCLUDES := $(LOCAL_PATH)b $(SHARED_PATH_INC) $(SHARED_PATH_INC)/sqlite
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/db/DBResult.h

@@ -111,7 +111,7 @@ public:
 
     String getColName(int nCol)
     {
-        return sqlite3_column_name(m_dbStatement,nCol);;
+        return sqlite3_column_name(m_dbStatement,nCol);
     }
 
 };

data/platform/shared/json/Android.mk

@@ -0,0 +1,18 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := json
+LOCAL_SRC_FILES := \
+    JSONIterator.cpp \
+    RJSONTokener.c \
+    arraylist.c \
+    json_debug.c \
+    json_object.c \
+    json_tokener.c \
+    json_util.c \
+    linkhash.c \
+    printbuf.c
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/logging/Android.mk

@@ -0,0 +1,13 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rholog
+LOCAL_SRC_FILES := \
+    RhoLogConf.cpp \
+    RhoLog.cpp \
+    RhoLogSink.cpp \
+    RhoPlainLog.cpp
+LOCAL_C_INCLUDES := $(SHARED_PATH_INC)
+
+include $(BUILD_STATIC_LIBRARY)

data/platform/shared/logging/RhoLogConf.cpp

@@ -332,9 +332,7 @@ void rho_conf_clean_log()
 #ifndef RHO_NO_RUBY
 VALUE rho_conf_get_property_by_name(char* name)
 {
-	char* szValue = rho_conf_getString(name);
-
-    return rho_ruby_create_string(szValue);
+    return rho_ruby_create_string(RHOCONF().getString(name).c_str());
 }
 
 VALUE rho_conf_get_conflicts()

data/platform/shared/net/Android.mk

@@ -0,0 +1,19 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE    := rhonet
+LOCAL_SRC_FILES := \
+    AsyncHttp.cpp \
+    CURLNetRequest.cpp \
+    HttpServer.cpp \
+    ssl.cpp \
+    URI.cpp \
+    INetRequest.cpp
+LOCAL_C_INCLUDES := \
+    $(SHARED_PATH_INC) \
+    $(SHARED_PATH_INC)/curl/include
+#    $(SHARED_PATH_INC)/ruby/include \
+#    $(SHARED_PATH_INC)/ruby/linux
+
+include $(BUILD_STATIC_LIBRARY)

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

@@ -31,6 +31,7 @@
 #include "QtMainWindow.h"
 #include "ui_QtMainWindow.h"
 #include "ExternalWebView.h"
+#include "RhoSimulator.h"
 #include <QResizeEvent>
 #include <QWebFrame>
 #include <QWebSettings>
@@ -477,10 +478,9 @@ void QtMainWindow::on_tabBar_currentChanged(int index)
         if (tbrp["on_change_tab_callback"].toString().length() > 0) {
             QString body = QString("&rho_callback=1&tab_index=") + QVariant(index).toString();
             rho::String* cbStr = new rho::String(tbrp["on_change_tab_callback"].toString().toStdString());
-            const char* cb = cbStr->c_str();
             rho::String* bStr = new rho::String(body.toStdString());
             const char* b = bStr->c_str();
-            rho_net_request_with_data(rho_http_normalizeurl(cb), b);
+            rho_net_request_with_data(RHODESAPP().canonicalizeRhoUrl(*cbStr).c_str(), b);
         }
 
         if (tbrp["reload"].toBool() || (ui->webView && (ui->webView->history()->count()==0))) {
@@ -594,6 +594,11 @@ void QtMainWindow::menuActionEvent(bool checked)
         cb->onCustomMenuItemCommand(action->data().toInt());
 }
 
+void QtMainWindow::on_actionAbout_triggered()
+{
+    QMessageBox::about(this, RHOSIMULATOR_NAME, RHOSIMULATOR_NAME " v" RHOSIMULATOR_VERSION);
+}
+
 // slots:
 
 void QtMainWindow::exitCommand()

data/platform/shared/qt/rhodes/QtMainWindow.h

@@ -121,6 +121,7 @@ private slots:
     void on_actionBack_triggered();
     void on_tabBar_currentChanged(int index);
     void on_menuMain_aboutToShow();
+    void on_actionAbout_triggered();
 private slots:
     void toolbarActionEvent(bool);
     void menuActionEvent(bool);

data/platform/shared/qt/rhodes/QtMainWindow.ui

@@ -62,8 +62,15 @@
     </property>
     <addaction name="actionBack"/>
    </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>Help</string>
+    </property>
+    <addaction name="actionAbout"/>
+   </widget>
    <addaction name="menuMain"/>
    <addaction name="menuNavigate"/>
+   <addaction name="menuHelp"/>
   </widget>
   <widget class="QToolBar" name="toolBar">
    <property name="windowTitle">
@@ -116,6 +123,11 @@
     <string>Back</string>
    </property>
   </action>
+  <action name="actionAbout">
+   <property name="text">
+    <string>About</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>

data/platform/shared/qt/rhodes/RhoSimulator.h

@@ -0,0 +1,33 @@
+/*------------------------------------------------------------------------
+* (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
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* 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
+*------------------------------------------------------------------------*/
+
+#ifndef RHOSIMULATOR_H
+#define RHOSIMULATOR_H
+
+#define RHOSIMULATOR_NAME "RhoSimulator"
+#define RHOSIMULATOR_VERSION "3.1.0"
+
+#endif // RHOSIMULATOR_H