rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/platform/shared/net/AsyncHttp.cpp

@@ -134,15 +134,15 @@ void CAsyncHttp::CHttpCommand::execute()
                     CRhoParams oItem = arParams.getItem(i);
 
                     net::CMultipartItem* pItem = new net::CMultipartItem();
-                    String strBody = oItem.getString("body");
-                    if ( strBody.length() > 0 )
+                    String strFilePath = oItem.getString("filename");
+                    if ( strFilePath.length() == 0 )
                     {
-                        pItem->m_strBody = strBody;
-                        pItem->m_strContentType = oItem.getString("content_type", "application/x-www-form-urlencoded");
+                        pItem->m_strBody = oItem.getString("body");
+                        pItem->m_strContentType = oItem.getString("content_type", "");
                     }
                     else
                     {
-                        pItem->m_strFilePath = oItem.getString("filename");
+                        pItem->m_strFilePath = strFilePath;
                         pItem->m_strContentType = oItem.getString("content_type", "application/octet-stream");
                     }
 

data/platform/shared/net/CURLNetRequest.cpp

@@ -81,7 +81,7 @@ public:
 
 INetResponse *CURLNetRequest::makeResponse(String strBody, int nErrorCode)
 {
-    std::auto_ptr<CURLNetResponseImpl> resp(new CURLNetResponseImpl(strBody, nErrorCode));
+    std::auto_ptr<CURLNetResponseImpl> resp(new CURLNetResponseImpl(strBody, nErrorCode>0?nErrorCode:-1));
     if (resp->isOK())
         resp->setCookies(makeCookies());
     return resp.release();
@@ -118,6 +118,7 @@ static size_t curlBodyStringCallback(void *ptr, size_t size, size_t nmemb, void
     return nBytes;
 }
 
+extern "C" int rho_net_ping_network(const char* szHost);	
 INetResponse* CURLNetRequest::pullData(const String& strUrl, IRhoSession* oSession )
 {
     RAWLOG_INFO1("GET url: %s", strUrl.c_str());
@@ -144,9 +145,24 @@ INetResponse* CURLNetRequest::doRequest(const char *method, const String& strUrl
                                         const String& strBody, IRhoSession *oSession,
                                         Hashtable<String,String>* pHeaders)
 {
-    return doPull(method, strUrl, strBody, null, oSession, pHeaders);
+    INetResponse* pResp = doPull(method, strUrl, strBody, null, oSession, pHeaders);
+	return pResp;
 }
 
+CURLcode CURLNetRequest::doCURLPerform(const String& strUrl)
+{
+	CURLcode err = m_curl.perform();
+	if ( err !=  CURLE_OK && !net::URI::isLocalHost(strUrl.c_str()) )
+	{
+		long statusCode = 0;
+		curl_easy_getinfo(m_curl.curl(), CURLINFO_RESPONSE_CODE, &statusCode);
+		if ( statusCode == 0 && rho_net_ping_network(strUrl.c_str()) )
+			err = m_curl.perform();
+	}
+	
+	return err;
+}
+	
 INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
                                      const String& strBody, common::CRhoFile *oFile,
                                      IRhoSession* oSession, Hashtable<String,String>* pHeaders )
@@ -157,7 +173,8 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
     if (oFile)
         nStartFrom = oFile->size();
 
-    rho_net_impl_network_indicator(1);
+	if( !net::URI::isLocalHost(strUrl.c_str()) )	
+	   rho_net_impl_network_indicator(1);
 
     Hashtable<String,String> h;
     if (pHeaders)
@@ -177,7 +194,7 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         if (nStartFrom > 0)
             curl_easy_setopt(curl, CURLOPT_RESUME_FROM, nStartFrom);
 
-        CURLcode err = m_curl.perform();
+        CURLcode err = doCURLPerform(strUrl);
         curl_slist_free_all(hdrs);
         
         long statusCode = 0;
@@ -214,7 +231,8 @@ INetResponse* CURLNetRequest::doPull(const char* method, const String& strUrl,
         break;
     }
 
-    rho_net_impl_network_indicator(0);
+	if( !net::URI::isLocalHost(strUrl.c_str()) )		   
+	   rho_net_impl_network_indicator(0);
 
     return makeResponse(strRespBody, nRespCode);
 }
