rhodes 1.5.1 → 1.5.2

data/lib/framework/rho/rho.rb

@@ -391,17 +391,33 @@ module Rho
   end # RhoConfig
   
     module AsyncHttp
+        def self.process_result(res, callback)
+            return res if callback && callback.length() > 0
+            
+            _params = ::Rho::RhoSupport::parse_query_parameters res
+            ::Rho::RhoController.process_rho_object(_params)
+            _params
+        end
+        
         def self.get(args)
-            AsyncHttp.do_get(args[:url], args[:headers], args[:callback], args[:callback_param] )
+            process_result( 
+                AsyncHttp.do_get(args[:url], args[:headers], args[:callback], args[:callback_param] ),
+                args[:callback] )
         end
         def self.post(args)
-            AsyncHttp.do_post(args[:url], args[:headers], args[:body], args[:callback], args[:callback_param] )
+            process_result( 
+                AsyncHttp.do_post(args[:url], args[:headers], args[:body], args[:callback], args[:callback_param] ),
+                args[:callback] )
         end
         def self.download_file(args)
-            AsyncHttp.do_downloadfile(args[:url], args[:headers], args[:filename], args[:callback], args[:callback_param] )
+            process_result( 
+                AsyncHttp.do_downloadfile(args[:url], args[:headers], args[:filename], args[:callback], args[:callback_param] ),
+                args[:callback] )
         end
         def self.upload_file(args)
-            AsyncHttp.do_uploadfile(args[:url], args[:headers], args[:filename], args[:callback], args[:callback_param] )
+            process_result( 
+                AsyncHttp.do_uploadfile(args[:url], args[:headers], args[:filename], args[:callback], args[:callback_param] ),
+                args[:callback] )
         end
     end
   

data/lib/framework/rho/rhocontroller.rb

@@ -30,6 +30,18 @@ module Rho
       return Hash['GET','index','POST','create'][@request['request-method']]
     end
 
+    def self.process_rho_object(params)
+      if params['rho_callback'] && params['__rho_object']
+        hashObjs = params['__rho_object']
+        
+        hashObjs.each do |name,index|
+            params[name] = __rhoGetCallbackObject(index.to_i())
+        end
+        
+        params.delete('__rho_object')
+      end
+    end
+    
     def serve(application,object_mapping,req,res)
       @request, @response = req, res
       @object_mapping = object_mapping
@@ -37,15 +49,7 @@ module Rho
       @rendered = false
       @redirected = false
 
-      if @params['rho_callback'] && @params['__rho_object']
-        hashObjs = @params['__rho_object']
-        
-        hashObjs.each do |name,index|
-            @params[name] = __rhoGetCallbackObject(index.to_i())
-        end
-        
-        @params.delete('__rho_object')
-      end
+      RhoController.process_rho_object(@params)
       
       act = req['action'].nil? ? default_action : req['action']
       if self.respond_to?(act)

data/lib/framework/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.1'
+    DBVERSION = '1.5.2'
   end
   
 end

data/lib/framework/version.rb

@@ -1,8 +1,8 @@
 module RhodesFramework
   unless defined? RhodesFramework::VERSION
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
   unless defined? RhodesFramework::DBVERSION
-    DBVERSION = '1.5.1'
+    DBVERSION = '1.5.2'
   end
 end

data/lib/rhodes.rb

@@ -1,9 +1,9 @@
 module Rhodes
   unless defined? Rhodes::VERSION
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
   unless defined? Rhodes::DBVERSION
-    DBVERSION = '1.5.1'
+    DBVERSION = '1.5.2'
   end
   
 end

data/platform/android/Rhodes/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.rhomobile.rhodes"
-      android:versionCode="20"
-      android:versionName="1.5.1">
+      android:versionCode="21"
+      android:versionName="1.5.2">
     <uses-sdk android:minSdkVersion="3" />
     <application android:icon="@drawable/icon"
           android:multiprocess="true"

data/platform/android/build/android.rake

@@ -184,7 +184,8 @@ namespace "config" do
     end
 
     if $androidplatform.nil?
-      puts "+++ No required platform found"
+      puts "+++ No required platform (API level #{ANDROID_API_LEVEL}) found, can't proceed"
+      exit 1
     else
       puts "+++ Platform found: #{$androidplatform}" if USE_TRACES
     end
@@ -262,7 +263,8 @@ namespace "config" do
         $gapijar = File.join(dir, 'libs', 'maps.jar') if apilevel == ANDROID_API_LEVEL
       end
       if $gapijar.nil?
