rhodes 2.3.0 → 2.3.1.beta.1

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

@@ -278,7 +278,9 @@ VALUE event_fetch_by_id(const char *eid)
 #endif
 }
 
-void event_save(VALUE rEvent)
+static NSString* return_string = nil;
+
+const char* event_save(VALUE rEvent)
 {
     calendar_check();
     
@@ -290,9 +292,17 @@ void event_save(VALUE rEvent)
     NSError *err;
     BOOL saved = [eventStore saveEvent:event span:EKSpanFutureEvents error:&err];
     
-    if (!saved)
+    if (saved) {
+		return_string = event.eventIdentifier;
+	}
+	else {
         rb_raise(rb_eRuntimeError, "Event save failed: %s", [[err localizedDescription] UTF8String]);
+	}
 #endif
+	if (return_string != nil) {
+		return [return_string UTF8String];
+	}
+    return NULL;
 }
 
 void event_delete(const char *eid)

data/platform/iphone/Classes/NativeBar.h

@@ -14,19 +14,20 @@
 #define NOBAR_TYPE			2
 #define VTABBAR_TYPE		3
 
-#define NATIVE_BAR_PROPERTIES					@"properties"
-#define NATIVE_BAR_ITEMS						@"items"
+#define NATIVE_BAR_PROPERTIES						@"properties"
+#define NATIVE_BAR_ITEMS							@"items"
 
-#define NATIVE_BAR_BACKGOUND_COLOR				@"bkg_color"
+#define NATIVE_BAR_BACKGOUND_COLOR					@"bkg_color"
 