@@ -295,7 +313,7 @@ INetResponse* CURLNetRequest::pushMultipartData(const String& strUrl, VectorPtr<
         
     curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
     
-    CURLcode err = m_curl.perform();
+    CURLcode err = doCURLPerform(strUrl);
 	
     curl_slist_free_all(hdrs);
     curl_formfree(post);
@@ -347,7 +365,7 @@ INetResponse* CURLNetRequest::pushFile(const String& strUrl, const String& strFi
                  CURLFORM_END);
     curl_easy_setopt(curl, CURLOPT_HTTPPOST, post);
     
-    CURLcode err = m_curl.perform();
+	CURLcode err = doCURLPerform(strUrl);
 	
     curl_slist_free_all(hdrs);
     curl_formfree(post);

data/platform/shared/net/CURLNetRequest.h

@@ -72,7 +72,8 @@ private:
     int getResponseCode(CURLcode err, const String& strRespBody, IRhoSession* oSession);
     String makeCookies();
     INetResponse *makeResponse(String strBody, int nErrorCode);
-
+	CURLcode doCURLPerform(const String& strUrl);
+	
     CURLHolder m_curl;
 };
 

data/platform/shared/net/HttpServer.cpp

@@ -6,6 +6,10 @@
 
 #include <algorithm>
 
+#if !defined(OS_WINDOWS) && !defined(OS_WINCE)
+#include <arpa/inet.h>
+#endif
+
 #if !defined(OS_WINCE)
 #include <common/stat.h>
 #else
@@ -258,9 +262,31 @@ void CHttpServer::close_listener()
 
 void CHttpServer::stop()
 {
+    // WARNING!!! It is not enough to just close listener on Android
+    // to stop server. By unknown reason accept does not unblock if
+    // it was closed in another thread. However, on iPhone it works
+    // right. To work around this, we create dummy sockect and connect
+    // to the listener. This surely unblock accept on listener and,
+    // therefore, stop server thread (because m_active set to false).
     m_active = false;
+    RAWTRACE("Stopping server...");
+    SOCKET conn = socket(AF_INET, SOCK_STREAM, 0);
+    sockaddr_in sa;
+    memset(&sa, 0, sizeof(sa));
+    sa.sin_family = AF_INET;
+    sa.sin_port = htons((uint16_t)m_port);
+    sa.sin_addr.s_addr = inet_addr("127.0.0.1");
+    int err = connect(conn, (struct sockaddr *)&sa, sizeof(sa));
+    if (err == SOCKET_ERROR)
+        RAWLOG_ERROR1("Stopping server: can not connect to listener: %d", RHO_NET_ERROR_CODE);
+    else
+        RAWTRACE("Stopping server: command sent");
+    closesocket(conn);
+    /*
     RAWTRACE("Close listening socket");
     close_listener();
+    RAWTRACE("Listening socket closed");
+    */
 }
 
 void CHttpServer::register_uri(String const &uri, CHttpServer::callback_t const &callback)
