rhodes 3.2.3 → 3.3.0.beta.1

data/platform/bb/rhodes/src/rhomobile/camera/CameraScreen.java

@@ -168,9 +168,11 @@ public class CameraScreen extends MainScreen {
 			SimpleFile file = null;
 			FileConnection fconnsrc = null;
 			FileConnection fconndst = null;
+			InputStream src = null;
+			OutputStream dst = null;			
 	        try
 	        {
-	        	file = RhoClassFactory.createFile();
+	            file = RhoClassFactory.createFile();	        		
 	        	
 	        	if (fileName != null) {
 	        		String ext = fileName.substring(fileName.lastIndexOf('.'));
@@ -183,8 +185,8 @@ public class CameraScreen extends MainScreen {
 					
 					LOG.TRACE("should be readed " + fconnsrc.fileSize() + " bytes");
 					
-					InputStream src = fconnsrc.openInputStream();
-					OutputStream dst = fconndst.openOutputStream();
+					src = fconnsrc.openInputStream();
+					dst = fconndst.openOutputStream();
 					
 					long fullLength = 0;
 					
@@ -197,6 +199,17 @@ public class CameraScreen extends MainScreen {
 					dst.flush();
 					
 					LOG.TRACE("readed: " + fullLength + " bytes");
+					
+					try{
+						if ( src != null )
+							src.close();
+						src = null;
+
+						fconnsrc.delete();
+					}catch (Exception exc)
+					{
+						LOG.ERROR("Cannot delete file: " + fileName, exc);
+					}
 				}
 	        	else {
 		            //A null encoding indicates that the camera should
@@ -212,7 +225,6 @@ public class CameraScreen extends MainScreen {
 		            }
 		            
 		            fname = makeFileName(ext);
-	        		
 		        	file.open(fname, false, false);
 		        	
 		            //Retrieve the raw image from the VideoControl
@@ -234,6 +246,11 @@ public class CameraScreen extends MainScreen {
 					if ( file != null )
 						file.close();
 					
+					if ( dst != null )
+						dst.close();
+					if ( src != null )
+						src.close();
+					
 					if (fconnsrc != null)
 						fconnsrc.close();
 					if (fconndst != null)

data/platform/bb/rhodes/src/rhomobile/mapview/Annotation.java

@@ -26,6 +26,10 @@
 
 package rhomobile.mapview;
 
+import com.rho.Sprintf;
+import com.xruby.runtime.builtin.ObjectFactory;
+import com.xruby.runtime.builtin.RubyArray;
+
 public class Annotation {
 
 	public static class Coordinates {
@@ -44,5 +48,18 @@ public class Annotation {
 	public String resolved_address = null;
 	public String url = null;
 	public Coordinates coordinates = null;
+	public boolean pass_location = false;
+	
 	
+	public String make_url()
+	{
+		if (!pass_location)
+			return url;
+		
+		RubyArray args = new RubyArray();
+		args.add(ObjectFactory.createFloat(coordinates.latitude));
+		args.add(ObjectFactory.createFloat(coordinates.longitude));
+		
+		return url + ( url.indexOf('?') >= 0 ? "&" : "?" ) + Sprintf.sprintf("latitude=%.5f&longitude=%.5f", args);
+	}
 }

data/platform/bb/rhodes/src/rhomobile/mapview/MapView.java

@@ -181,11 +181,11 @@ public class MapView extends RubyBasic {
 							settings.put(strKey, strValue);
 						}
 						else if (strKey.equals("zoom_enabled"))
-							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
+							settings.put(strKey, new Boolean(value.inspect().equalsIgnoreCase("true")));
 						else if (strKey.equals("scroll_enabled"))
-							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
+							settings.put(strKey, new Boolean(value.inspect().equalsIgnoreCase("true")));
 						else if (strKey.equals("shows_user_location"))
-							settings.put(strKey, new Boolean(value.toString().equalsIgnoreCase("true")));
+							settings.put(strKey, new Boolean(value.inspect().equalsIgnoreCase("true")));
 						else if (strKey.equals("region")) {
 							if (value instanceof RubyArray) {
 								RubyArray arr = (RubyArray)value;
@@ -257,8 +257,8 @@ public class MapView extends RubyBasic {
 									key.equals(RubyConstant.QNIL) ||
 									value.equals(RubyConstant.QNIL))
 								continue;
-							String strKey = key.toString();
-							String strValue = value.toString();
+							String strKey = key.toStr();
+							String strValue = value.inspect();
 							if (strKey.equals("latitude")) {
 								double v;
 								try {
@@ -297,6 +297,9 @@ public class MapView extends RubyBasic {
 								annotation.resolved_address = strValue;
 							else if (strKey.equals("url"))
 								annotation.url = strValue;
+							else if (strKey.equals("pass_location"))
+								annotation.pass_location = strValue.equalsIgnoreCase("true") || strValue.equalsIgnoreCase("1");
+							
 						}
 						annotations.addElement(annotation);
 					}

data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.java

@@ -467,6 +467,7 @@ public class MapViewScreen extends RhoMainScreen {
 		}
 	}
 	
+	
 	private void handleClick(int x, int y) 
 	{
 		Annotation old_selectedAnnotation = mSelectedAnnotation;
@@ -479,7 +480,8 @@ public class MapViewScreen extends RhoMainScreen {
 		if (mSelectedAnnotation != null && old_selectedAnnotation != null && mSelectedAnnotation.equals(old_selectedAnnotation)) 
 		{
 			// We have clicked already selected annotation
-			WebView.navigate(mSelectedAnnotation.url);
+			
+			WebView.navigate(mSelectedAnnotation.make_url());
 			mapParent.close();
 			mSelectedAnnotation = null;
 		}

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -442,7 +442,9 @@ int rho_sys_set_sleeping(int sleeping)
 }
 
 void rho_sys_app_exit() {
-    exit(EXIT_SUCCESS);
+    if (([Rhodes sharedInstance] != nil) && (![Rhodes sharedInstance].mBlockExit)) {
+        exit(EXIT_SUCCESS);
+    }
 }
 
 int rho_sys_is_app_installed(const char *appname) {
@@ -625,7 +627,15 @@ int rho_sysimpl_get_property(char* szPropName, VALUE* resValue)
         NSString *version = [[UIDevice currentDevice] systemVersion];
         *resValue = rho_ruby_create_string([version UTF8String]);
         return 1;
-    }else if (strcasecmp("is_emulator", szPropName) == 0) {
+    }
+    else if (strcasecmp("webview_framework", szPropName) == 0) {
+        NSString *version = [[UIDevice currentDevice] systemVersion];
+        NSString *wvf = @"WEBKIT/";
+        wvf = [wvf stringByAppendingString:version];
+        *resValue = rho_ruby_create_string([wvf UTF8String]);
+        return 1;
+    }
+    else if (strcasecmp("is_emulator", szPropName) == 0) {
         int bSim = 0; 
 #if TARGET_IPHONE_SIMULATOR
 		bSim = 1;
@@ -756,7 +766,9 @@ void rho_sys_set_application_icon_badge(int badge_number) {
     [[UIApplication sharedApplication] setApplicationIconBadgeNumber:badge_number];
 }
 
-
+void rho_platform_restart_application() {
+//    [Rhodes restart_app];
+}
 
 /*
 #define MAX_ACTIONS 4

data/platform/iphone/Classes/Event/Event.m

@@ -64,7 +64,12 @@ static VALUE dateToRuby(NSDate *date)
 
 static NSDate *dateFromRuby(VALUE rDate)
 {
+    if (NIL_P(rDate))
+        return nil;
+    
     if (TYPE(rDate) == T_STRING) {
+        if (RSTRING_LEN(rDate) == 0)
+            return nil;
         // Convert to time
         ID id_parse = rb_intern("parse");
         rDate = rb_funcall(rb_cTime, id_parse, 1, rDate);
@@ -155,6 +160,16 @@ static VALUE eventToRuby(EKEvent *event)
         int interval = event.recurrenceRule.interval;
         rb_hash_aset(rRecurrence, rb_str_new2(RUBY_EV_RECURRENCE_INTERVAL), INT2FIX(interval));
         
+        if (event.recurrenceRule.recurrenceEnd != nil) {
+            NSDate* endDate = event.recurrenceRule.recurrenceEnd.endDate;
+            if (endDate != nil) {
+                rb_hash_aset(rRecurrence, rb_str_new2(RUBY_EV_RECURRENCE_END), dateToRuby(endDate));
+                [endDate release];
+            } else {
+                int count = event.recurrenceRule.recurrenceEnd.occurrenceCount;
+                rb_hash_aset(rRecurrence, rb_str_new2(RUBY_EV_RECURRENCE_COUNT), INT2FIX(count));
+            }
+        }
         rb_hash_aset(rEvent, rb_str_new2(RUBY_EV_RECURRENCE), rRecurrence);
     }
     
@@ -163,6 +178,7 @@ static VALUE eventToRuby(EKEvent *event)
 
 static EKEvent *eventFromRuby(EKEventStore *eventStore, VALUE rEvent)
 {
+
     VALUE rId = rb_hash_aref(rEvent, rb_str_new2(RUBY_EV_ID));
     if (!NIL_P(rId))
         Check_Type(rId, T_STRING);
@@ -227,8 +243,35 @@ static EKEvent *eventFromRuby(EKEventStore *eventStore, VALUE rEvent)
         rInterval = rb_funcall(rInterval, rb_intern("to_i"), 0);
         int interval = NUM2INT(rInterval);
         
-        EKRecurrenceRule *rule = [[EKRecurrenceRule alloc] initRecurrenceWithFrequency:freq interval:interval end:nil];
-        event.recurrenceRule = rule;
+        if (interval <= 0) {
+            interval = 1;
+        }
+
+        EKRecurrenceEnd *recurrenceEnd = nil;
+        VALUE rUntilDate = rb_hash_aref(rRecurrence, rb_str_new2(RUBY_EV_RECURRENCE_END));
+        NSDate *until = dateFromRuby(rUntilDate);
+        if (until != nil) {
+            recurrenceEnd = [EKRecurrenceEnd recurrenceEndWithEndDate: until];
+            RAWTRACE("eventFromRuby recurrenceEndWithEndDate");
+        }
+        if (recurrenceEnd == nil)
+        {
+            VALUE rTimes = rb_funcall(rb_hash_aref(rRecurrence, rb_str_new2(RUBY_EV_RECURRENCE_COUNT)), rb_intern("to_i"), 0);;
+            int times = NUM2INT(rTimes);
+            if (times > 0) {
+                recurrenceEnd = [EKRecurrenceEnd recurrenceEndWithOccurrenceCount:times];
+                RAWTRACE1("eventFromRuby recurrenceEndWithOccurrenceCount: %d", [recurrenceEnd occurrenceCount]);
+            }
+        }
+        
+        EKRecurrenceRule *rule = [[EKRecurrenceRule alloc] initRecurrenceWithFrequency:freq interval:interval end:recurrenceEnd];
+        
+        
+        [event setRecurrenceRule:rule];
+
+        
+        if (recurrenceEnd != nil)
+            [recurrenceEnd release];
         [rule release];
     }
     

data/platform/iphone/Classes/MapView/MapViewController.m

@@ -379,6 +379,9 @@ static MapViewController *mc = nil;
     mapView.delegate=self;
 
     mapView.showsUserLocation=showsUserLocation;
+    
+    //[mapView setUserTrackingMode:MKUserTrackingModeNone animated:NO];
+    
     mapView.scrollEnabled=scrollEnabled;
     mapView.zoomEnabled=zoomEnabled;
     mapView.mapType=mapType;
@@ -511,15 +514,16 @@ static MapViewController *mc = nil;
         if ([url length] > 0) {
             [annView setRightCalloutAccessoryView:[UIButton buttonWithType:UIButtonTypeDetailDisclosure]];
         }
+
+        if ([annView isKindOfClass:[MKPinAnnotationView class]]) {
+            MKPinAnnotationView* annPinView = (MKPinAnnotationView*)annView;
+            annPinView.animatesDrop = TRUE;
+        }
     }
     else {
         annView = [[[MKPinAnnotationView alloc]
                                          initWithAnnotation:annotation reuseIdentifier:@"currentloc"] autorelease];
     }
-    if ([annView isKindOfClass:[MKPinAnnotationView class]]) {
-        MKPinAnnotationView* annPinView = (MKPinAnnotationView*)annView;
-        annPinView.animatesDrop = TRUE;
-    }
     annView.canShowCallout = YES;
     return annView;
 }

data/platform/iphone/Classes/Phonebook/phonebook.m

@@ -27,6 +27,7 @@
 #include "ruby/ext/rho/rhoruby.h"
 #include "ruby/ext/phonebook/phonebook.h"
 #include "phonebook.h"
+#include "common/phonebook/PhonebookParams.h"
 
 #include "logging/RhoLog.h"
 
@@ -374,24 +375,35 @@ VALUE getallPhonebookRecords(void* pb) {
 	return rho_ruby_get_NIL();	
 }
 
-int getPhonebookRecordCount(void* pb) {
+int getPhonebookRecordCount(void* pb, rho_param* param) {
 	if (pb) {
 		if (logging_enable) RAWLOG_INFO("phonebook :: getPhonebookRecordCount START");
 		LocalPhonebook* phonebook = pb;
+        int count = 0;
 		
 		VALUE valGc = rho_ruby_disable_gc();
 		_getAllPeople(phonebook);
         rho_ruby_enable_gc(valGc);
+        count = phonebook->_len;
+        
+        PbPageParam pageParam;
+        if(rho_phonebook_getpageparams(param, &pageParam) != 0)
+        {
+            count -= pageParam.offset;
+            if(pageParam.per_page != -1 && count > pageParam.per_page)
+                count = pageParam.per_page;
+        }
 
 		if (logging_enable) RAWLOG_INFO("phonebook :: getallPhonebookRecords FINISH");
-		return phonebook->_len; 
+		
+        return count;
 	}
 	return 0;
 }
 
-VALUE getPhonebookRecords(void* pb, int offset, int max_results, rho_param* select_param) {
+VALUE getPhonebookRecords(void* pb, rho_param* param) {
 	if (pb) {
-		if (logging_enable) RAWLOG_INFO("phonebook :: getallPhonebookRecords START");
+		if (logging_enable) RAWLOG_INFO("phonebook :: getPhonebookRecords START");
 		LocalPhonebook* phonebook = pb;
 		
 		VALUE hash = rho_ruby_createHash();
@@ -402,8 +414,19 @@ VALUE getPhonebookRecords(void* pb, int offset, int max_results, rho_param* sele
 		VALUE record; char buf[128];
 		
 		_getAllPeople(phonebook);
-        int top_index = (offset + max_results) > phonebook->_len ? phonebook->_len : offset + max_results;
-		for (int index = offset; index < top_index ; index++) {
+
+        int offset = 0;
+        int top_index = phonebook->_len;
+        PbPageParam pageParam;
+        if(rho_phonebook_getpageparams(param, &pageParam) != 0)
+        {
+            RAWTRACE2("Page params: offset: %d, per_page: %d", pageParam.offset, pageParam.per_page);
+            offset = pageParam.offset;
+            if(pageParam.per_page != -1 && (offset + pageParam.per_page) < top_index)
+                top_index = offset + pageParam.per_page;
+        }
+        
+        for (int index = offset; index < top_index ; index++) {
 			record = _getRecordByIndex(phonebook->_people, index, &recordId);
 			snprintf(buf, sizeof(buf), "{%d}", recordId);
 			addHashToHash(hash, buf, record);
@@ -412,7 +435,7 @@ VALUE getPhonebookRecords(void* pb, int offset, int max_results, rho_param* sele
         rho_ruby_releaseValue(hash);		
         
         rho_ruby_enable_gc(valGc);
-		if (logging_enable) RAWLOG_INFO("phonebook :: getallPhonebookRecords FINISH");
+		if (logging_enable) RAWLOG_INFO("phonebook :: getPhonebookRecords FINISH");
 		return hash; 
 	}
 	return rho_ruby_get_NIL();	

data/platform/iphone/Classes/Rhodes.h

@@ -41,7 +41,7 @@
 #import "NVDelegate.h"
 
 @interface Rhodes : NSObject <UIApplicationDelegate,
-    UITabBarControllerDelegate, AVAudioPlayerDelegate>
+    UITabBarControllerDelegate, AVAudioPlayerDelegate, UIAlertViewDelegate>
 {
     AppManager *appManager;
     UIApplication *application;
@@ -62,6 +62,7 @@
 	
     id<RhoMainView,NSObject> mainView;
     BOOL rotationLocked;
+    BOOL mBlockExit;
 }
 
 @property (nonatomic, retain) UIWindow *window;
@@ -69,6 +70,8 @@
 @property (nonatomic, retain) NSMutableDictionary *cookies;
 @property (nonatomic, copy) SignatureDelegate* signatureDelegate;
 @property (nonatomic, copy) NVDelegate* nvDelegate;
+@property (nonatomic, assign) BOOL mBlockExit;
+
 #ifdef __IPHONE_4_0
 @property (nonatomic, readonly) EKEventStore *eventStore;
 #endif
@@ -88,6 +91,8 @@
 + (void)performOnUiThread:(id)runnable arg:(id)arg wait:(BOOL)wait;
 + (void)performOnUiThread:(id)runnable arg:(id)arg1 arg:(id)arg2 wait:(BOOL)wait;
 
++(void)restart_app;
+
 - (UIWindow*)rootWindow;
 
 - (void)playStart:(NSString*)fileName mediaType:(NSString*)type;
@@ -104,4 +109,9 @@
 - (void)openFullScreenNativeView:(UIView*)view;
 - (void)closeFullScreenNativeView;
 	
+// UIAlertViewDelegate
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex;
+
+- (void) exit_with_errormessage:(NSString*)title message:(NSString*)message;
+
 @end

data/platform/iphone/Classes/Rhodes.m

@@ -41,6 +41,13 @@
 #include "common/app_build_capabilities.h"
 
 
+
+extern int rho_sys_check_rollback_bundle(const char* szRhoPath);
+void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg);
+
+
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Rhodes"
 
@@ -96,7 +103,7 @@ static BOOL app_created = NO;
 
 @implementation Rhodes
 
-@synthesize window, player, cookies, signatureDelegate, nvDelegate;
+@synthesize window, player, cookies, signatureDelegate, nvDelegate, mBlockExit;
 #ifdef __IPHONE_4_0
 @synthesize eventStore;
 #endif
@@ -305,7 +312,7 @@ static Rhodes *instance = NULL;
 #endif
         // Show picker
 #ifdef __IPHONE_3_2
-        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+        if ((UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) && (type != UIImagePickerControllerSourceTypeCamera)) {
             // WARNING!!! DO NOT USE UIPopoverController DIRECTLY HERE!!!
             // It will cause problem of starting application on iPhone OS < 3.2
             // All such stuff should be loaded in runtime using NSClassFromString
@@ -570,9 +577,7 @@ static Rhodes *instance = NULL;
 
 - (void)doStartUp {
     NSLog(@"Rhodes starting application...");
-    instance = self;
-    application = [UIApplication sharedApplication];
-    rotationLocked = NO;
+    
     
     [NSThread setThreadPriority:1.0];
     
@@ -781,14 +786,89 @@ static Rhodes *instance = NULL;
 	NSLog(@"Audio player decoding error %@", error);
 }
 
+
+
+
+
+
+
+
+
+
+- (void)doStartUpRe:(NSObject*)arg {
+    NSLog(@"Rhodes starting application...");
+    rotationLocked = NO;
+    
+    NSLog(@"Create new detached thread for initialization stuff");
+    [NSThread detachNewThreadSelector:@selector(doRhoInit) toTarget:self withObject:nil];
+    
+    if (mainView != nil) {
+        [mainView.view removeFromSuperview];
+        [mainView release];
+    }
+    
+    mainView = nil;
+    [SimpleMainView enableHiddenOnStart];
+    mainView = [[SimpleMainView alloc] initWithParentView:window frame:[Rhodes applicationFrame]];
+    mainView.view.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
+    mainView.view.autoresizesSubviews = YES;
+    
+	BOOL is_splash_screen_maked = [self showLoadingPagePre];
+	
+	if (!is_splash_screen_maked) {
+		[window addSubview:mainView.view];
+	}
+	
+    NSLog(@"Init cookies");
+    cookies = [[NSMutableDictionary alloc] initWithCapacity:0];
+    
+    rho_rhodesapp_canstartapp("", ", ");
+    
+    NSLog(@"Initialization finished");
+}
+
+
+
+
+
+-(void)restart_app_func
+{
+    [self performSelectorOnMainThread:@selector(doStartUpRe:) withObject:nil waitUntilDone:NO];
+}
+
++(void)restart_app
+{
+    [[Rhodes sharedInstance] restart_app_func];
+
+}
+
+
 // UIApplicationDelegate implementation
 
 #ifdef __IPHONE_3_0
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    
+    
+    self.mBlockExit = NO;
+    
+    
+    instance = self;
+    self->application = [UIApplication sharedApplication];
+    rotationLocked = NO;
+    
+    if ( !rho_sys_check_rollback_bundle(rho_native_rhopath()) )
+    {
+        
+        rho_sys_impl_exit_with_errormessage( "Bundle update.", "Application is currupted. Reinstall it , please.");
+        return NO;
+    }    
+    
+    
 
 	NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
     NSLog(@"didFinishLaunchingWithOptions: %@", url);
 	
+    
 	// store start parameter
 	NSString* start_parameter = [NSString stringWithUTF8String:""];
 	if (url != nil) {
@@ -800,18 +880,63 @@ static Rhodes *instance = NULL;
 			}
 		}
 	}	
-    
-	[self doStartUp];
-	[self processDoSync:launchOptions];
+
+    [self doStartUp];
+    [self processDoSync:launchOptions];
 
     if ( !rho_rhodesapp_canstartapp([start_parameter UTF8String], ", ") )
     {
+        //const char* szAppSecToken = get_app_build_config_item("security_token");
 		NSLog(@"This is hidden app and can be started only with security key.");
-		//exit(EXIT_SUCCESS);
+        /*
+        {
+            
+            NSString* message = @"Invalid security token !";
+            
+            rho_conf_Init(rho_native_rhopath());
+            
+            if (rho_conf_is_property_exists("invalid_security_token_message")) {
+                const char* conf_message = rho_conf_getString("invalid_security_token_message");
+                message = [NSString stringWithUTF8String:conf_message];
+            }
+            
+            
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"" 
+                                                            message:message
+                                                           delegate:self 
+                                                  cancelButtonTitle:@"OK" 
+                                                  otherButtonTitles: nil];
+            [alert show];
+            [alert release];
+        }
+        */
+        //exit(EXIT_SUCCESS);
     }
 	
 	return NO;
 }
+
+- (void) exit_with_errormessage:(NSString*)title message:(NSString*)message 
+{
+    [Rhodes sharedInstance].mBlockExit = YES;
+    
+    UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title 
+                                                    message:message
+                                                   delegate:self 
+                                          cancelButtonTitle:@"OK" 
+                                          otherButtonTitles: nil];
+    [alert show];
+    [alert release];
+    
+}
+
+
+- (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)buttonIndex {
+    exit(EXIT_SUCCESS);
+}
+
+
+
 #endif
 /*
 - (void)applicationDidFinishLaunching:(UIApplication *)application 
@@ -950,6 +1075,13 @@ static Rhodes *instance = NULL;
 
 // Native functions
 
+
+void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg) {
+
+    [[Rhodes sharedInstance] exit_with_errormessage:[NSString stringWithUTF8String:szTitle] message:[NSString stringWithUTF8String:szMsg]];
+}
+
+
 void rho_map_location(char* query) {
     [[Rhodes sharedInstance] mapLocation:[NSString stringWithUTF8String:query]];
 }