rhodes 1.5.5 → 2.0.0.beta1

data/platform/bb/rhodes/src/rhomobile/WebView.java

@@ -1,90 +0,0 @@
-package rhomobile;
-
-import com.rho.RhoEmptyLogger;
-import com.rho.RhoLogger;
-import com.xruby.runtime.builtin.ObjectFactory;
-import com.xruby.runtime.builtin.RubyArray;
-import com.xruby.runtime.builtin.RubyHash;
-import com.xruby.runtime.lang.RubyBasic;
-import com.xruby.runtime.lang.RubyBlock;
-import com.xruby.runtime.lang.RubyClass;
-import com.xruby.runtime.lang.RubyConstant;
-import com.xruby.runtime.lang.RubyNoArgMethod;
-import com.xruby.runtime.lang.RubyOneArgMethod;
-import com.xruby.runtime.lang.RubyValue;
-import com.xruby.runtime.lang.RubyVarArgMethod;
-
-public class WebView extends RubyBasic {
-	private static final RhoLogger LOG = RhoLogger.RHO_STRIP_LOG ? new RhoEmptyLogger() : 
-		new RhoLogger("WebView");
-
-	public WebView(RubyClass arg0) {
-		super(arg0);
-		// TODO Auto-generated constructor stub
-	}
-
-	public static RubyValue refresh() {
-		RhodesApplication.getInstance().refreshCurrentPage();
-		return RubyConstant.QNIL;
-	}
-
-	public static RubyValue navigate(RubyValue arg0) {
-		String url = arg0.toString();
-		RhodesApplication.getInstance().addToHistory(url, null);
-		RhodesApplication.getInstance().navigateUrl(url);
-		return RubyConstant.QNIL;
-	}
-
-	public static RubyValue current_location() {
-		String url = RhodesApplication.getInstance().getCurrentPageUrl();
-		return ObjectFactory.createString(url);
-	}
-	
-	public static RubyValue set_menu_items(RubyValue arg0) {
-		RhodesApplication.getInstance().resetMenuItems();
-		RubyHash items = (RubyHash)arg0;
-		RubyArray keys = items.keys();
-		RubyArray values = items.values();
-		for( int i = 0; i < keys.size(); i++ ){
-			String label = keys.get(i).toString();
-			String value = values.get(i).toString();
-			RhodesApplication.getInstance().addMenuItem(label, value);
-		}
-		LOG.INFO("set_menu_items end");
-		return RubyConstant.QTRUE;
-	}
-		
-	public static void initMethods(RubyClass klass) {
-		klass.getSingletonClass().defineMethod("refresh", new RubyNoArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyBlock block) {
-				return WebView.refresh();
-			}
-		});		
-		klass.getSingletonClass().defineMethod("navigate", new RubyVarArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyArray args, RubyBlock block ){
-				return WebView.navigate(args.get(0));
-			}
-		});
-		klass.getSingletonClass().defineMethod("current_location", new RubyNoArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyBlock block) {
-				return WebView.current_location();
-			}
-		});		
-		klass.getSingletonClass().defineMethod("set_menu_items", new RubyOneArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) {
-				return WebView.set_menu_items(arg0);
-			}
-		});
-		klass.getSingletonClass().defineMethod("execute_js", new RubyOneArgMethod() {
-			protected RubyValue run(RubyValue receiver, RubyValue arg0, RubyBlock block) {
-				return RubyConstant.QNIL;
-			}
-		});
-		klass.getSingletonClass().defineMethod("active_tab", new RubyNoArgMethod() {
-		 	protected RubyValue run(RubyValue receiver, RubyBlock block) {
-		 		return ObjectFactory.createInteger(0);
-		 	}
-		});
-	}
-	
-}

data/platform/iphone/Classes/BarItem.h

@@ -1,27 +0,0 @@
-//
-//  BarItem.h
-//  rhorunner
-//
-//  Created by lars on 8/25/09.
-//  Copyright 2009 Home. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import "WebViewController.h"
-
-
-@interface BarItem : NSObject {
-@private
-	BOOL loaded,reload;
-	NSString* label,*location,*icon;
-	WebViewController* viewController;
-}
-
-@property(nonatomic,assign) BOOL loaded;
-@property(nonatomic,assign) BOOL reload;
-@property(nonatomic,retain) NSString* label;
-@property(nonatomic,retain) NSString* location;
-@property(nonatomic,retain) NSString* icon;
-@property(nonatomic,retain) WebViewController* viewController;
-
-@end