@@ -338,7 +364,9 @@ bool CHttpServer::run()
     for(;;) {
         RAWTRACE("Waiting for connections...");
         rho_ruby_start_threadidle();
+        //RAWTRACE("Before accept...");
         SOCKET conn = accept(m_listener, NULL, NULL);
+        //RAWTRACE("After accept...");
         rho_ruby_stop_threadidle();
         if (!m_active) {
             RAWTRACE("Stop HTTP server");

data/platform/shared/ruby/ext/nativebar/nativebar.i

@@ -10,6 +10,8 @@ extern void nativebar_switch_tab(int index);
 #define switch_tab nativebar_switch_tab
 extern VALUE nativebar_started();
 #define started nativebar_started
+extern void nativebar_set_tab_badge(int index,char *val);
+#define set_tab_badge nativebar_set_tab_badge
 %}
 
 %typemap(in) (rho_param *p) {
@@ -24,3 +26,4 @@ extern void create(int bar_type, rho_param *p);
 extern void remove();
 extern void switch_tab(int index);
 extern VALUE started();
+extern void set_tab_badge(int index,char* val);

data/platform/shared/ruby/ext/nativebar/nativebar_wrap.c

@@ -1555,7 +1555,8 @@ extern void nativebar_switch_tab(int index);
 #define switch_tab nativebar_switch_tab
 extern VALUE nativebar_started();
 #define started nativebar_started
-
+extern void nativebar_set_tab_badge(int index,char* val);
+#define set_tab_badge nativebar_set_tab_badge
 
 #include <limits.h>
 #ifndef LLONG_MIN
@@ -1683,6 +1684,29 @@ fail:
   return Qnil;
 }
 
+SWIGINTERN VALUE
+_wrap_set_tab_badge(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  char* arg2 = 0;
+  int val1 ;
+  int ecode1 = 0 ;
+
+  if ((argc < 2) || (argc > 2)) {
+	  rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "set_tab_badge" "', argument " "1"" of type '" "int""'");
+  }
+  arg1 = (int)(val1);
+  arg2 = getStringFromValue(argv[1]);
+  set_tab_badge(arg1,arg2);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
 
 SWIGINTERN VALUE
 _wrap_started(int argc, VALUE *argv, VALUE self) {
@@ -1970,5 +1994,6 @@ SWIGEXPORT void Init_NativeBar(void) {
   rb_define_module_function(mNativeBar, "remove", _wrap_remove, -1);
   rb_define_module_function(mNativeBar, "switch_tab", _wrap_switch_tab, -1);
   rb_define_module_function(mNativeBar, "started", _wrap_started, -1);
+  rb_define_module_function(mNativeBar, "set_tab_badge", _wrap_set_tab_badge, -1);
 }
 

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

@@ -457,6 +457,12 @@ VALUE rho_ruby_array_get(VALUE ar, int nIndex)
 }
 
 char* getStringFromValue(VALUE val){
+    if (val == 0) {
+        return NULL;
+    }
+    if (TYPE(val) != T_STRING) {
+        return NULL;
+    }
     return RSTRING_PTR(val);
 }
 

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

@@ -102,6 +102,7 @@ struct CRhoRubyStringOrInt rho_ruby_getstringorint(VALUE val);
 const char* rho_ruby_getMessageText(const char* szName);
 const char* rho_ruby_getErrorText(int nError);
 const char* rho_ruby_internal_getErrorText(int nError);
+const char* rho_ruby_internal_getMessageText(const char* szName);
 
 VALUE rho_ruby_create_mutex();
 void rho_ruby_destroy_mutex(VALUE val);

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

@@ -561,10 +561,23 @@ static void Init_RhoJSON()
     rb_define_singleton_method(rb_RhoJSON, "quote_value", rho_json_quote_value, 1);
 }
 
+static VALUE rb_RhoMessages;
+static ID get_message_mid;
 const char* rho_ruby_internal_getMessageText(const char* szName)
 {
-    return "";
-    //TODO: rho_ruby_getMessageText
+    VALUE callres, strVal;
+    const char* szValue;
+    if ( !rb_RhoMessages )
+    {
+        rb_RhoMessages = rb_const_get(rb_RhoModule,rb_intern("RhoMessages"));
+        CONST_ID(get_message_mid, "get_message");
+    }
+
+    callres = rb_funcall(rb_RhoMessages, get_message_mid, 1, rb_str_new2(szName) );
+    strVal = rb_funcall(callres, rb_intern("to_s"), 0);
+    szValue = RSTRING_PTR(strVal);
+
+    return szValue;
 }
 
 static VALUE rb_RhoError;

data/platform/shared/ruby/ext/syncengine/syncengine.i

@@ -20,8 +20,11 @@
 	#define set_notification rho_sync_set_notification
 	extern void rho_sync_clear_notification(int source_id);
 	#define clear_notification rho_sync_clear_notification