-#define NATIVE_BAR_ITEM_LABEL					@"label"
-#define NATIVE_BAR_ITEM_ACTION					@"action"
-#define NATIVE_BAR_ITEM_ICON					@"icon"
-#define NATIVE_BAR_ITEM_RELOAD					@"reload"
-#define NATIVE_BAR_ITEM_COLORED_ICON			@"colored_icon"
-#define NATIVE_BAR_ITEM_SELECTED_COLOR			@"selected_color"
-#define NATIVE_BAR_ITEM_DISABLED				@"disabled"
-#define NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR	@"web_bkg_color"
+#define NATIVE_BAR_ITEM_LABEL						@"label"
+#define NATIVE_BAR_ITEM_ACTION						@"action"
+#define NATIVE_BAR_ITEM_ICON						@"icon"
+#define NATIVE_BAR_ITEM_RELOAD						@"reload"
+#define NATIVE_BAR_ITEM_COLORED_ICON				@"colored_icon"
+#define NATIVE_BAR_ITEM_SELECTED_COLOR				@"selected_color"
+#define NATIVE_BAR_ITEM_DISABLED					@"disabled"
+#define NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR		@"web_bkg_color"
+#define NATIVE_BAR_ITEM_USE_CURRENT_VIEW_FOR_TAB	@"use_current_view_for_tab"
 
 /*
  

data/platform/iphone/Classes/NativeBar.m

@@ -65,6 +65,7 @@ static int started = 0;
 			started = 1;
 			break;
 		case TABBAR_TYPE: {
+			[[Rhodes sharedInstance] hideSplash];
 			view = [[TabbedMainView alloc] initWithMainView:mainView parent:w bar_info:parameters];
 			started = 1;
 			[r setMainView:view];
@@ -72,7 +73,7 @@ static int started = 0;
 		}
 			break;
 		case VTABBAR_TYPE: {
-			
+			[[Rhodes sharedInstance] hideSplash];
 			BOOL is_iPad = NO;
 			{
 				NSString *model = [[UIDevice currentDevice] model]; // "iPad ..."
@@ -196,6 +197,7 @@ void create_nativebar_innner(int bar_type, rho_param *p)
 		//const char *selected_color_enable = NULL;
 		const char *disabled = NULL;
 		const char* web_bkg_color = NULL;
+		const char* use_current_view_for_tab = NULL;
 		
         BOOL skip_item = NO;
         for (int j = 0, lim = hash->v.hash->size; j < lim; ++j) {
@@ -229,17 +231,24 @@ void create_nativebar_innner(int bar_type, rho_param *p)
                 disabled = value->v.string;
             else if (strcasecmp(name, "web_bkg_color") == 0)
                 web_bkg_color = value->v.string;
+			else if (strcasecmp(name, "use_current_view_for_tab") == 0) {
+                use_current_view_for_tab = value->v.string;
+				if (strcasecmp(use_current_view_for_tab, "true") == 0) {
+					action = "none";
+				}
+			}
+				
         }
         
         if (label == NULL && bar_type == TOOLBAR_TYPE)
             label = "";
         
-        if ((label == NULL || action == NULL) && (!skip_item)) {
+        if ((label == NULL || (action == NULL)) && (!skip_item)) {
             RAWLOG_ERROR("Illegal argument for create_nativebar");
             return;
         }
 		if (!skip_item) {
-			NSMutableDictionary* item = [NSMutableDictionary dictionaryWithCapacity:9];	
+			NSMutableDictionary* item = [NSMutableDictionary dictionaryWithCapacity:10];	
 			
 			[item setObject:[NSString stringWithUTF8String:label] forKey:NATIVE_BAR_ITEM_LABEL];
 			[item setObject:[NSString stringWithUTF8String:action] forKey:NATIVE_BAR_ITEM_ACTION];
@@ -253,6 +262,7 @@ void create_nativebar_innner(int bar_type, rho_param *p)
 			if (web_bkg_color != NULL) {
 				[item setObject:[NSString stringWithUTF8String:web_bkg_color] forKey:NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR];
 			}
+			[item setObject:[NSString stringWithUTF8String:(use_current_view_for_tab ? use_current_view_for_tab : "false")] forKey:NATIVE_BAR_ITEM_USE_CURRENT_VIEW_FOR_TAB];
 			
 			[items addObject:item];
 		}

data/platform/iphone/Classes/Rhodes.m

@@ -33,6 +33,40 @@ static BOOL app_created = NO;
 @end
 
 
+@interface RhoFullScreenEnableTask : NSObject {}
++ (void)run;
+@end
+
+@implementation RhoFullScreenEnableTask
++ (void)run {
+#ifdef __IPHONE_3_2
+    [[Rhodes application] setStatusBarHidden:YES withAnimation:UIStatusBarAnimationFade];
+#else
+    [[Rhodes application] setStatusBarHidden:YES animated:YES];
+#endif
+    [[[[Rhodes sharedInstance] mainView] view] setFrame:[Rhodes applicationFrame]];
+}
+@end
+
+@interface RhoFullScreenDisableTask : NSObject {}
++ (void)run;
+@end
+
+@implementation RhoFullScreenDisableTask
++ (void)run {
+#ifdef __IPHONE_3_2
+    [[Rhodes application] setStatusBarHidden:NO withAnimation:UIStatusBarAnimationFade];
+#else
+    [[Rhodes application] setStatusBarHidden:NO animated:YES];
+#endif
+    [[[[Rhodes sharedInstance] mainView] view] setFrame:[Rhodes applicationFrame]];
+}
+@end
+
+
+
+
+
 @implementation Rhodes
 
 @synthesize window, player, cookies, signatureDelegate, nvDelegate;
@@ -51,20 +85,24 @@ static Rhodes *instance = NULL;
 }
 
 + (CGRect)applicationFrame {
-    CGRect frame = [[UIScreen mainScreen] bounds];
-    CGRect sbFrame = [[UIApplication sharedApplication] statusBarFrame];
-    frame.origin.y += sbFrame.size.height;
-    frame.size.height -= sbFrame.size.height;
+    CGRect frame = [[UIScreen mainScreen] applicationFrame];
+    //CGRect sbFrame = [[UIApplication sharedApplication] statusBarFrame];
+    //frame.origin.y += sbFrame.size.height;
+    //frame.size.height -= sbFrame.size.height;
     return frame;
 }
 
+
+
+
+
 + (void)setStatusBarHidden:(BOOL)v {
-#ifdef __IPHONE_3_2
-    [[Rhodes application] setStatusBarHidden:v withAnimation:UIStatusBarAnimationFade];
-#else
-    [[Rhodes application] setStatusBarHidden:v animated:YES];
-#endif
-    [[[[Rhodes sharedInstance] mainView] view] setFrame:[Rhodes applicationFrame]];
+	if (v) {
+		[Rhodes performOnUiThread:[RhoFullScreenEnableTask class] wait:NO];
+	}
+	else {
+		[Rhodes performOnUiThread:[RhoFullScreenDisableTask class] wait:NO];
+	}
 }
 
 

data/platform/iphone/Classes/SimpleMainView.h

@@ -43,6 +43,7 @@
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p;
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info;
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame webview:(UIWebView*)webview;
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame;
 - (id)initWithParentView:(UIView *)p frame:(CGRect)frame web_bkg_color:(UIColor*)web_bkg_color;
 

data/platform/iphone/Classes/SimpleMainView.m

@@ -397,7 +397,7 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
-	if ([self interfaceOrientation] == fromInterfaceOrientation) {
+	if ([[UIApplication sharedApplication] statusBarOrientation] == fromInterfaceOrientation) {
 		return;
 	}
 	int width = rho_sys_get_screen_width();
@@ -504,6 +504,12 @@ static BOOL makeHiddenUntilLoadContent = YES;
     return [self initWithMainView:v parent:p bar_info:nil];
 }
 
+- (id)initWithParentView:(UIView *)p frame:(CGRect)frame webview:(UIWebView*)webview {
+    id result = [self init:p webView:webview frame:frame bar_info:nil web_bkg_color:nil];
+    return result;
+}
+
+
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p bar_info:(NSDictionary*)bar_info {
     CGRect frame = [[v view] frame];
 	frame.origin.x = 0;

data/platform/iphone/Classes/SplitView/LeftViewController.m

@@ -183,6 +183,9 @@
 }
 
 - (void)setSelection:(int)index {
+	if ((index < 0) || (index >= [self.itemsData count])) {
+		return;
+	}
 	NSIndexPath* path = [NSIndexPath indexPathForRow:index inSection:0];
 	[self performSelectorOnMainThread:@selector(setSelectionCommand:) withObject:path waitUntilDone:NO];	
 }

data/platform/iphone/Classes/SplitView/RightViewController.m

@@ -147,9 +147,17 @@
 	return YES;
 }
 
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	[[self getSimpleView:-1] didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+}
+
 
 
 - (SimpleMainView*) getSimpleView:(int)index {
+	if ((index < 0) || (index >= [self.itemsData count])) {
+		index = -1;
+	}
 	if (index == -1) {
 		index = self.tabindex;
 	}
@@ -222,9 +230,6 @@
 		}
 	}
 	SimpleMainView* cur_v = [self getSimpleView:tabindex];
-	if (cur_v == new_v) {
-		return;
-	}
 	tabindex = index;
     RhoRightItem *ri = [self.itemsData objectAtIndex:tabindex];
     if (!ri.loaded || ri.reload) {
@@ -232,14 +237,14 @@
         rho_rhodesapp_load_url(s);
         ri.loaded = YES;
     }
+	if (cur_v == new_v) {
+		return;
+	}
 	CGRect myframe = self.view.bounds;
 	new_v.view.frame = myframe;
 	[cur_v.view removeFromSuperview];
 	[self.view addSubview:new_v.view];
 	[self.view setNeedsLayout];
-	//[self.view layoutSubviews];
-	//[self.view.superview setNeedsLayout];
-	//[new_v.view setNeedsDisplay];
 }
 
 - (void)switchTab:(int)index {

data/platform/iphone/Classes/SplitView/SplittedMainView.m

@@ -162,6 +162,14 @@
 }
  */
 