data/platform/iphone/Classes/BarItem.m

@@ -1,32 +0,0 @@
-//
-//  BarItem.m
-//  rhorunner
-//
-//  Created by lars on 8/25/09.
-//  Copyright 2009 Home. All rights reserved.
-//
-
-#import "BarItem.h"
-
-
-@implementation BarItem
-
-@synthesize loaded, reload, label, location, icon, viewController;
-
-- (id) init { 
-	if ( self = [super init] ) { 
-		self.loaded = NO; 
-		self.reload = NO;
-	} 
-	return self; 
-} 
-
--(void)dealloc {
-	[self.label release];
-	[self.location release];
-	[self.icon release];
-	[self.viewController release];
-	[super dealloc];
-}
-
-@end

data/platform/iphone/Classes/JSString.h

@@ -1,12 +0,0 @@
-#import <Foundation/Foundation.h>
-
-@interface JSString : NSObject {
-	NSString *inputJs;
-	NSString *outputJs;
-@public
-    int index;
-}
-
-@property(copy) NSString *inputJs;
-@property(copy) NSString *outputJs;	
-@end

data/platform/iphone/Classes/JSString.m

@@ -1,7 +0,0 @@
-#import "JSString.h"
-
-@implementation JSString
-
-@synthesize inputJs, outputJs;
-
-@end

data/platform/iphone/Classes/RhoRunnerAppDelegate.h

@@ -1,48 +0,0 @@
-//
-//  BrowserAppDelegate.h
-//  Browser
-//
-//  Created by adam blum on 9/4/08.
-//  Copyright __MyCompanyName__ 2008. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import <AVFoundation/AVFoundation.h>
-#import "ServerHost.h"
-#import "SplashViewController.h"
-#import "PickImageDelegate.h"
-#import "DateTimePickerDelegate.h"
-#import "TabBarDelegate.h"
-#import "LogViewController.h"
-#import "LogOptionsController.h"
-#import "NativeBar.h"
-
-@class WebViewController;
-
-@interface RhoRunnerAppDelegate : NSObject <UIApplicationDelegate, AVAudioPlayerDelegate> {
-    UIWindow *window;
-    SplashViewController *splashViewController;
-    WebViewController *webViewController;
-    LogViewController* logViewController;
-    LogOptionsController* logOptionsController;
-    ServerHost * serverHost;
-    PickImageDelegate* pickImageDelegate;
-    DateTimePickerDelegate* dateTimePickerDelegate;
-    TabBarDelegate* tabBarDelegate;
-    NativeBar* nativeBar;
-    AVAudioPlayer *player;
-    bool appStarted;
-    bool splashDisplayed;
-}
-
-@property (nonatomic, retain) UIWindow *window;
-@property (nonatomic, retain) SplashViewController *splashViewController;
-@property (nonatomic, retain) WebViewController *webViewController;
-@property (nonatomic, retain) AVAudioPlayer *player;
-@property (nonatomic, retain) NativeBar* nativeBar;
-
-+ (RhoRunnerAppDelegate*)sharedDelegate;
-- (void)fixFrame;
-
-@end
-

data/platform/iphone/Classes/RhoRunnerAppDelegate.m