-	extern void rho_sync_set_pollinterval(int interval);
+	extern int rho_sync_set_pollinterval(int interval);
 	#define set_pollinterval rho_sync_set_pollinterval
+	extern int rho_sync_get_pollinterval();
+	#define get_pollinterval rho_sync_get_pollinterval
+	
 	extern void rho_sync_set_syncserver(char* syncserver);
 	#define set_syncserver rho_sync_set_syncserver
 	extern VALUE rho_sync_get_attrs(const char* szPartition, int source_id);
@@ -51,6 +54,12 @@
 	#define clear_bulk_notification rho_sync_clear_bulk_notification
 	extern void rho_sync_set_threaded_mode(int b);
 	#define set_threaded_mode rho_sync_set_threaded_mode
+
+	extern void rho_sync_enable_status_popup(int b);
+	#define enable_status_popup rho_sync_enable_status_popup
+
+    extern void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
+	#define set_source_property rho_sync_set_source_property
 	
 	#if !defined(bool)
 	#define bool int
@@ -71,7 +80,8 @@ extern void logout();
 extern void stop_sync();
 extern void set_notification(int source_id, const char *url, char* params);
 extern void clear_notification(int source_id);
-extern void set_pollinterval(int interval);
+extern int set_pollinterval(int interval);
+extern int get_pollinterval();
 extern void set_syncserver(char* syncserver);
 extern VALUE get_src_attrs(const char* szPartition, int source_id);
 extern VALUE is_blob_attr(const char* szPartition, int source_id, const char* szAttrName);
@@ -82,3 +92,5 @@ extern int   get_lastsync_objectcount(int nSrcID);
 extern int   get_pagesize();
 extern void  set_pagesize(int pagesize);
 extern void  set_threaded_mode(bool b);
+extern void  enable_status_popup(bool b);
+extern void  set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);

data/platform/shared/ruby/ext/syncengine/syncengine_wrap.c

@@ -1833,8 +1833,11 @@ static VALUE mSyncEngine;
 	#define set_notification rho_sync_set_notification
 	extern void rho_sync_clear_notification(int source_id);
 	#define clear_notification rho_sync_clear_notification
-	extern void rho_sync_set_pollinterval(int interval);
+	extern int rho_sync_set_pollinterval(int interval);
 	#define set_pollinterval rho_sync_set_pollinterval
+	extern int rho_sync_get_pollinterval();
+	#define get_pollinterval rho_sync_get_pollinterval
+	
 	extern void rho_sync_set_syncserver(char* syncserver);
 	#define set_syncserver rho_sync_set_syncserver
 	extern VALUE rho_sync_get_attrs(const char* szPartition, int source_id);
@@ -1864,6 +1867,12 @@ static VALUE mSyncEngine;
 	#define clear_bulk_notification rho_sync_clear_bulk_notification
 	extern void rho_sync_set_threaded_mode(int b);
 	#define set_threaded_mode rho_sync_set_threaded_mode
+
+	extern void rho_sync_enable_status_popup(int b);
+	#define enable_status_popup rho_sync_enable_status_popup
+
+    extern void rho_sync_set_source_property(int nSrcID, const char* szPropName, const char* szPropValue);
+	#define set_source_property rho_sync_set_source_property
 	
 	#if !defined(bool)
 	#define bool int