+
+- (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+{
+	[[self getRightViewController] didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+}
+
+
+
 - (RightViewController*)getRightViewController {
 	RightViewController* rvc = (RightViewController*)[self.viewControllers objectAtIndex:1];
 	return rvc;

data/platform/iphone/Classes/TabbedMainView.m

@@ -343,6 +343,8 @@
     NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
     
     NSString *initUrl = nil;
+	BOOL is_load_initial_url = YES;
+	int tab_to_initial_select = -1;
     
     for (int i = 0; i < count; ++i) {
 		
@@ -357,8 +359,17 @@
 		NSString *disabled = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_DISABLED];
 		
 		NSString *web_bkg_color = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_WEB_BACKGROUND_COLOR];
+		
+		NSString *use_current_view_for_tab = (NSString*)[item objectForKey:NATIVE_BAR_ITEM_USE_CURRENT_VIEW_FOR_TAB];
         
 		
+		BOOL is_use_current_view_for_tab = NO;
+		if (use_current_view_for_tab != nil) {
+			if ([use_current_view_for_tab caseInsensitiveCompare:@"true"] == NSOrderedSame) {
+				is_use_current_view_for_tab = YES;
+			}
+		}
+		
         if (!initUrl)
             initUrl = url;
         
@@ -366,7 +377,20 @@
             RhoTabBarData *td = [[RhoTabBarData alloc] init];
             td.url = url;
 			td.reload = [reload isEqualToString:@"true"];
+			td.loaded = is_use_current_view_for_tab;
+			
+			if (is_use_current_view_for_tab) {
+				td.url = [v currentLocation:-1];
+			}
+			
 			SimpleMainView *subController = nil;
+			
+			if (is_use_current_view_for_tab) {
+				web_bkg_color = nil;
+				is_load_initial_url = NO;
+				tab_to_initial_select = i;
+			}
+			
 			if (web_bkg_color != nil) {
 				int bkgc = [web_bkg_color intValue];
 				int cR = (bkgc & 0xFF0000) >> 16;
@@ -377,7 +401,12 @@
 				subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame web_bkg_color:bc];
 			}
 			else {
-				subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame];
+				if (is_use_current_view_for_tab) {
+					subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame webview:[v detachWebView]];
+				}
+				else {
+					subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame];
+				}
 			}
             
 			
