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

data/platform/iphone/Classes/Rhodes.m

@@ -9,8 +9,11 @@
 #include "logging/RhoLog.h"
 #include "common/RhoConf.h"
 #include "common/RhodesApp.h"
+#include "common/app_build_configs.h"
 #import "SplitView/SplittedMainView.h"
 
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "Rhodes"
 
@@ -18,6 +21,7 @@ void rho_geoimpl_init();
 
 static BOOL app_created = NO;
 
+
 @interface RhoActivateTask : NSObject {}
 + (void)run;
 @end
@@ -31,7 +35,7 @@ static BOOL app_created = NO;
 
 @implementation Rhodes
 
-@synthesize window, player, cookies, signatureDelegate;
+@synthesize window, player, cookies, signatureDelegate, start_parameters;
 #ifdef __IPHONE_4_0
 @synthesize eventStore;
 #endif
@@ -665,14 +669,85 @@ static Rhodes *instance = NULL;
 
 #ifdef __IPHONE_3_0
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+	NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
+
+	// store start parameter
+	NSString* start_parameter = [NSString stringWithUTF8String:""];
+	if (url != nil) {
+		NSString* url_str = [url absoluteString];
+		if (url_str != nil) {
+			NSRange range = [url_str rangeOfString:@":"];
+			if ((range.location >= 0) && (range.length > 0)) {
+				start_parameter = [url_str substringFromIndex:range.location + 1];
+			}
+		}
+	}	
+	self.start_parameters = [NSString stringWithUTF8String:[start_parameter UTF8String]];
+	
+	
 	[self doStartUp];
 	[self processDoSync:launchOptions];
+	
+	/*
+	BOOL rhogallery_only = rho_conf_getBool("rhogallery_only_app");
+	
+	// check for only from gallery app
+	if (rhogallery_only) {
+		if ([start_parameter compare:@"rhogallery_app"] != NSOrderedSame) {
+			NSLog(@"ALERT ! Application should be executed only from RhoGallery application !!!");
+			exit(EXIT_SUCCESS);
+		}
+	}
+	 */
+	const char* security_token = get_app_build_config_item("security_token");
+	
+	if (security_token != NULL) {
+		NSString* ns_security_token = [NSString stringWithUTF8String:security_token];
+		if ([ns_security_token length] > 0) {
+			BOOL can_start = NO;
+			
+			NSString* security_token_key = [NSString stringWithUTF8String:"security_token="];
+			NSRange st_range = [start_parameter rangeOfString:security_token_key];	
+			if (st_range.location >= 0) {
+				NSString* tmp = [start_parameter substringFromIndex:(st_range.location + st_range.length)];
+				NSRange t_range = [tmp rangeOfString:@","];
+				if (t_range.location >= 0) {
+					tmp = [tmp substringToIndex:t_range.location];
+				}
+				t_range = [tmp rangeOfString:@" "];
+				if (t_range.location >= 0) {
+					tmp = [tmp substringToIndex:t_range.location];
+				}
+				
+				// check for app security_token
+				if ([tmp compare:ns_security_token] == NSOrderedSame) {
+					can_start = YES;
+				}
+			}
+			
+			if (!can_start) {
+				NSLog(@"ALERT ! SECURITY_TOKEN is not valid !!!");
+				exit(EXIT_SUCCESS);
+			}
+		}
+	}
+	
+	
+	
 	return NO;
 }
 #endif
 
 - (void)applicationDidFinishLaunching:(UIApplication *)application {
+	self.start_parameters = [NSString stringWithUTF8String:""];
+
 	[self doStartUp];
+	BOOL rhogallery_only = rho_conf_getBool("rhogallery_only_app");
+	if (rhogallery_only) {
+		NSLog(@"ALERT ! Application should be executed only from RhoGallery application !!!");
+		exit(EXIT_SUCCESS);
+	}
 }
 
 #ifdef __IPHONE_3_0
@@ -744,10 +819,42 @@ static Rhodes *instance = NULL;
         [mainView performSelector:sel];
 }
 
+- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url
+{
+    if (!url) {  return NO; }
+	/*
+    NSString *URLString = [url absoluteString];
+    [[NSUserDefaults standardUserDefaults] setObject:URLString forKey:@"url"];
+    [[NSUserDefaults standardUserDefaults] synchronize];
+
+	//NSString* msg = @"handleOpenURL: ";
+	//msg = [msg stringByAppendingString:URLString];
+	
+	UIAlertView *alert = [[[UIAlertView alloc]
+						   initWithTitle:@"handleOpenURL:"
+						   message:URLString
+						   delegate:self
+						   cancelButtonTitle:@"Close"
+						   otherButtonTitles:nil] autorelease];
+    
+    [alert show];
+	*/
+    return YES;
+}
+
+
+
 @end
 
 // Native functions
 
+const char* rho_sys_get_start_params() {
+	if ([Rhodes sharedInstance].start_parameters == nil) {
+		return "";
+	}
+    return [[Rhodes sharedInstance].start_parameters UTF8String];
+}
+
 
 void rho_map_location(char* query) {
     [[Rhodes sharedInstance] mapLocation:[NSString stringWithUTF8String:query]];

data/platform/iphone/Classes/SimpleMainView.h

@@ -11,6 +11,8 @@
 #import "RhoViewController.h"
 #include "RhoNativeViewManagerOC.h"
 
+
+
 @interface SimpleMainView : RhoViewController <RhoMainView, UIWebViewDelegate> {
 
     UIWebView *webView;
@@ -20,6 +22,7 @@
 	id<NativeViewOC,NSObject> nativeView;
 	NSString* nativeViewType;
 	UIView* nativeViewView;
+	RhoViewController* mTabBarCallback;
 }
 
 @property (nonatomic,retain) UIWebView *webView;
@@ -27,6 +30,7 @@
 @property (nonatomic,retain) UINavigationBar *navbar;
 @property (nonatomic,retain) NSString *nativeViewType;
 @property (nonatomic,retain) UIView *nativeViewView;
+@property (nonatomic,assign) RhoViewController* mTabBarCallback;
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p;
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p toolbar:(NSArray*)items;

data/platform/iphone/Classes/SimpleMainView.m

@@ -14,6 +14,8 @@
 #include "common/RhodesApp.h"
 #include "logging/RhoLog.h"
 
+#include "TabbedMainView.h"
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "SimpleMainView"
 
@@ -60,7 +62,7 @@ int rho_sys_get_screen_height();
 
 @implementation SimpleMainView
 
-@synthesize webView, toolbar, navbar, nativeViewType, nativeViewView;
+@synthesize webView, toolbar, navbar, nativeViewType, nativeViewView, mTabBarCallback;
 
 
 static BOOL makeHiddenUntilLoadContent = YES;
@@ -178,6 +180,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
     [tb sizeToFit];
     
     CGFloat tbHeight = [tb frame].size.height;
+	// hack for do not reduce height of toolbar in Landscape mode
+	if (tbHeight < 44) {
+		tbHeight = 44;
+	}
+	
     CGRect tbFrame = CGRectMake(CGRectGetMinX(mainFrame),
                                 CGRectGetHeight(mainFrame) - tbHeight,
                                 CGRectGetWidth(mainFrame),
@@ -284,6 +291,8 @@ static BOOL makeHiddenUntilLoadContent = YES;
 
 - (id)init:(UIView*)p webView:(UIWebView*)w frame:(CGRect)frame toolbar:(NSArray*)items {
 	[self init];
+	
+	self.mTabBarCallback = nil;
     
     rootFrame = frame;
     
@@ -718,13 +727,24 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	navbar.autoresizesSubviews = YES;
 	
 	UIView* root = self.view;
-    [root addSubview:navbar];
-    assert([navbar retainCount] == 2);
     
     CGRect nFrame = navbar.frame;
+
+	CGFloat nvHeight = nFrame.size.height;
+	// hack for do not reduce height of navbar in Landscape mode
+	if (nvHeight < 44) {
+		nvHeight = 44;
+	}
+	nFrame.size.height = nvHeight;
+	navbar.frame = nFrame;
+	
     CGRect wFrame = [self getContentRect];
     wFrame.origin.y += nFrame.size.height;
     wFrame.size.height -= nFrame.size.height;
+
+    [root addSubview:navbar];
+    assert([navbar retainCount] == 2);
+
     [self setContentRect:wFrame];
 }
 
@@ -876,4 +896,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
     }
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+	if (self.mTabBarCallback != nil) {
+		TabbedMainView* tv = (TabbedMainView*)self.mTabBarCallback;
+		[tv onViewWillActivate:self];
+	}
+}
+
 @end