-        puts "+++ No Google APIs add-on found"
+        puts "+++ No Google APIs add-on found (which is required because 'mapping' enabled in build.yml)"
+        exit 1
       else
         puts "+++ Google APIs add-on found: #{$gapijar}" if USE_TRACES
       end

data/platform/android/build/androidcommon.rb

@@ -117,7 +117,8 @@ def cc_run(command, args, chdir = nil)
   end
   ret = $?
   FileUtils.cd save_cwd
-  ret == 0
+  puts "FAIL: #{command} failed with status #{ret.inspect.to_s}" unless ret.success?
+  ret.success?
 end
 
 def cc_compile(filename, objdir, additional = nil)

data/platform/bb/rhodes/src/com/rho/rubyext/System.java

@@ -1,9 +1,11 @@
 package com.rho.rubyext;
 
+import rhomobile.RhodesApplication;
 import net.rim.blackberry.api.phone.Phone;
 import net.rim.device.api.i18n.Locale;
 import net.rim.device.api.system.Display;
 
+import com.rho.BBVersionSpecific;
 import com.rho.RhoEmptyLogger;
 import com.rho.RhoLogger;
 import com.xruby.runtime.builtin.ObjectFactory;
@@ -126,7 +128,13 @@ public class System {
 		if (CoverageInfo.isOutOfCoverage())
 	        return false; 
 		*/
-		return true;
+		int nStatus = net.rim.device.api.system.RadioInfo.getNetworkService();
+		boolean hasGPRS = ( nStatus & net.rim.device.api.system.RadioInfo.NETWORK_SERVICE_DATA) != 0;
+		
+		boolean hasWifi = BBVersionSpecific.isWifiActive();
+		LOG.INFO("hasGPRS : " + hasGPRS + "; Wifi: " + hasWifi);
+		boolean bRes = hasGPRS || hasWifi;
+		return bRes;
 	}
 
 	public static int getScreenHeight() {

data/platform/iphone/Classes/RhoRunnerAppDelegate.m

@@ -340,6 +340,14 @@
 	[self.player play];
 }
 