@@ -438,9 +467,13 @@
     self.tabbarData = tabs;
     [tabs release];
     
-    if (initUrl)
+	if (initUrl && is_load_initial_url) {
         [self navigateRedirect:initUrl tab:0];
-    
+    }
+	if (tab_to_initial_select >= 0) {
+		tabbar.selectedIndex = tab_to_initial_select;
+	}
+									 
     return self;
 }
 
@@ -465,6 +498,9 @@
 }
 
 - (SimpleMainView*)subView:(int)index {
+	if (index == -1) {
+		index = [self activeTab];
+	}
     return (SimpleMainView*)[tabbar.viewControllers objectAtIndex:index];
 }
 

data/platform/iphone/Info.plist

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

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

@@ -52,6 +52,7 @@
 		5C98174E0FBC4FCE002597A5 /* irhoclassfactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */; };
 		5CA2DE9011B01EF000B868D5 /* ThreadQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CA2DE8E11B01EF000B868D5 /* ThreadQueue.cpp */; };
 		5CA2DE9111B01EF000B868D5 /* ThreadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CA2DE8F11B01EF000B868D5 /* ThreadQueue.h */; };
+		5CB821AE1312487100778441 /* INetRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CB821AD1312487000778441 /* INetRequest.cpp */; };
 		5CBD462A1087399700107D0D /* URI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CBD46271087399700107D0D /* URI.cpp */; };
 		5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; };
 		5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */; };