@@ -1,617 +0,0 @@
-//
-//  BrowserAppDelegate.m
-//  Browser
-//
-//  Created by adam blum on 9/4/08.
-//  Copyright __MyCompanyName__ 2008. All rights reserved.
-//
-#import <AudioToolbox/AudioToolbox.h>
-
-#include "common/RhoPort.h"
-#import "RhoRunnerAppDelegate.h"
-#import "WebViewController.h"
-//#import "AppManager.h"
-//#import "common/RhoConf.h"
-#import "logging/RhoLog.h"
-#include "sync/ClientRegister.h"
-#include "sync/syncthread.h"
-#include "common/RhodesApp.h"
-#import "ParamsWrapper.h"
-#import "DateTime.h"
-#import "NativeBar.h"
-#import "BarItem.h"
-#import "WebViewUrl.h"
-#import "RhoDelegate.h"
-#ifdef __IPHONE_3_0
-#import "MapViewController.h"
-#endif
-
-#undef DEFAULT_LOGCATEGORY
-#define DEFAULT_LOGCATEGORY "RhoRunnerAppDelegate"
-
-@implementation RhoRunnerAppDelegate
-
-@synthesize window;
-@synthesize splashViewController;
-@synthesize webViewController;
-@synthesize player; 
-@synthesize nativeBar;
-/*
-- (NSString*)normalizeUrl:(NSString*)url 
-{
-//	if([url hasPrefix:@"http://"]) {
-//		return url;
-//	}
-//	NSString* location = [@"http://localhost:8080" stringByAppendingString:[@"/" stringByAppendingPathComponent:url]];
-//	return location;
-	char* szNormUrl = rho_http_normalizeurl([url cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-	NSString* strRes = [NSString stringWithCString:szNormUrl encoding:[NSString defaultCStringEncoding]];
-	rho_http_free(szNormUrl);
-	
-	return strRes;
-}*/
-
-+ (RhoRunnerAppDelegate*)sharedDelegate {
-    UIApplication *app = [UIApplication sharedApplication];
-    return (RhoRunnerAppDelegate*)app.delegate;
-}
-
-- (void)fixFrame {
-    UIApplication *app = [UIApplication sharedApplication];
-    CGRect frame = [[UIScreen mainScreen] applicationFrame];
-    if (!app.statusBarHidden) {
-        int newY = 10;
-        frame.size.height += frame.origin.y - newY;
-        frame.origin.y = newY;
-    }
-    [window setFrame:frame];
-}
-
-- (void)hideSplash {
-    [splashViewController hideSplash];
-    splashDisplayed = false;
-}
-
-- (void)loadStartPath:(NSString*)location {
-	if (nativeBar.barType == TOOLBAR_TYPE || nativeBar.barType == NOBAR_TYPE) {
-		[webViewController navigateRedirect:location];
-	} else {
-		// Load tab #0 on app load
-        BarItem *item = (BarItem*)[tabBarDelegate.barItems objectAtIndex:0];
-		[tabBarDelegate loadTabBarItemFirstPage:item];
-	}	
-}
-
-- (void)onServerStarted:(NSString*)data {
-	RAWLOG_INFO("Server Started notification is recived");
-	NSString* location = [NSString stringWithCString:rho_rhodesapp_getfirststarturl() encoding:[NSString defaultCStringEncoding]];
-	/*
-	//try to restore previous location
-	if ( rho_conf_getBool("KeepTrackOfLastVisitedPage") ) {
-		char* lastVisitedPage = rho_conf_getString("LastVisitedPage");
-		if (lastVisitedPage && strlen(lastVisitedPage)>0) {
-			location = [NSString stringWithCString:lastVisitedPage
-										  encoding:[NSString defaultCStringEncoding]];
-		}
-		rho_conf_freeString(lastVisitedPage);
-	} 
-	
-	//if there is no previous location navigate to the default start page 
-	if (!location) {
-		location = [self normalizeUrl:(NSString*)data];
-	}*/
-	
-	appStarted = true;
-	[self loadStartPath:location];
-}
-
-- (void)onRefreshView:(int)index {
-    if (self.nativeBar.barType == TABBAR_TYPE) {
-        BarItem *item = (BarItem*)[tabBarDelegate.barItems objectAtIndex:index];
-        [tabBarDelegate refresh:item];
-    }
-    else {
-        [webViewController refresh];
-    }
-}
-
-- (void)onNavigateTo:(WebViewUrl*) wvUrl {
-	if (self.nativeBar.barType == TABBAR_TYPE) {
-        int size = [tabBarDelegate.barItems count];
-        if (wvUrl.webViewIndex >= size) {
-            RAWLOG_ERROR2("Web view index out of bound: %d (%d tabs)", wvUrl.webViewIndex, size);
-            return;
-        }
-		BarItem* bItem = (BarItem*)[tabBarDelegate.barItems objectAtIndex:wvUrl.webViewIndex];
-        [tabBarDelegate loadTabBarItemLocation:bItem url:wvUrl.url];
-	} else {
-		[webViewController navigateRedirect:wvUrl.url];
-	}
-}
-
-- (void)onExecuteJs:(JSString *)js {
-    if (self.nativeBar.barType == TABBAR_TYPE) {
-        BarItem *item = (BarItem *)[tabBarDelegate.barItems objectAtIndex:js->index];
-        [tabBarDelegate executeJs:item js:js];
-    }
-    else {
-        [webViewController executeJs:js];
-    }
-}
-/*
-- (void)onSetViewHomeUrl:(NSString *)url {
-	[webViewController setViewHomeUrl:url];
-}*/
-
-#ifdef __IPHONE_3_0
--(void) onCreateMap:(NSValue*)value {
-	MapViewController* map = [[MapViewController alloc] init];
-    [map setParams:[value pointerValue]];
-	map.actionTarget = self;
-	map.onNavigate = @selector(onNavigateTo:);
-	[window addSubview:map.view];
-    [map.view setFrame:[window frame]];
-}
-#endif
-
--(BOOL)startCameraPickerFromViewController:(UIViewController*)controller 
-							 usingDelegate:(id<UINavigationControllerDelegate, UIImagePickerControllerDelegate>)delegateObject 
-							 sourceType:(UIImagePickerControllerSourceType)type
-{ 
-#if !defined __IPHONE_3_0
-	if ( (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypePhotoLibrary]) || 
-		 (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) ||
-		 (delegateObject == nil) || (controller == nil)) {
-		return NO; 
-	}
-#endif
-	
-	@try {
-        [[UIApplication sharedApplication] setStatusBarHidden:YES];
-        [self fixFrame];
-		UIImagePickerController* picker = [[UIImagePickerController alloc] init]; 
-		picker.sourceType = type;
-		picker.delegate = delegateObject; 
-		picker.allowsImageEditing = YES;
-        
-        //[picker.view setFrame:frame];
-		[window addSubview:picker.view];
-	} @catch(NSException* theException) {
-		RAWLOG_ERROR2("startCameraPickerFromViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
-		//NSLog(@"%@", theException);
-        [[UIApplication sharedApplication] setStatusBarHidden:NO];
-        [self fixFrame];
-		return NO;
-	}
-	
-	return YES;
-} 
-
--(BOOL)startDateTimePickerFromViewController:(UIViewController*)controller 
-							 usingDelegate:(DateTimePickerDelegate*)delegateObject
-{
-	@try {
-		[delegateObject createPicker:window];
-	} @catch (NSException* theException) {
-		RAWLOG_ERROR2("startDateTimePickerFromViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
-		return NO;
-	}
-	return YES;
-} 
-
--(BOOL)startNativeBarFromViewController:(UIViewController*)controller 
-							   usingDelegate:(TabBarDelegate*)delegateObject
-{
-	@try {
-		[delegateObject createTabBar:window];
-	} @catch (NSException* theException) {
-		RAWLOG_ERROR2("startNativeBarFromViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
-		return NO;
-	}
-	return YES;
-} 
-
-- (void)onTakePicture:(NSString*) url {
-	[pickImageDelegate setPostUrl:url];//[self normalizeUrl:url]];
-	[self startCameraPickerFromViewController:webViewController 
-								usingDelegate:pickImageDelegate 
-								sourceType:UIImagePickerControllerSourceTypeCamera];
-}
-
-- (void)onChoosePicture:(NSString*) url {
-	[pickImageDelegate setPostUrl:url];//[self normalizeUrl:url]];
-	[self startCameraPickerFromViewController:webViewController 
-								usingDelegate:pickImageDelegate 
-								sourceType:UIImagePickerControllerSourceTypePhotoLibrary];
-}
-
-- (void)onChooseDateTime:(DateTime*)dateTime {
-	dateTimePickerDelegate.dateTime = dateTime;
-	[dateTimePickerDelegate setPostUrl:dateTime.url];//[self normalizeUrl:dateTime.url]];
-	[self startDateTimePickerFromViewController:webViewController
-								  usingDelegate:dateTimePickerDelegate];
-}
-
-- (void)onRemoveNativeBar {
-    if (self.nativeBar == nil)
-        return;
-    
-    if (self.nativeBar.barType == TABBAR_TYPE) {
-        [tabBarDelegate deleteTabBar];
-    }
-    else {
-        [webViewController showToolbar:NO];
-    }
-    self.nativeBar = nil;
-}
-
-- (void)onCreateNativeBar:(NativeBar*)bar {
-    if (self.nativeBar != nil) {
-        RAWLOG_INFO("Native bar already exists, remove it");
-        [self onRemoveNativeBar];
-    }
-	
-    // retain the nativebar so it doesn't get deleted
-	[bar retain];
-    int type = bar.barType;
-    if (type == TABBAR_TYPE) {
-        tabBarDelegate.tabBar = bar;
-        [self startNativeBarFromViewController:webViewController usingDelegate:tabBarDelegate];
-	}
-    else if (type == TOOLBAR_TYPE) {
-        [webViewController createNewToolbar:bar.barItemDataArray];
-        [webViewController showToolbar:YES];
-	}
-    else if (type == NOBAR_TYPE) {
-        [webViewController showToolbar:NO];
-	}
-    self.nativeBar = bar;
-    if (splashDisplayed)
-        [splashViewController bringToFront];
-}
-
-- (void)onSwitchTab:(NSValue*)value {
-    int* pIndex = value.pointerValue;
-    if (self.nativeBar == nil)
-        return;
-    
-    if (self.nativeBar.barType == TABBAR_TYPE) {
-        [tabBarDelegate switchTab:*pIndex];
-    }
-}
-
-/*
-- (void)onSetViewOptionsUrl:(NSString *)url {
-	[webViewController setViewOptionsUrl:url];
-}*/
-
-- (void)onShowLog {
-	if (logViewController!=NULL) {
-		[window addSubview:logViewController.view];
-		logViewController.view.hidden = NO;
-	}
-}
-
-- (void)onShowLogOptions {
-	if (logOptionsController!=NULL) {
-		[window addSubview:logOptionsController.view];
-		logOptionsController.view.hidden = NO;
-	}
-}
-
-- (void)onShowPopup:(NSString *)message {
-	UIAlertView *alert = [[UIAlertView alloc]
-							   initWithTitle: @"Alert"
-							   message: message
-							   delegate:nil
-							   cancelButtonTitle:@"OK"
-							   otherButtonTitles:nil];
-    [alert show];
-    [alert release];
-}
-
-- (void)onVibrate:(int)duration {
-	AudioServicesPlaySystemSound (kSystemSoundID_Vibrate);
-}
-
-- (void)onPlayFile:(NSString *)fileName {
-	NSString *soundFilePath;
-	//hack to work around iphone limitation when it will play push alerts only from the main bundle root
-	if ([fileName hasPrefix:@"/public/alerts/"] || [fileName hasPrefix:@"/apps/public/alerts/"]) {
-		NSString *file = [fileName lastPathComponent];
-		soundFilePath = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:file];		
-	} else {
-		soundFilePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:fileName];
-	}
-	NSLog(@"Playing %@: ", soundFilePath);
-	
-	NSURL *fileURL = [[NSURL alloc] initFileURLWithPath: soundFilePath];
-	NSError* err = nil;
-	AVAudioPlayer *newPlayer = [AVAudioPlayer alloc];
-	[newPlayer initWithContentsOfURL:fileURL error:&err];
-	NSLog(@"Init media player returns: %@", err);
-	
-	[fileURL release];
-	self.player = newPlayer;
-	[newPlayer release];
-	
-	[player prepareToPlay];	
-	[player setDelegate: self];
-	[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];
-		NSLog(@"Audio player finished playing...");
-	}	
-}
-
-- (void)audioPlayerDecodeErrorDidOccur:(AVAudioPlayer *)player error:(NSError *)error {
-	NSLog(@"Audio player decoding error %@", error);
-}
-
-- (void)onSysCall:(ParamsWrapper*)params {
-	PARAMS_WRAPPER pw;
-	do_syscall([params unwrap:&pw]);
-	[params release];
-}
-
-- (void)onMapLocation:(NSString*)query {
-	NSURL* url = [NSURL URLWithString:[@"http://maps.google.com/?" stringByAppendingString:query]];
-	[[UIApplication sharedApplication] openURL:url];
-}
-
-- (void)onActiveTab:(NSValue*)val {
-	//TODO: This is a bit weird, but saves us creating another wrapper class
-	int* res = val.pointerValue;
-	if (tabBarDelegate && tabBarDelegate.tabBar) {
-		*res = tabBarDelegate.activeTab;
-	} else {
-		*res = 0;
-	}
-}
-
-#ifdef __IPHONE_3_0
-- (void)processDoSync:(NSDictionary *)userInfo
-{
-	NSArray *do_sync = [userInfo objectForKey:@"do_sync"];
-	if (do_sync) {
-		NSEnumerator *enumerator = [do_sync objectEnumerator];
-		id url;
-		
-		NSLog(@"do_sync array: ");
-		bool sync_all = false;
-		while ( url = [enumerator nextObject] ) {
-			NSLog( @"url = %@", url );
-			if ([@"all" caseInsensitiveCompare:url] == NSOrderedSame) {
-				sync_all = true;
-			} else {
-				//do sync of individual source
-				NSString* srcUrl = [url stringByTrimmingCharactersInSet: [NSCharacterSet characterSetWithCharactersInString:@" \t\r\n"]];
-				rho_sync_doSyncSourceByUrl([srcUrl cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-			}
-		}
-		
-		if (sync_all) {
-			rho_sync_doSyncAllSources(TRUE);
-		}
-	}
-}
-- (void)processPushMessage:(NSDictionary *)userInfo
-{
-	RAWLOG_INFO("Processing PUSH message...");
-	NSDictionary *aps = [userInfo objectForKey:@"aps"];
-	if (aps) {
-		NSString *alert = [aps objectForKey:@"alert"];
-		if (alert && [alert length] > 0) {
-			NSLog(@"Push Alert: %@", alert);
-			[self onShowPopup:alert];
-		}
-		NSString *sound = [aps objectForKey:@"sound"];
-		if (sound && [sound length] > 0) {
-			NSLog(@"Sound file name: %@", sound);
-			[self onPlayFile:[@"/public/alerts/" stringByAppendingPathComponent:sound]];
-		}
-		NSString *vibrate = [aps objectForKey:@"vibrate"];
-		if (vibrate && [vibrate length] > 0) {
-			NSLog(@"Do vibrate...");
-			[self onVibrate:1];
-		}
-	}
-	[self processDoSync:userInfo];
-}
-#endif
-
-- (void) showLoadingPage 
-{
-    NSFileManager *fileManager = [NSFileManager defaultManager];
-    
-    NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
-    NSString *pngPath = [NSString stringWithFormat:@"%@/apps/app/loading.png", resourcePath];
-    NSString *htmPath = [NSString stringWithFormat:@"%@/apps/app/loading.html", resourcePath];
-    
-    if ([fileManager fileExistsAtPath:pngPath]) {
-        [splashViewController showSplash:pngPath];
-        splashDisplayed = true;
-    }
-    else if ([fileManager fileExistsAtPath:htmPath]) {
-        NSData *data = [fileManager contentsAtPath:htmPath];
-        [webViewController loadData:data mimeType:@"text/html"];
-    }
-}
-
-- (void) doStartUp {
-	appStarted = false;
-    splashDisplayed = false;
-    
-    [NSThread setThreadPriority:1.0];
-    
-    //Create local server and start it
-    //serverHost = [[ServerHost alloc] init];
-	serverHost = [ServerHost sharedInstance];
-    [serverHost create];
-    
-    //UIApplication *app = [UIApplication sharedApplication];
-    //[app setStatusBarStyle:UIStatusBarStyleBlackTranslucent];
-    //[app setStatusBarHidden:YES];
-    
-    //[[UIApplication sharedApplication]
-    //    setStatusBarStyle:UIStatusBarStyleBlackTranslucent animated:YES];
-    
-    window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] applicationFrame]];
-    window.contentMode = UIViewContentModeScaleToFill;
-    window.autoresizesSubviews = YES;
-    window.userInteractionEnabled = YES;
-    [window makeKeyAndVisible];
-    
-    [self fixFrame];
-    
-    webViewController = [[WebViewController alloc] initWithParentWindow:window];
-    webViewController->actionTarget = self;
-    webViewController->onShowLog = @selector(onShowLog);
-    
-    splashViewController = [[SplashViewController alloc] initWithParentView:window];
-    
-    [self showLoadingPage];
-    
-    // Log View
-	logViewController = [[LogViewController alloc] init];
-	logViewController->actionTarget = self;
-	logViewController->onShowLogOptions = @selector(onShowLogOptions);
-	
-	logOptionsController = [[LogOptionsController alloc] init];    
-	
-	//TabBar delegate
-	tabBarDelegate = [[TabBarDelegate alloc] init];
-	
-	//Camera delegate
-	pickImageDelegate = [[PickImageDelegate alloc] init];
-	
-	//DateTime delegate
-	dateTimePickerDelegate = [[DateTimePickerDelegate alloc] init];
-	
-	serverHost->actionTarget = self;
-	serverHost->onStartSuccess = @selector(onServerStarted:);
-	serverHost->onRefreshView = @selector(onRefreshView);
-	serverHost->onNavigateTo = @selector(onNavigateTo:);
-	serverHost->onExecuteJs = @selector(onExecuteJs:);
-	//serverHost->onSetViewHomeUrl = @selector(onSetViewHomeUrl:);
-	serverHost->onTakePicture = @selector(onTakePicture:);
-	serverHost->onChoosePicture = @selector(onChoosePicture:);
-	serverHost->onChooseDateTime = @selector(onChooseDateTime:);
-	serverHost->onCreateNativeBar = @selector(onCreateNativeBar:);
-    serverHost->onRemoveNativeBar = @selector(onRemoveNativeBar);
-    serverHost->onSwitchTab = @selector(onSwitchTab:);
-	//serverHost->onSetViewOptionsUrl = @selector(onSetViewOptionsUrl:);
-	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:);
-	serverHost->onActiveTab = @selector(onActiveTab:);
-    serverHost->onShowLog = @selector(onShowLog);
-    [serverHost start];
-		
-#ifdef __IPHONE_3_0
-	[[UIApplication sharedApplication] registerForRemoteNotificationTypes:(UIRemoteNotificationTypeBadge 
-																		   | UIRemoteNotificationTypeAlert | UIRemoteNotificationTypeSound)];
-#endif
-}
-
-#ifdef __IPHONE_3_0
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-	[self doStartUp];
-	[self processDoSync:launchOptions];
-	return NO;
-}
-#endif
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
-	[self doStartUp];
-}
-
-#ifdef __IPHONE_3_0
-- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
-{
-	NSLog(@"Device token is %@", deviceToken);
-	
-	NSMutableString *stringBuffer = [NSMutableString stringWithCapacity:([deviceToken length] * 2)];
-	const unsigned char *dataBuffer = [deviceToken bytes];
-	for (int i = 0; i < [deviceToken length]; ++i)
-		[stringBuffer appendFormat:@"%02x", (unsigned long)dataBuffer[ i ]];
-	
-	char* szpin = strdup([stringBuffer cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-	RAWLOG_INFO1("device pin: %s\n", szpin);
-
-	rho_clientregister_create(szpin);
-	free(szpin);
-}
-
-- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
-{
-	NSLog(@"Push Notification Error: %@", [error localizedDescription]);
-}
-
-- (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo
-{
-	[self processPushMessage:userInfo];
-}
-#endif
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-	if (appStarted) {
-	    //rho_rhodesapp_callAppActiveCallback();
-/*		RhoDelegate* callback = [[RhoDelegate alloc] init];
-		char* callbackUrl = rho_conf_getString("app_did_become_active_callback");
-		if (callbackUrl && strlen(callbackUrl) > 0) {
-			callback.postUrl = [self normalizeUrl:[NSString stringWithCString:callbackUrl
-								  encoding:[NSString defaultCStringEncoding]]];
-			[callback doCallback:@""];
-		}
-		[callback release];*/
-	}
-}
-
-
-- (void) saveLastUsedTime 
-{
-/*	int now = [[NSDate date] timeIntervalSince1970];
-	rho_conf_setInt("last_time_used",now);
-	rho_conf_save();*/
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-	RAWLOG_INFO("Runner will resign active");
-	[self saveLastUsedTime];
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application {
-    RAWLOG_INFO("Runner will terminate");
-	[self saveLastUsedTime];
-	//Stop HTTP server host 
-    [serverHost stop];
-}
-
-- (void)dealloc {
-    [serverHost release];
-	[webViewController release];
-	[window release];
-	[pickImageDelegate release];
-	[dateTimePickerDelegate release];
-	[tabBarDelegate release];
-	[nativeBar release];
-	[super dealloc];
-}
-
-@end