+- (void)onStopPlaying {
+    if (!self.player)
+        return;
+    
+    [self.player stop];
+    self.player = nil;
+}
+
 - (void) audioPlayerDidFinishPlaying: (AVAudioPlayer *) player successfully: (BOOL) flag {
 	if (flag == YES) {
 		//[self.button setTitle: @"Play" forState: UIControlStateNormal];
@@ -505,6 +513,7 @@
 	serverHost->onShowPopup = @selector(onShowPopup:);
 	serverHost->onVibrate = @selector(onVibrate:);
 	serverHost->onPlayFile = @selector(onPlayFile:);
+    serverHost->onStopPlaying = @selector(onStopPlaying);
 	serverHost->onSysCall = @selector(onSysCall:);
 	serverHost->onMapLocation = @selector(onMapLocation:);
 	serverHost->onCreateMap = @selector(onCreateMap:);

data/platform/iphone/Classes/Server/ServerHost.h

@@ -35,6 +35,7 @@
 	SEL onShowPopup;
 	SEL onVibrate;
 	SEL onPlayFile;
+    SEL onStopPlaying;
 	SEL onSysCall;
 	SEL onMapLocation;
 	SEL onCreateMap;
@@ -60,6 +61,7 @@
 @property (assign) SEL onShowPopup;
 @property (assign) SEL onVibrate;
 @property (assign) SEL onPlayFile;
+@property (assign) SEL onStopPlaying;
 @property (assign) SEL onSysCall;
 @property (assign) SEL onMapLocation;
 @property (assign) SEL onCreateMap;

data/platform/iphone/Classes/Server/ServerHost.m

@@ -78,7 +78,7 @@ static ServerHost* sharedSH = nil;
 @synthesize actionTarget, /*onStartFailure,*/ onStartSuccess, onRefreshView, onNavigateTo, onExecuteJs; 
 @synthesize /*onSetViewHomeUrl, onSetViewOptionsUrl,*/ onTakePicture, onChoosePicture, onChooseDateTime;
 @synthesize onCreateNativeBar, onRemoveNativeBar, onSwitchTab;
-@synthesize onShowPopup, onVibrate, onPlayFile, onSysCall, onMapLocation, onCreateMap, onActiveTab, onShowLog;
+@synthesize onShowPopup, onVibrate, onPlayFile, onStopPlaying, onSysCall, onMapLocation, onCreateMap, onActiveTab, onShowLog;
 
 - (void)serverStarted:(NSString*)data {
 	if(actionTarget && [actionTarget respondsToSelector:onStartSuccess]) {
@@ -203,6 +203,12 @@ static ServerHost* sharedSH = nil;
 	}
 }
 
+- (void)stopPlaying {
+    if (actionTarget && [actionTarget respondsToSelector:onStopPlaying]) {
+        [actionTarget performSelectorOnMainThread:onStopPlaying withObject:nil waitUntilDone:NO];
+    }
+}
+
 - (void)mapLocation:(NSString*) query {
 	if(actionTarget && [actionTarget respondsToSelector:onMapLocation]) {
 		[actionTarget performSelectorOnMainThread:onMapLocation withObject:query waitUntilDone:NO];
@@ -450,11 +456,6 @@ void webview_set_menu_items(VALUE valMenu) {
 	rho_rhodesapp_setViewMenu(valMenu);
 }
 
-void Init_RingtoneManager()
-{
-	//TODO: implement Ringtone
-}
-
 void alert_show_popup(char* message) {
 	if (message==NULL) {
 		RAWLOG_ERROR("Alert.show_popup - wrong arguments");
@@ -476,6 +477,28 @@ void alert_play_file(char* file_name, char* media_type) {
 	}
 }
 
+VALUE rho_ringtone_manager_get_all()
+{
+    // No API to get ringtones
+    return rho_ruby_get_NIL();
+}
+
+void rho_ringtone_manager_play(char *file_name)
+{
+    if (file_name == NULL) {
+        RAWLOG_ERROR("RingtoneManager.play - please specify file name to play");
+        return;
+    }
+    
+    [[ServerHost sharedInstance] playFile:[NSString stringWithUTF8String:file_name]
+                                mediaType:NULL];
+}
+
+void rho_ringtone_manager_stop()
+{
+    [[ServerHost sharedInstance] stopPlaying];
+}
+
 void take_picture(char* callback_url) {
 	[[ServerHost sharedInstance] takePicture:[NSString stringWithUTF8String:callback_url]];		
 }

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.1</string>
+	<string>1.5.2</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

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

@@ -20,6 +20,7 @@
 		5CF8DBC710B1D45C00247AB4 /* constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CF8DBC110B1D45C00247AB4 /* constants.h */; };
 		5CF8DBCA10B1D45C00247AB4 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CF8DBC410B1D45C00247AB4 /* socket.c */; };
 		5CF8DBCB10B1D45C00247AB4 /* sockport.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CF8DBC510B1D45C00247AB4 /* sockport.h */; };
+		BD28516111608C9A003DE4E9 /* ringtones_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = BD28516011608C9A003DE4E9 /* ringtones_wrap.c */; };
 		D38F7B5F110647510030B1F4 /* extensions.c in Sources */ = {isa = PBXBuildFile; fileRef = D38F7B5E110647510030B1F4 /* extensions.c */; };
 		F51668800FFD39D80079F023 /* alert_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F516687F0FFD39D80079F023 /* alert_wrap.c */; };
 		F5177F180EE5B624000EA1A0 /* system_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5177F170EE5B624000EA1A0 /* system_wrap.c */; };