@@ -122,6 +123,7 @@
 		5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irhoclassfactory.h; path = ../../shared/common/irhoclassfactory.h; sourceTree = SOURCE_ROOT; };
 		5CA2DE8E11B01EF000B868D5 /* ThreadQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadQueue.cpp; path = ../../shared/common/ThreadQueue.cpp; sourceTree = SOURCE_ROOT; };
 		5CA2DE8F11B01EF000B868D5 /* ThreadQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadQueue.h; path = ../../shared/common/ThreadQueue.h; sourceTree = SOURCE_ROOT; };
+		5CB821AD1312487000778441 /* INetRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = INetRequest.cpp; path = ../../shared/net/INetRequest.cpp; sourceTree = SOURCE_ROOT; };
 		5CBD46271087399700107D0D /* URI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = URI.cpp; path = ../../shared/net/URI.cpp; sourceTree = SOURCE_ROOT; };
 		5CBD46281087399700107D0D /* URI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URI.h; path = ../../shared/net/URI.h; sourceTree = SOURCE_ROOT; };
 		5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppMenu.cpp; path = ../../shared/common/AppMenu.cpp; sourceTree = SOURCE_ROOT; };
@@ -282,6 +284,7 @@
 		5CBD46251087397B00107D0D /* net */ = {
 			isa = PBXGroup;
 			children = (
+				5CB821AD1312487000778441 /* INetRequest.cpp */,
 				BDFCB13B112EE2B500AE3724 /* ssl.cpp */,
 				BDFCB13C112EE2B500AE3724 /* ssl.h */,
 				5C8EE85A11220E9E0005C20D /* AsyncHttp.cpp */,
@@ -439,6 +442,7 @@
 				5C2CE15C122ACA9E005EDBC4 /* RhoAppAdapter.cpp in Sources */,
 				FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */,
 				5CE03CCC12DB7E990058B474 /* sqlite3.c in Sources */,
+				5CB821AE1312487100778441 /* INetRequest.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -887,7 +887,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "source ~/.profile\ncd ../../\nrake build:iphone:rhobundle";
+			shellScript = "source ~/.profile\ncd ${SRCROOT}\ncd ../../\nrake build:iphone:rhobundle";
 		};
 		5C61F2BD1022321A0013E321 /* Move alerts to root of app */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -915,7 +915,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "RHO_SOURCE_DIR=${TARGET_BUILD_DIR}/../../bin/RhoBundle\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\nfor i in `ls -1 ${RHO_SOURCE_DIR}`\ndo\n  echo \"rm -Rf $RHO_TARGET_DIR/$i\"\n  rm -Rf ${RHO_TARGET_DIR}/$i\ndone\necho \"cp -Rf $RHO_SOURCE_DIR/* $RHO_TARGET_DIR\"\ncp -Rf ${RHO_SOURCE_DIR}/* ${RHO_TARGET_DIR}";
+			shellScript = "RHO_SOURCE_DIR=${SRCROOT}/bin/RhoBundle\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\nfor i in `ls -1 ${RHO_SOURCE_DIR}`\ndo\n  echo \"rm -Rf $RHO_TARGET_DIR/$i\"\n  rm -Rf ${RHO_TARGET_DIR}/$i\ndone\necho \"cp -Rf $RHO_SOURCE_DIR/* $RHO_TARGET_DIR\"\ncp -Rf ${RHO_SOURCE_DIR}/* ${RHO_TARGET_DIR}";
 		};
 		FA4207711277930A00BDE415 /* Copy Loading images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -929,7 +929,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "RHO_SOURCE_DIR=${TARGET_BUILD_DIR}/../..\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\n\nif [ -e ${RHO_SOURCE_DIR}/Default.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default@2x.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Portrait.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Landscape.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\nfi";
+			shellScript = "RHO_SOURCE_DIR=${SRCROOT}\nRHO_TARGET_DIR=${TARGET_BUILD_DIR}/${TARGET_NAME}.app\necho \"Create dir $RHO_TARGET_DIR\"\nmkdir -p ${RHO_TARGET_DIR}\n\nif [ -e ${RHO_SOURCE_DIR}/Default.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default@2x.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default@2x.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Portrait.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Portrait.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-PortraitUpsideDown.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-Landscape.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-Landscape.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeLeft.png ${RHO_TARGET_DIR}\nfi\n\nif [ -e ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ]; then\necho \"cp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\"\ncp -Rf ${RHO_SOURCE_DIR}/Default-LandscapeRight.png ${RHO_TARGET_DIR}\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 

data/platform/shared/SyncClient/SyncClient.cpp

@@ -67,7 +67,7 @@ void rho_syncclient_processmodels(RHOM_MODEL* pModels, int nModels)
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
     int nStartModelID = 1;
     {
-        DBResult( res, oUserDB.executeSQL("SELECT MAX(source_id) AS maxid FROM sources"));
+        IDBResult  res = oUserDB.executeSQL("SELECT MAX(source_id) AS maxid FROM sources");
         if ( !res.isEnd() )
             nStartModelID = res.getIntByIdx(0)+2;
     }
@@ -75,8 +75,8 @@ void rho_syncclient_processmodels(RHOM_MODEL* pModels, int nModels)
     for ( int i = 0; i < nModels; i++ )
     { 
         RHOM_MODEL& model = pModels[i];
-        DBResult( res, oUserDB.executeSQL("SELECT sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs FROM sources WHERE name=?",
-            model.name) );
+        IDBResult res = oUserDB.executeSQL("SELECT sync_priority,source_id,partition, sync_type, schema_version, associations, blob_attribs FROM sources WHERE name=?",
+            model.name);
 
         if ( !res.isEnd() )
         {
@@ -122,7 +122,7 @@ void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
     rho_db_init_attr_manager();
 
     LOG(INFO) + "Starting sync engine...";
-    CSyncThread::Create(common::rho_impl_createClassFactory());
+    CSyncThread::Create();
 
 }
 
@@ -241,14 +241,14 @@ unsigned long rhom_load_item_by_object(db::CDBAdapter& db, const String& src_nam
     if (!isSchemaSrc)
     {
         String sql = "SELECT attrib,value FROM object_values WHERE object=? AND source_id=?";
-        DBResult( res1, db.executeSQL(sql.c_str(), szObject, nSrcID) );
+        IDBResult res1 = db.executeSQL(sql.c_str(), szObject, nSrcID);
         item = rhom_make_object(res1, nSrcID, isSchemaSrc);
         if (item)
             rho_syncclient_hash_put(item, "object", szObject.c_str() );
     }else
     {
         String sql = "SELECT * FROM " + src_name + " WHERE object=? OFFSET 0 LIMIT 1";
-        DBResult( res1, db.executeSQL(sql.c_str(), szObject) );
+        IDBResult res1 = db.executeSQL(sql.c_str(), szObject);
         item = rhom_make_object(res1, nSrcID, isSchemaSrc);
     }
 
@@ -259,7 +259,7 @@ unsigned long rho_syncclient_find(const char* szModel,const char* szObject )
 {
     String src_name = szModel;
 
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -279,7 +279,7 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
 {
     String src_name = szModel;
 
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -331,7 +331,7 @@ unsigned long rhom_find(const char* szModel, unsigned long hash, int nCount )
 		}
     }
 
-    DBResult( res1, db.executeSQLEx(sql.c_str(), arValues ) );
+    IDBResult  res1 = db.executeSQLEx(sql.c_str(), arValues ) );
 
     if ( nCount == 1 )
     {
@@ -363,7 +363,7 @@ unsigned long rho_syncclient_find_first(const char* szModel, unsigned long hash
 void rho_syncclient_start_bulkupdate(const char* szModel)
 {
     String src_name = szModel;
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -378,7 +378,7 @@ void rho_syncclient_start_bulkupdate(const char* szModel)
 void rho_syncclient_stop_bulkupdate(const char* szModel)
 {
     String src_name = szModel;
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT partition from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -398,7 +398,7 @@ void rho_syncclient_itemdestroy( const char* szModel, unsigned long hash )
     String obj = hashObject.get("object");
     String update_type="delete";
 
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -419,12 +419,12 @@ void rho_syncclient_itemdestroy( const char* szModel, unsigned long hash )
     
     if ( isSchemaSrc )
     {
-        DBResult( attrsList, db.executeSQL( ("SELECT * FROM " + tableName + " WHERE object=?").c_str(), obj) );
+        IDBResult attrsList = db.executeSQL( ("SELECT * FROM " + tableName + " WHERE object=?").c_str(), obj);
         if ( !attrsList.isEnd() )
             item = rhom_make_object(attrsList,nSrcID,isSchemaSrc);
     }else
     {
-        DBResult( attrsList, db.executeSQL( ("SELECT attrib, value FROM " + tableName + " WHERE object=? and source_id=?").c_str(), obj, nSrcID) );
+        IDBResult attrsList = db.executeSQL( ("SELECT attrib, value FROM " + tableName + " WHERE object=? and source_id=?").c_str(), obj, nSrcID);
         if ( !attrsList.isEnd() )
             item = rhom_make_object(attrsList,nSrcID,isSchemaSrc);
     }
@@ -434,8 +434,8 @@ void rho_syncclient_itemdestroy( const char* szModel, unsigned long hash )
 
     if ( isSyncSrc )
     {
-        DBResult( resCreateType, db.executeSQL("SELECT update_type FROM changed_values WHERE object=? and update_type=? and sent=?",
-            obj, "create", 0) );
+        IDBResult resCreateType = db.executeSQL("SELECT update_type FROM changed_values WHERE object=? and update_type=? and sent=?",
+            obj, "create", 0);
 
         db.executeSQL("DELETE FROM changed_values WHERE object=? and sent=?", obj, 0);
 
@@ -472,7 +472,7 @@ void rho_syncclient_save( const char* szModel, unsigned long hash )
     Hashtable<String, String>& hashObject = *((Hashtable<String, String>*)hash);
     String src_name = szModel;
 
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source
@@ -504,13 +504,13 @@ void rho_syncclient_save( const char* szModel, unsigned long hash )
         arValues.addElement(obj);
         arValues.addElement(convertToStringA(nSrcID));
     }
-    DBResult( res1, db.executeSQLEx(sql.c_str(), arValues ) );
+    IDBResult res1 = db.executeSQLEx(sql.c_str(), arValues );
     if (!res1.isEnd())
     {
         if (isSyncSrc)
         {
-            DBResult( resUpdateType, db.executeSQL( "SELECT update_type FROM changed_values WHERE object=? and source_id=? and sent=?", 
-                obj, nSrcID, 0 ) );
+            IDBResult resUpdateType = db.executeSQL( "SELECT update_type FROM changed_values WHERE object=? and source_id=? and sent=?", 
+                obj, nSrcID, 0 );
             if (!resUpdateType.isEnd()) 
                 update_type = resUpdateType.getStringByIdx(0);
             else
@@ -553,8 +553,8 @@ void rho_syncclient_save( const char* szModel, unsigned long hash )
                 {
                     if (isSyncSrc)
                     {
-                        DBResult( resUpdateType, db.executeSQL( "SELECT update_type FROM changed_values WHERE object=? and attrib=? and source_id=? and sent=?", 
-                            obj, key, nSrcID, 0 ) );
+                        IDBResult resUpdateType = db.executeSQL( "SELECT update_type FROM changed_values WHERE object=? and attrib=? and source_id=? and sent=?", 
+                            obj, key, nSrcID, 0 );
                         if (!resUpdateType.isEnd()) 
                         {
                             fields.put("update_type", resUpdateType.getStringByIdx(0) );
@@ -595,7 +595,7 @@ void rho_syncclient_create_object(const char* szModel, unsigned long hash)
     Hashtable<String, String>& hashObject = *((Hashtable<String, String>*)hash);
     String src_name = szModel;
 
-    DBResult( res, db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name) );
+    IDBResult  res = db::CDBAdapter::getUserDB().executeSQL("SELECT source_id, partition, schema, sync_type from sources WHERE name=?", src_name);
     if ( res.isEnd())
     {
         //TODO: report error - unknown source

data/platform/shared/common/IRhoClassFactory.h

@@ -2,7 +2,7 @@
 
 namespace rho {
 namespace net{
-    struct INetRequest;
+    struct INetRequestImpl;
     struct ISSL;
 }
 
@@ -20,14 +20,16 @@ struct IRhoClassFactory
 {
     virtual ~IRhoClassFactory(void){;}
 
-    virtual net::INetRequest* createNetRequest() = 0;
     virtual IRhoThreadImpl* createThreadImpl() = 0;
     virtual net::ISSL* createSSLEngine() = 0;
 
     virtual IRhoCrypt* createRhoCrypt() = 0;
-};
 
-IRhoClassFactory* rho_impl_createClassFactory();
+    virtual net::INetRequestImpl* createNetRequestImpl() = 0;
+};
 
 }
 }
+
+rho::common::IRhoClassFactory* rho_get_RhoClassFactory();
+