data/platform/iphone/Classes/SplashViewController.m

@@ -153,7 +153,9 @@
 	CGRect frame = myframe;
 	float scales = 1;//[[UIScreen mainScreen] scale];
 #ifdef __IPHONE_4_0
-	scales = [[UIScreen mainScreen] scale];
+	if ( [[UIScreen mainScreen] respondsToSelector:@selector(scale)] ) {
+		scales = [[UIScreen mainScreen] scale];
+	}
 #endif
 	
 	BOOL is_HiResolution = ((frame.size.width*scales) > 500);

data/platform/iphone/Classes/TabbedMainView.h

@@ -24,4 +24,6 @@
 
 - (UIWebView*)getWebView:(int)tab_index;
 
+- (void)onViewWillActivate:(RhoViewController*)view;
+
 @end

data/platform/iphone/Classes/TabbedMainView.m

@@ -108,7 +108,10 @@
             subController.title = label;
             NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
             subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath];
-            //[subController navigateRedirect:url tab:0];
+            subController.tabBarItem.badgeValue = nil;
+			
+			subController.mTabBarCallback = self;
+	    //[subController navigateRedirect:url tab:0];
             
             [tabs addObject:td];
             [views addObject:subController];
@@ -156,6 +159,9 @@
 }
 
 - (RhoTabBarData*)tabData:(int)index {
+	if ((index < 0) || (index >= [tabbarData count])) {
+		return nil;
+	}
     return (RhoTabBarData*)[tabbarData objectAtIndex:index];
 }
 
@@ -204,22 +210,55 @@
 }
 
 - (void)switchTab:(int)index {
-    tabindex = index;
-    tabbar.selectedIndex = tabindex;
+    tabbar.selectedIndex = index;
 	[self onSwitchTab];
 }
 
+- (void)setTabBadge:(int)index val:(char*)val {
+  RAWLOG_INFO2("setTabBadge: %d = %s",index,val); 
+  if(!strcmp(val,""))
+  {
+          [self subView:index].tabBarItem.badgeValue = nil;
+  }
+  else
+  {
+          [self subView:index].tabBarItem.badgeValue = [NSString stringWithCString:val length:strlen(val)];
+  }
+  RAWLOG_INFO("returning setTabBadge");
+}
+
 - (void)onSwitchTab {
-    tabindex = tabbar.selectedIndex;
-    RhoTabBarData *td = [self tabData:tabindex];
-    if (!td.loaded || td.reload) {
-        const char *s = [td.url UTF8String];
-        rho_rhodesapp_load_url(s);
-        td.loaded = YES;
-    }
-	[[[self subView:tabindex] view] setNeedsDisplay];
+	int new_index = tabbar.selectedIndex;
+    RhoTabBarData *td = [self tabData:new_index];
+	if (td != nil) {
+		if (tabindex != new_index) {
+			tabindex = new_index;
+			if (!td.loaded || td.reload) {
+				const char *s = [td.url UTF8String];
+				rho_rhodesapp_load_url(s);
+				td.loaded = YES;
+			}
+			[[[self subView:tabindex] view] setNeedsDisplay];
+		}
+	}
+}
+
+
+- (void)onSwitchTab:(int)tab_index {
+	int new_index = tab_index;
+    RhoTabBarData *td = [self tabData:new_index];
+	if (td != nil) {
+		tabindex = new_index;
+		if (!td.loaded || td.reload) {
+			const char *s = [td.url UTF8String];
+			rho_rhodesapp_load_url(s);
+			td.loaded = YES;
+		}
+		[[[self subView:tabindex] view] setNeedsDisplay];
+	}
 }
 
+
 - (int)activeTab {
     return tabindex;
 }
@@ -240,4 +279,17 @@
     [[self subView:[self activeTab]] removeNavBar];
 }
 
+- (void)onViewWillActivate:(RhoViewController*)view {
+	int index = -1;
+	int i;
+	for (i = 0; i < [tabbar.viewControllers count]; i++) {
+		if ([tabbar.viewControllers objectAtIndex:i] == view) {
+			index = i;
+		}
+	}
+	if ((index >= 0) && (index != tabindex)) {
+		[self onSwitchTab:index];
+	}
+}
+
 @end