@@ -129,6 +130,7 @@
 		5CF8DBC110B1D45C00247AB4 /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ext/socket/constants.h; sourceTree = "<group>"; };
 		5CF8DBC410B1D45C00247AB4 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ext/socket/socket.c; sourceTree = "<group>"; };
 		5CF8DBC510B1D45C00247AB4 /* sockport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sockport.h; path = ext/socket/sockport.h; sourceTree = "<group>"; };
+		BD28516011608C9A003DE4E9 /* ringtones_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ringtones_wrap.c; path = ext/ringtones/ringtones_wrap.c; sourceTree = "<group>"; };
 		D2AAC046055464E500DB518D /* librhorubylib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librhorubylib.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D38F7B5E110647510030B1F4 /* extensions.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extensions.c; path = ext/rho/extensions.c; sourceTree = "<group>"; };
 		F516687F0FFD39D80079F023 /* alert_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = alert_wrap.c; path = ../../shared/ruby/ext/alert/alert_wrap.c; sourceTree = SOURCE_ROOT; };
@@ -319,6 +321,14 @@
 			name = socket;
 			sourceTree = "<group>";
 		};
+		BD28515B11608C73003DE4E9 /* ringtones */ = {
+			isa = PBXGroup;
+			children = (
+				BD28516011608C9A003DE4E9 /* ringtones_wrap.c */,
+			);
+			name = ringtones;
+			sourceTree = "<group>";
+		};
 		C6A0FF2B0290797F04C91782 /* Documentation */ = {
 			isa = PBXGroup;
 			children = (
@@ -468,6 +478,7 @@
 				F5B8FACD0F44E8F900C9AF85 /* camera */,
 				F5C61CA60F3CFE5700207621 /* webview */,
 				F58E7FE50F008A8500E46829 /* phonebook */,
+				BD28515B11608C73003DE4E9 /* ringtones */,
 				5C043EB60EF7B7CF0014E5C6 /* rho */,
 				F5177F150EE5B5D9000EA1A0 /* system */,
 				F5E360C30EB6A76500226287 /* syncengine */,
@@ -720,6 +731,7 @@
 				D38F7B5F110647510030B1F4 /* extensions.c in Sources */,
 				5C8EE86511220ED30005C20D /* asynchttp_wrap.c in Sources */,
 				5C79894D113BD1D0005F8736 /* geolocation_wrap.c in Sources */,
+				BD28516111608C9A003DE4E9 /* ringtones_wrap.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/platform/shared/common/RhodesApp.cpp

@@ -612,24 +612,14 @@ String CRhodesApp::addCallbackObject(ICallbackObject* pCallbackObject, String st
     return strRes;
 }
 
-void CRhodesApp::delCallbackObject(ICallbackObject* pCallbackObject)
-{
-    for (int i = 0; i < (int)m_arCallbackObjects.size(); i++)
-    {
-        if ( m_arCallbackObjects.elementAt(i) == pCallbackObject )
-        {
-            m_arCallbackObjects.setElementAt(0,i);
-//            rho_ruby_releaseValue(valObject);
-        }
-    }
-}
-
 unsigned long CRhodesApp::getCallbackObject(int nIndex)
 {
     if ( nIndex < 0 || nIndex > m_arCallbackObjects.size() )
         return rho_ruby_get_NIL();
 
     ICallbackObject* pCallbackObject = m_arCallbackObjects.elementAt(nIndex);
+    m_arCallbackObjects.setElementAt(0,nIndex);
+
     if ( !pCallbackObject )
         return rho_ruby_get_NIL();
 

data/platform/shared/common/RhodesApp.h

@@ -91,7 +91,6 @@ public:
     boolean sendLog();
 
     String addCallbackObject(ICallbackObject* pCallbackObject, String strName);
-    void delCallbackObject(ICallbackObject* pCallbackObject);
     unsigned long getCallbackObject(int nIndex);
 
     const String& getRhoMessage(int nError, const char* szName);

data/platform/shared/net/AsyncHttp.cpp

@@ -11,7 +11,6 @@ namespace net
 {
 
 IMPLEMENT_LOGCLASS(CAsyncHttp, "AsyncHttp");
-boolean CAsyncHttp::m_bNoThreaded = false;
 common::CMutex CAsyncHttp::m_mxInstances;
 VectorPtr<CAsyncHttp*> CAsyncHttp::m_arInstances;
 
@@ -35,7 +34,7 @@ CAsyncHttp::CAsyncHttp(common::IRhoClassFactory* factory, EHttpCommands eCmd,
 
     addNewObject(this);
 
-    if (m_bNoThreaded)
+    if (m_strCallback.length()==0)
         run();
     else
         start(epLow);
@@ -132,9 +131,9 @@ void CAsyncHttp::run()
         break;
     }
 
-    if ( !m_pNetRequest->isCancelled() && m_strCallback.length() > 0)
+    if ( !m_pNetRequest->isCancelled())
     {
-        //processResponse(*m_pNetResponse);
+        //processResponse(m_pNetResponse);
         callNotify(*m_pNetResponse,0);
     }
 
@@ -184,67 +183,58 @@ unsigned long CAsyncHttp::getObjectValue()
     return rho_ruby_create_string(resp.getCharData()); 
 }
 
+unsigned long CAsyncHttp::getRetValue()
+{
+    if ( m_strCallback.length() == 0 )
+        return rho_ruby_create_string(m_strResBody.c_str()); 
+
+    return rho_ruby_get_NIL();
+}
+
 void CAsyncHttp::callNotify(rho::net::INetResponse& resp, int nError )
 {
-    String strBody = "rho_callback=1";
-    strBody += "&status=";
+    m_strResBody = "rho_callback=1";
+    m_strResBody += "&status=";
     if ( nError > 0 )
     {
-    	strBody += "error&error_code=" + nError;
+    	m_strResBody += "error&error_code=" + nError;
     }else
     {
         if ( resp.isOK() )
-    	    strBody += "ok";
+    	    m_strResBody += "ok";
         else
         {
-    	    strBody += "error&error_code=";
+    	    m_strResBody += "error&error_code=";
             if ( !resp.isResponseRecieved())
-                strBody += convertToStringA(1);//RhoRuby.ERR_NETWORK);
+                m_strResBody += convertToStringA(1);//RhoRuby.ERR_NETWORK);
             else if ( resp.isUnathorized() )
-                strBody += convertToStringA(9);//RhoRuby.ERR_UNATHORIZED);
+                m_strResBody += convertToStringA(9);//RhoRuby.ERR_UNATHORIZED);
             else
-	            strBody += convertToStringA(2);//RhoRuby.ERR_REMOTESERVER);
+	            m_strResBody += convertToStringA(2);//RhoRuby.ERR_REMOTESERVER);
 
             if ( resp.isResponseRecieved())
-	            strBody += "&http_error=" + convertToStringA(resp.getRespCode());
+	            m_strResBody += "&http_error=" + convertToStringA(resp.getRespCode());
         }
 
         String cookies = resp.getCookies();
         if (cookies.length()>0)
-            strBody += "&cookies=" + URI::urlEncode(cookies);
+            m_strResBody += "&cookies=" + URI::urlEncode(cookies);
 
-        strBody += "&" + makeHeadersString();
-        strBody += "&" + RHODESAPP().addCallbackObject(this, "body");
+        m_strResBody += "&" + makeHeadersString();
+        m_strResBody += "&" + RHODESAPP().addCallbackObject(this, "body");
     }
 
     if ( m_strCallbackParams.length() > 0 )
-        strBody += "&" + m_strCallbackParams;
-
-    if ( m_bNoThreaded )
-    {
-        const char* szName = strrchr(m_strCallback.c_str(), '/');
-        if (!szName)
-            szName = m_strCallback.c_str();
-        else
-            szName++;
+        m_strResBody += "&" + m_strCallbackParams;
 
-        String strName = "C_";
-        strName += szName;
-        rho_ruby_set_const( strName.c_str(), strBody.c_str());
-    }else
+    if ( m_strCallback.length() > 0 )
     {
-//        {
-//            synchronized(m_mxRequest)
-//            m_pNetRequest = m_ptrFactory->createNetRequest();
-//        }
         common::CAutoPtr<INetRequest> pNetRequest = m_ptrFactory->createNetRequest();
         String strFullUrl = pNetRequest->resolveUrl(m_strCallback);
-        NetResponse(resp1,pNetRequest->pushData( strFullUrl, strBody, null ));
+        NetResponse(resp1,pNetRequest->pushData( strFullUrl, m_strResBody, null ));
         if ( !resp1.isOK() )
             LOG(ERROR) + "AsyncHttp notification failed. Code: " + resp1.getRespCode() + "; Error body: " + resp1.getCharData();
     }
-
-    RHODESAPP().delCallbackObject(this);
 }
 
 } // namespace net
@@ -254,24 +244,28 @@ extern "C" {
 
 using namespace rho::net;
 
-void rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_get(const char* url, unsigned long headers, const char* callback, const char* callback_params)
 {
-    new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcGet, url, headers, null, callback, callback_params );
+    return pHttp->getRetValue();
 }
 
-void rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_post(const char* url, unsigned long headers, const char* body, const char* callback, const char* callback_params)
 {
-    new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcPost, url, headers, body!=null?body:"", callback, callback_params );
+    return pHttp->getRetValue();
 }
 
-void rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_downloadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
 {
-    new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, file_path, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcDownload, url, headers, file_path, callback, callback_params );
+    return pHttp->getRetValue();
 }
 
-void rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
+unsigned long rho_asynchttp_uploadfile(const char* url, unsigned long headers, const char* file_path, const char* callback, const char* callback_params)
 {
-    new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, file_path, callback, callback_params );
+    CAsyncHttp* pHttp = new CAsyncHttp(rho::common::createClassFactory(), CAsyncHttp::hcUpload, url, headers, file_path, callback, callback_params );
+    return pHttp->getRetValue();
 }
 
 void rho_asynchttp_cancel(const char* cancel_callback)
@@ -284,9 +278,4 @@ void rho_asynchttp_destroy()
     CAsyncHttp::cancelRequest("*", true);
 }
 
-void rho_asynchttp_set_threaded_mode(int b)
-{
-    CAsyncHttp::m_bNoThreaded = (b==0);
-}
-
 }