@@ -2313,6 +2322,8 @@ _wrap_set_pollinterval(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   int val1 ;
   int ecode1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
   
   if ((argc < 1) || (argc > 1)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
@@ -2322,8 +2333,25 @@ _wrap_set_pollinterval(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","set_pollinterval", 1, argv[0] ));
   } 
   arg1 = (int)(val1);
-  set_pollinterval(arg1);
+  result = (int)set_pollinterval(arg1);
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
+fail:
   return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_get_pollinterval(int argc, VALUE *argv, VALUE self) {
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (int)get_pollinterval();
+  vresult = SWIG_From_int((int)(result));
+  return vresult;
 fail:
   return Qnil;
 }
@@ -2584,6 +2612,70 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_enable_status_popup(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","enable_status_popup", 1, argv[0] ));
+  } 
+  arg1 = (bool)(val1);
+  enable_status_popup(arg1);
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_set_source_property(int argc, VALUE *argv, VALUE self) {
+  int arg1 ;
+  char *arg2 = (char *) 0 ;
+  char *arg3 = (char *) 0 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  char *buf3 = 0 ;
+  int alloc3 = 0 ;
+  
+  if ((argc < 3) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_int(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "int","set_source_property", 1, argv[0] ));
+  } 
+  arg1 = (int)(val1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","set_source_property", 2, argv[1] ));
+  }
+  arg2 = (char *)(buf2);
+  res3 = SWIG_AsCharPtrAndSize(argv[2], &buf3, NULL, &alloc3);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "char const *","set_source_property", 3, argv[2] ));
+  }
+  arg3 = (char *)(buf3);
+  set_source_property(arg1,(char const *)arg2,(char const *)arg3);
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return Qnil;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
+  if (alloc3 == SWIG_NEWOBJ) free((char*)buf3);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2867,6 +2959,7 @@ SWIGEXPORT void Init_SyncEngine(void) {
   rb_define_module_function(mSyncEngine, "set_notification", _wrap_set_notification, -1);
   rb_define_module_function(mSyncEngine, "clear_notification", _wrap_clear_notification, -1);
   rb_define_module_function(mSyncEngine, "set_pollinterval", _wrap_set_pollinterval, -1);
+  rb_define_module_function(mSyncEngine, "get_pollinterval", _wrap_get_pollinterval, -1);
   rb_define_module_function(mSyncEngine, "set_syncserver", _wrap_set_syncserver, -1);
   rb_define_module_function(mSyncEngine, "get_src_attrs", _wrap_get_src_attrs, -1);
   rb_define_module_function(mSyncEngine, "is_blob_attr", _wrap_is_blob_attr, -1);
@@ -2877,5 +2970,7 @@ SWIGEXPORT void Init_SyncEngine(void) {
   rb_define_module_function(mSyncEngine, "get_pagesize", _wrap_get_pagesize, -1);
   rb_define_module_function(mSyncEngine, "set_pagesize", _wrap_set_pagesize, -1);
   rb_define_module_function(mSyncEngine, "set_threaded_mode", _wrap_set_threaded_mode, -1);
+  rb_define_module_function(mSyncEngine, "enable_status_popup", _wrap_enable_status_popup, -1);
+  rb_define_module_function(mSyncEngine, "set_source_property", _wrap_set_source_property, -1);
 }
 

data/platform/shared/ruby/ext/system/system.i

@@ -36,9 +36,18 @@ extern int rho_sys_set_sleeping(int sleeping);
 #define run_app rho_sys_run_app
 extern void rho_sys_run_app(const char* appname, VALUE params);
 
+#define get_start_params rho_sys_get_start_params
+extern const char* rho_sys_get_start_params();
+
 #define open_url rho_sys_open_url
 extern void rho_sys_open_url(const char* url);
 
+#define app_installed rho_sys_is_app_installed
+extern int rho_sys_is_app_installed(const char *appname);
+
+#define app_uninstall rho_sys_app_uninstall
+extern void rho_sys_app_uninstall(const char *appname);
+
 	#if !defined(bool)
 	#define bool int
 	#define true  1
@@ -83,4 +92,8 @@ extern void exit();
 extern void unzip_file( const char *path );
 extern int set_sleeping( bool sleeping );
 extern void run_app(const char *appname, VALUE params);
+extern const char* get_start_params();
 extern void open_url(const char *url);
+%predicate app_installed(const char *appname);
+extern int app_installed(const char *appname);
+extern void app_uninstall(const char *appname);

data/platform/shared/ruby/ext/system/system_wrap.c

@@ -1850,9 +1850,18 @@ extern int rho_sys_set_sleeping(int sleeping);
 #define run_app rho_sys_run_app
 extern void rho_sys_run_app(const char* appname, VALUE params);
 
+#define get_start_params rho_sys_get_start_params
+extern const char* rho_sys_get_start_params();
+
 #define open_url rho_sys_open_url
 extern void rho_sys_open_url(const char* url);
 
+#define app_installed rho_sys_is_app_installed
+extern int rho_sys_is_app_installed(const char *appname);
+
+#define app_uninstall rho_sys_app_uninstall
+extern void rho_sys_app_uninstall(const char *appname);
+
 	#if !defined(bool)
 	#define bool int
 	#define true  1
@@ -1932,7 +1941,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:D:\Install\swigwin\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:C:\Rhode\swigwin-2.0.0\Lib\ruby\rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2006,6 +2015,30 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
   return SWIG_TypeError;
 }
 
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtrAndSize(const char* carray, size_t size)
+{
+  if (carray) {
+    if (size > LONG_MAX) {
+      swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+      return pchar_descriptor ? 
+	SWIG_NewPointerObj((char *)(carray), pchar_descriptor, 0) : Qnil;
+    } else {
+      return rb_str_new(carray, (long)(size));
+    }
+  } else {
+    return Qnil;
+  }
+}
+
+
+SWIGINTERNINLINE VALUE 
+SWIG_FromCharPtr(const char *cptr)
+{ 
+  return SWIG_FromCharPtrAndSize(cptr, (cptr ? strlen(cptr) : 0));
+}
+
 SWIGINTERN VALUE
 _wrap_syscall(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
@@ -2314,6 +2347,22 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_get_start_params(int argc, VALUE *argv, VALUE self) {
+  char *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  result = (char *)get_start_params();
+  vresult = SWIG_FromCharPtr((const char *)result);
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_open_url(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
@@ -2338,6 +2387,57 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_app_installedq___(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","app_installed", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  result = (int)app_installed((char const *)arg1);
+  vresult = (result ? Qtrue : Qfalse);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_app_uninstall(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","app_uninstall", 1, argv[0] ));
+  }
+  arg1 = (char *)(buf1);
+  app_uninstall((char const *)arg1);
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
+  return Qnil;
+}
+
+
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
@@ -2627,6 +2727,9 @@ SWIGEXPORT void Init_System(void) {
   rb_define_module_function(mSystem, "unzip_file", _wrap_unzip_file, -1);
   rb_define_module_function(mSystem, "set_sleeping", _wrap_set_sleeping, -1);
   rb_define_module_function(mSystem, "run_app", _wrap_run_app, -1);
+  rb_define_module_function(mSystem, "get_start_params", _wrap_get_start_params, -1);
   rb_define_module_function(mSystem, "open_url", _wrap_open_url, -1);
+  rb_define_module_function(mSystem, "app_installed?", _wrap_app_installedq___, -1);
+  rb_define_module_function(mSystem, "app_uninstall", _wrap_app_uninstall, -1);
 }
 

data/platform/shared/rubyext/RhoAppAdapter.cpp

@@ -1,4 +1,5 @@
 #include "common/RhoAppAdapter.h"
+#include "sync/SyncThread.h"
 #include "ruby/ext/rho/rhoruby.h"
 
 namespace rho {
@@ -6,11 +7,17 @@ const _CRhoAppAdapter& RhoAppAdapter = _CRhoAppAdapter();
 
 /*static*/ String _CRhoAppAdapter::getMessageText(const char* szName)
 {
+    if ( sync::CSyncThread::getInstance()->isNoThreadedMode() || !sync::CSyncThread::getInstance()->getSyncEngine().getNotify().isReportingEnabled() )
+        return String();
+
     return rho_ruby_getMessageText(szName);
 }
 
 /*static*/ String _CRhoAppAdapter::getErrorText(int nError)
 {
+    if ( sync::CSyncThread::getInstance()->isNoThreadedMode() || !sync::CSyncThread::getInstance()->getSyncEngine().getNotify().isReportingEnabled() )
+        return String();
+
     return rho_ruby_getErrorText(nError);
 }