data/platform/iphone/Classes/rho/net/NetRequestImpl.m

@@ -76,6 +76,32 @@ VALUE rho_sys_has_network() {
 	return rho_ruby_create_boolean(0);
 }
 
+int rho_net_ping_network(const char* szHost)
+{
+	RAWLOG_INFO("PING network.");
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	
+	NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] init] autorelease];
+	NSString *linkString = [[NSString alloc] initWithUTF8String:szHost];
+
+	[request setURL:[NSURL URLWithString:linkString]];
+	[request setTimeoutInterval:10];
+	
+	NSError *error = nil;
+	NSHTTPURLResponse *response;
+	NSData *returnData = NULL;
+	returnData = [ NSURLConnection sendSynchronousRequest: request returningResponse:&response error: &error ];
+	
+	if (!returnData)
+		RAWLOG_ERROR2("PING network FAILED. NSError: %d. NSErrorInfo : %s", [error code], [[error localizedDescription] UTF8String]);
+	else
+		RAWLOG_INFO("PING network SUCCEEDED.");	
+	
+	[pool release];
+	
+	return returnData == NULL ? 0 : 1;
+}
+
 int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags)
 {
 	struct sockaddr_in zeroAddress;

data/platform/iphone/Info.plist

@@ -2,6 +2,17 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>rhodes</string>
+			</array>
+			<key>CFBundleURLName</key>
+			<string>com.rhomobile.rhosyncclient</string>
+		</dict>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -27,7 +38,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.4</string>
+	<string>2.2.5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UILaunchImageFile</key>

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

@@ -70,6 +70,8 @@
 		BDD11ECE113664E700349BE3 /* rhoparams.h in Headers */ = {isa = PBXBuildFile; fileRef = BDD11ECC113664E700349BE3 /* rhoparams.h */; };
 		BDFCB13D112EE2B500AE3724 /* ssl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BDFCB13B112EE2B500AE3724 /* ssl.cpp */; };
 		BDFCB13E112EE2B500AE3724 /* ssl.h in Headers */ = {isa = PBXBuildFile; fileRef = BDFCB13C112EE2B500AE3724 /* ssl.h */; };
+		FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */ = {isa = PBXBuildFile; fileRef = FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */; };
+		FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */ = {isa = PBXBuildFile; fileRef = FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -137,6 +139,8 @@
 		BDFCB13B112EE2B500AE3724 /* ssl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ssl.cpp; path = ../../shared/net/ssl.cpp; sourceTree = SOURCE_ROOT; };
 		BDFCB13C112EE2B500AE3724 /* ssl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ssl.h; path = ../../shared/net/ssl.h; sourceTree = SOURCE_ROOT; };
 		D2AAC046055464E500DB518D /* librholib.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librholib.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = app_build_configs.c; path = ../../shared/common/app_build_configs.c; sourceTree = SOURCE_ROOT; };
+		FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = app_build_configs.h; path = ../../shared/common/app_build_configs.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -202,6 +206,8 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				FA5F58DD12ADDA6D00C7613A /* app_build_configs.c */,
+				FA5F58DE12ADDA6D00C7613A /* app_build_configs.h */,
 				5C2CE254122AEC87005EDBC4 /* RhoAppAdapter.h */,
 				5C663BE711F3712C005F60AF /* RhodesAppBase.cpp */,
 				5C663BE811F3712C005F60AF /* RhodesAppBase.h */,
@@ -338,6 +344,7 @@
 				5CA2DE9111B01EF000B868D5 /* ThreadQueue.h in Headers */,
 				5C663BEB11F3712C005F60AF /* RhodesAppBase.h in Headers */,
 				5C2CE255122AEC87005EDBC4 /* RhoAppAdapter.h in Headers */,
+				FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -408,6 +415,7 @@
 				5CEBCFEF11E6FB8700145F4E /* rhoparams.cpp in Sources */,
 				5C663BEA11F3712C005F60AF /* RhodesAppBase.cpp in Sources */,
 				5C2CE15C122ACA9E005EDBC4 /* RhoAppAdapter.cpp in Sources */,
+				FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};