rhodes 3.3.3.beta.3 → 3.3.3.beta.4

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -27,6 +27,8 @@ static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
 // This is a singleton class, see below
 static LocationController *sharedLC = nil;
 
+
+/*
 @interface LocationManagerInit : NSObject {}
 + (void)run;
 @end
@@ -36,19 +38,23 @@ static LocationController *sharedLC = nil;
     [[LocationController sharedInstance] initLocationManager];
 }
 @end
-
+*/
 
 @implementation LocationController
 
 @synthesize _locationManager;
-@synthesize onUpdateLocation; 
+//@synthesize onUpdateLocation; 
 
 - (bool)update{
     if (!_locationManager)
         return false;
-	if (!_locationManager.locationServicesEnabled) {
+	if (!_locationManager.locationServicesEnabled)
 		return false;
-	}
+    if (![CLLocationManager locationServicesEnabled])    
+        return false;
+    if (([CLLocationManager authorizationStatus] != kCLAuthorizationStatusAuthorized) && 
+        ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined) ) 
+        return false;
 	if (_timer==NULL) {
 		_timer = CFRunLoopTimerCreate(NULL,
 									  CFAbsoluteTimeGetCurrent() + timeOutInSeconds,
@@ -74,7 +80,7 @@ static LocationController *sharedLC = nil;
 	[self update];
 }
 
-- (void) initLocationManager {
+- (void) initLocationManager:(NSObject*)param {
     int timeout = rho_conf_getInt("geo_location_inactivity_timeout");
     if (timeout == 0)
         timeout = RHO_GEO_LOCATION_INACTIVITY_TIMEOUT;
@@ -87,14 +93,16 @@ static LocationController *sharedLC = nil;
 - (id) init {
 	self = [super init];
 	if (self != nil) {
-		[Rhodes performOnUiThread:[LocationManagerInit class] wait:NO];
-		
-		self.onUpdateLocation = @selector(doUpdateLocation);	
+		//[Rhodes performOnUiThread:[LocationManagerInit class] wait:YES];
+		[self performSelectorOnMainThread:@selector(initLocationManager:) withObject:nil waitUntilDone:YES];
+        
+        
+		//self.onUpdateLocation = @selector(doUpdateLocation);	
 		_dLatitude = 0;
 		_dLongitude = 0;
         _dAccuracy = 0;
 		_bKnownPosition = false;
-		
+		isErrorState = false;
     	RAWLOG_INFO("init");
 		
 	}
@@ -140,7 +148,6 @@ static LocationController *sharedLC = nil;
 	
     if ( bNotify )
         rho_geo_callcallback();
-	
 }
 
 - (double) getLatitude{
@@ -179,8 +186,22 @@ static LocationController *sharedLC = nil;
 
 - (bool) isAvailable{
 	bool res = false;
-	@synchronized(self){
-		res = _locationManager &&_locationManager.locationServicesEnabled;
+
+    //bool service_enabled = false;
+    //bool service_enabled_f = false;
+    //int auth_status = -1;
+	
+    @synchronized(self){
+
+        //if (_locationManager) {
+        //    service_enabled = _locationManager.locationServicesEnabled;
+        //    service_enabled_f = [CLLocationManager locationServicesEnabled];
+        //    auth_status = [CLLocationManager authorizationStatus];
+        //}
+		res =   _locationManager && 
+                _locationManager.locationServicesEnabled && 
+                [CLLocationManager locationServicesEnabled] && 
+                ( ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusAuthorized ) || ([CLLocationManager authorizationStatus] == kCLAuthorizationStatusNotDetermined ) );
 	}
 	return res;
 }
@@ -188,8 +209,20 @@ static LocationController *sharedLC = nil;
 - (void)locationManager:(CLLocationManager *)manager
 	   didFailWithError:(NSError *)error
 {
-	RAWLOG_ERROR("Error reading location");
+/*    
+    if (error != nil) {
+        const char* description = [[error localizedDescription] UTF8String];
+        const char* reason = [[error localizedFailureReason] UTF8String];
+        
+        int o = 0;
+        o = 9;
+    }
+*/    
+    isErrorState = true;
+    _bKnownPosition = false;
+	RAWLOG_ERROR("Error in GeoLocation");
 	rho_geo_callcallback_error();
+    isErrorState = false;
 }
 
 + (LocationController *)sharedInstance {
@@ -232,6 +265,13 @@ static LocationController *sharedLC = nil;
     return self;
 }
 
+- (void) runUpdateInMainThread
+{
+    if (!isErrorState) {
+        [self performSelectorOnMainThread:@selector(doUpdateLocation) withObject:nil waitUntilDone:NO];
+    }
+}
+
 @end
 
 /* static */ void
@@ -244,7 +284,7 @@ void geo_update() {
     if (!rho_rhodesapp_check_mode())
         return;
     LocationController *loc = [LocationController sharedInstance];
-    [loc performSelectorOnMainThread:[loc onUpdateLocation] withObject:nil waitUntilDone:NO];
+    [loc runUpdateInMainThread];
 }
 
 double rho_geo_latitude() {

data/platform/iphone/Classes/RhoMainView.h

@@ -56,4 +56,6 @@
 -(void)closeNativeView:(int)tab_index;
 
 -(void)setTabBarBadge:(NSString*)badge_text tab_index:(int)tab_index;
+
+-(UIViewController*)getMainViewController;
 @end

data/platform/iphone/Classes/Rhodes.m

@@ -349,7 +349,8 @@ static Rhodes *instance = NULL;
                 picker.cameraDevice = UIImagePickerControllerCameraDeviceFront;
             }
             
-            [window addSubview:picker.view];
+            //[window addSubview:picker.view];
+            [[mainView getMainViewController] presentModalViewController:picker animated:NO];
         }
     } @catch(NSException* theException) {
         RAWLOG_ERROR2("startCameraPickerFromViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
@@ -382,9 +383,14 @@ static Rhodes *instance = NULL;
 		rect.origin.y = 0;
 		SignatureViewController* svc = [[SignatureViewController alloc] initWithRect:rect delegate:signatureDelegate];
 		[signatureDelegate setSignatureViewControllerValue:svc];
-		[mainView.view retain];
-		[mainView.view removeFromSuperview];
-		[window addSubview:svc.view];
+        
+        [[mainView getMainViewController] presentModalViewController:svc animated:YES];
+ 
+        
+        
+		//[mainView.view retain];
+		//[mainView.view removeFromSuperview];
+		//[window addSubview:svc.view];
     } @catch(NSException* theException) {
         RAWLOG_ERROR2("startSignatureViewController failed(%s): %s", [[theException name] UTF8String], [[theException reason] UTF8String] );
     }
@@ -567,7 +573,7 @@ static Rhodes *instance = NULL;
         const char *szRootPath = rho_native_rhopath();
         const char *szUserPath = rho_native_rhouserpath();
         NSLog(@"Init logconf");
-        rho_logconf_Init_with_separate_user_path(szRootPath, "", szUserPath);
+        rho_logconf_Init_with_separate_user_path(szRootPath, szRootPath, "", szUserPath);
         NSLog(@"Create rhodes app");
         rho_rhodesapp_create_with_separate_user_path(szRootPath, szUserPath);
         app_created = YES;

data/platform/iphone/Classes/Signature/SignatureDelegate.m

@@ -130,24 +130,25 @@ SignatureDelegate* ourSD = nil;
 } 
 
 -(void)doDone:(UIImage*)image {
-	
+	[[[[Rhodes sharedInstance] mainView] getMainViewController] dismissModalViewControllerAnimated:YES]; 
     [self useImage:image]; 
-    [signatureViewController.view removeFromSuperview];
+    //[signatureViewController.view removeFromSuperview];
     [signatureViewController release];
     signatureViewController = nil;
-	[parentView addSubview:prevView];
-	[prevView release];
-    prevView = nil;
+	//[parentView addSubview:prevView];
+	//[prevView release];
+    //prevView = nil;
 	[image release];
 }
 
 -(void)doCancel {
+	[[[[Rhodes sharedInstance] mainView] getMainViewController] dismissModalViewControllerAnimated:YES]; 
     rho_rhodesapp_callSignatureCallback([postUrl UTF8String], "", "", 1);
-    [signatureViewController.view removeFromSuperview];
+    //[signatureViewController.view removeFromSuperview];
     [signatureViewController release];
     signatureViewController = nil;
-	[parentView addSubview:prevView];
-	[prevView release];
+	//[parentView addSubview:prevView];
+	//[prevView release];
     prevView = nil;
 }
 
@@ -257,11 +258,11 @@ void rho_signature_take(char* callback_url, rho_param* p) {
     if (!image_format)
         image_format = "png";
     if (!penColor)
-        penColor = "0xFF66009A";
+        penColor = "4284874906";
     if (!penWidth)
         penWidth = "3";
     if (!bgColor)
-        bgColor = "0xFFFFFFFF";
+        bgColor = "4294967295";
     
     
     
@@ -330,11 +331,11 @@ void rho_signature_visible(bool b, rho_param* p)
     if (!image_format)
         image_format = "png";
     if (!penColor)
-        penColor = "0xFF66009A";
+        penColor = "4284874906";
     if (!penWidth)
         penWidth = "3";
     if (!bgColor)
-        bgColor = "0xFFFFFFFF";
+        bgColor = "4294967295";
     if (!left)
         left = "0";
     if (!top)

data/platform/iphone/Classes/Signature/SignatureViewController.m

@@ -81,6 +81,7 @@
 		
 	}
 	
+    self.view.autoresizesSubviews = YES;
 	
 	[toolbar sizeToFit];
 	CGRect srect = self.view.frame;
@@ -93,7 +94,7 @@
 	toolbar.frame = trect;
 	toolbar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
 	
-	signatureView = [[SignatureView alloc] initWithFrame:CGRectZero];
+	signatureView = [[SignatureView alloc] initWithFrame:srect];
 	signatureView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 	signatureView.autoresizesSubviews = YES;
 	signatureView.frame = srect;

data/platform/iphone/Classes/SimpleMainView.m

@@ -719,6 +719,9 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	[self restoreWebView];
 }
 
+-(UIViewController*)getMainViewController {
+    return self;
+}
 
 
 - (NSString*)processForNativeView:(NSString*)url {

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

@@ -257,6 +257,9 @@
 }
 
 
+-(UIViewController*)getMainViewController {
+    return self;
+}
 
 
 - (void)switchTab:(int)index {

data/platform/iphone/Classes/TabbedMainView.m

@@ -85,8 +85,14 @@
     int             bitmapByteCount;
     int             bitmapBytesPerRow;
 	
-    size_t pixelsWide = 1;
-    size_t pixelsHigh = height;
+    float scale = 1.0;
+    
+    if (([[UIScreen mainScreen] respondsToSelector:@selector(scale)])) {
+        scale = [UIScreen mainScreen].scale;
+    }
+
+    size_t pixelsWide = 2;
+    size_t pixelsHigh = height*scale;
 	
     bitmapBytesPerRow   = (pixelsWide) << 2;
     bitmapByteCount     = (bitmapBytesPerRow * pixelsHigh);
@@ -94,7 +100,7 @@
     colorSpace = CGColorSpaceCreateDeviceRGB();//CGColorSpaceCreateDeviceGray();//(kCGColorSpaceGenericRGB);
 	
     bitmapData = malloc( bitmapByteCount );
-	
+    
     context = CGBitmapContextCreate (bitmapData,
 									 pixelsWide,
 									 pixelsHigh,
@@ -137,9 +143,9 @@
 	if (color12_b > 1) color12_b = 1;
 	
 	int  y0 =0;
-	int  y1 = ((float)height)*0.5;
-	int  y2 = ((float)height)*0.5;
-	int  y3 = (float)height;
+	int  y1 = ((float)pixelsHigh)*0.5;
+	int  y2 = ((float)pixelsHigh)*0.5;
+	int  y3 = (float)pixelsHigh;
 	
 	rect.origin.x = 0;
 	rect.origin.y = y0;
@@ -184,7 +190,7 @@
 	
 	CGImageRef cgImage = CGBitmapContextCreateImage(context);
 	
-	UIImage* ui = [UIImage imageWithCGImage:cgImage];
+	UIImage* ui = [UIImage imageWithCGImage:cgImage scale:scale orientation:UIImageOrientationUp];
 	
 	CGContextRelease(context);
 	
@@ -203,14 +209,14 @@
 	int cR = (self.bkgColor & 0xFF0000) >> 16;
 	int cG = (self.bkgColor & 0xFF00) >> 8;
 	int cB = (self.bkgColor & 0xFF);
-	
-	UIImage *i = [self makeUIImageWithGradient:(int)frame.size.height colorR:cR colorG:cG colorB:cB];
+    
+	UIImage *i = [self makeUIImageWithGradient:(int)(frame.size.height) colorR:cR colorG:cG colorB:cB];
 	
     UIColor *c = [[UIColor alloc] initWithPatternImage:i];
     v.backgroundColor = c;
 	v.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
     [c release];
-    [[self tabBar] insertSubview:v atIndex:0];
+    [[self tabBar] insertSubview:v atIndex:1];
     [v release];
 	
 }
@@ -269,7 +275,15 @@
     CGPoint itemImagePosition; 
     itemImagePosition.x = ceilf((contextRect.size.width - itemImageSize.width) / 2);
     itemImagePosition.y = ceilf((contextRect.size.height - itemImageSize.height) / 2);
-    UIGraphicsBeginImageContext(contextRect.size);
+    
+    
+    float scale = image.scale;
+    
+    //if (([[UIScreen mainScreen] respondsToSelector:@selector(scale)])) {
+    //    scale = [UIScreen mainScreen].scale;
+    //}
+    
+    UIGraphicsBeginImageContextWithOptions(contextRect.size, NO, scale);
     CGContextRef c = UIGraphicsGetCurrentContext();
 
     CGContextSetShadowWithColor(c, shadowOffset, shadowBlur, cgShadowColor);
@@ -579,6 +593,11 @@
 	[self onSwitchTab];
 }
 
+-(UIViewController*)getMainViewController {
+    return self;
+}
+
+
 - (void)onSwitchTab {
 	int new_index = tabbar.selectedIndex;
     RhoTabBarData *td = [self tabData:new_index];

data/platform/iphone/rbuild/iphone.rake

@@ -801,7 +801,13 @@ namespace "run" do
         
             io.each do |line|
                 puts line
-                $iphone_end_spec = !Jake.process_spec_output(line)
+                
+                if line.class.method_defined? "valid_encoding?" 
+                    $iphone_end_spec = !Jake.process_spec_output(line) if line.valid_encoding?
+                else 
+                    $iphone_end_spec = !Jake.process_spec_output(line)
+                end                    
+               
                 break if $iphone_end_spec
             end
             io.close

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

@@ -70,6 +70,7 @@
 		F5B8FAD40F44EA7B00C9AF85 /* PickImageDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = F5B8FAD30F44EA7B00C9AF85 /* PickImageDelegate.m */; };
 		F5F06668102CB134006CFD39 /* ParamsWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = F5F06667102CB134006CFD39 /* ParamsWrapper.m */; };
 		F5FD0944106151C200B7B8ED /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0943106151C200B7B8ED /* MapViewController.m */; };
+		FA14CECD150130DB00734801 /* DateTimePickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA14CECC150130DB00734801 /* DateTimePickerViewController.m */; };
 		FA291E9811FF2EF70096AC39 /* SignatureDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9511FF2EF70096AC39 /* SignatureDelegate.m */; };
 		FA291E9911FF2EF70096AC39 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9711FF2EF70096AC39 /* SignatureViewController.m */; };
 		FA3C79AE136ED523002302E5 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA3C79AD136ED523002302E5 /* CoreVideo.framework */; };
@@ -265,6 +266,8 @@
 		F5F06667102CB134006CFD39 /* ParamsWrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParamsWrapper.m; sourceTree = "<group>"; };
 		F5FD0942106151C200B7B8ED /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapViewController.h; path = MapView/MapViewController.h; sourceTree = "<group>"; };
 		F5FD0943106151C200B7B8ED /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapViewController.m; path = MapView/MapViewController.m; sourceTree = "<group>"; };
+		FA14CECB150130DB00734801 /* DateTimePickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateTimePickerViewController.h; sourceTree = "<group>"; };
+		FA14CECC150130DB00734801 /* DateTimePickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DateTimePickerViewController.m; sourceTree = "<group>"; };
 		FA291E9411FF2EF70096AC39 /* SignatureDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureDelegate.h; path = Signature/SignatureDelegate.h; sourceTree = "<group>"; };
 		FA291E9511FF2EF70096AC39 /* SignatureDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureDelegate.m; path = Signature/SignatureDelegate.m; sourceTree = "<group>"; };
 		FA291E9611FF2EF70096AC39 /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureViewController.h; path = Signature/SignatureViewController.h; sourceTree = "<group>"; };
@@ -450,6 +453,8 @@
 				46B005F51033690F00D0C2F4 /* DateTime.h */,
 				46B005F61033690F00D0C2F4 /* DateTime.m */,
 				BD97ACA611610666006960F9 /* DateTimePicker.m */,
+				FA14CECB150130DB00734801 /* DateTimePickerViewController.h */,
+				FA14CECC150130DB00734801 /* DateTimePickerViewController.m */,
 			);
 			name = DateTimePicker;
 			sourceTree = "<group>";
@@ -1002,6 +1007,7 @@
 				FA522E8112DEA7B300AB55CC /* RhoNativeViewManager.mm in Sources */,
 				FA52300D12E4BBC700AB55CC /* MapViewManager.m in Sources */,
 				FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */,
+				FA14CECD150130DB00734801 /* DateTimePickerViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

data/platform/shared/RhoConnectClient/RhoConnectClient.cpp

@@ -140,7 +140,7 @@ void rho_connectclient_processmodels(RHOM_MODEL* pModels, int nModels)
 
 void rho_connectclient_init(RHOM_MODEL* pModels, int nModels)
 {
-    rho_logconf_Init(rho_native_rhopath(), "");
+    rho_logconf_Init(rho_native_rhopath(), rho_native_rhopath(), "");
     CRhodesAppBase::Create( rho_native_rhopath(), rho_native_rhopath(), rho_native_rhopath() );
 
     String strDbPath = rho_native_rhopath();

data/platform/shared/common/BundleManager.cpp

@@ -36,12 +36,19 @@ using namespace rho;
 using namespace rho::common;
 extern "C" void rho_sys_app_exit();
 extern "C" void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg);
+extern "C" void rho_sys_impl_before_exit();
 
 #if !defined(OS_WINDOWS) && !defined(OS_WINCE) && !defined(OS_MACOSX)
 void rho_sys_impl_exit_with_errormessage(const char* szTitle, const char* szMsg)
 {
 }
 #endif
+#if !defined(OS_ANDROID)
+extern "C"
+void rho_sys_impl_before_exit()
+{
+}
+#endif
 
 namespace rho {
 namespace common {
@@ -95,8 +102,13 @@ CFileTransaction::CFileTransaction(const String& strFolder) : m_strFolder(strFol
 
 unsigned int CFileTransaction::start()
 {
+    LOG(TRACE) + "FileTransaction is starting: " + m_strFolder;
+    LOG(TRACE) + "Creating folder" + m_strFolder + "_temp_journal";
+
     CRhoFile::createFolder((m_strFolder + "_temp_journal").c_str());
 
+    LOG(TRACE) + "Coping: " + CFilePath::join(m_strFolder, "") + " -> " + m_strFolder + "_temp_journal";
+
     m_nError = CRhoFile::copyFoldersContentToAnotherFolder( CFilePath::join(m_strFolder, "").c_str(), (m_strFolder + "_temp_journal").c_str() );
     if (m_nError)
     {
@@ -104,6 +116,8 @@ unsigned int CFileTransaction::start()
         return m_nError;
     }
 
+    LOG(TRACE) + "Renaming: " + m_strFolder + "_temp_journal" + " -> " + m_strFolder + "_journal";
+
     m_nError = CRhoFile::renameFile( (m_strFolder + "_temp_journal").c_str(), (m_strFolder + "_journal").c_str());
     if (m_nError)
     {
@@ -111,6 +125,8 @@ unsigned int CFileTransaction::start()
         return m_nError;
     }
 
+    LOG(TRACE) + "FileTransaction has started";
+
     return m_nError;
 }
 
@@ -121,8 +137,11 @@ CFileTransaction::~CFileTransaction()
 
 void CFileTransaction::commit()
 {
+    LOG(TRACE) + "FileTransaction is committing: " + m_strFolder;
     String strFolder = m_strFolder;
     
+    LOG(TRACE) + "Renaming: " + strFolder + "_journal" + " -> " + strFolder + "_temp_journal";
+
     m_nError = CRhoFile::renameFile( (strFolder + "_journal").c_str(), (strFolder + "_temp_journal").c_str() );
     if (m_nError)
     {
@@ -131,6 +150,8 @@ void CFileTransaction::commit()
     }
     m_strFolder = "";
 
+    LOG(TRACE) + "Deleting: " + strFolder + "_temp_journal";
+
     m_nError = CRhoFile::deleteFolder( (strFolder + "_temp_journal").c_str() );
     if (m_nError)
     {
@@ -138,15 +159,18 @@ void CFileTransaction::commit()
         return;
     }
 
+    LOG(TRACE) + "FileTransaction has committed";
 }
 
 unsigned int CFileTransaction::rollback()
 {
+    LOG(TRACE) + "FileTransaction is rolling back: " + m_strFolder;
+
     String strFolder = m_strFolder;
     m_strFolder = "";
 
     if ( strFolder.length() == 0 )
-        return 0;                                 
+        return 0;
 
     CRhoFile::deleteFolder( CFilePath(strFolder).changeBaseName("RhoBundle").c_str() );
     CRhoFile::deleteFolder( (strFolder + "_temp_journal").c_str() );
@@ -170,11 +194,15 @@ unsigned int CFileTransaction::rollback()
         return m_nError;
     }
 
+    LOG(TRACE) + "FileTransaction has rolled back";
+
     return m_nError;
 }
 
 unsigned int CReplaceBundleThread::removeFilesByList( const String& strListPath, const String& strSrcFolder )
 {
+	LOG(TRACE) + "Removing files by list: " + strSrcFolder;
+
     unsigned int nError = 0;
     String strList;
     CRhoFile::loadTextFile(strListPath.c_str(), strList);
@@ -194,6 +222,8 @@ unsigned int CReplaceBundleThread::removeFilesByList( const String& strListPath,
 
         if ( strType.compare("file") == 0)
         {
+            LOG(TRACE) + "Deleting file: " + CFilePath::join( strSrcFolder,strPath);
+
             nError = CRhoFile::deleteFile( CFilePath::join( strSrcFolder,strPath).c_str() );
             if (nError != 0)
             {
@@ -208,7 +238,9 @@ unsigned int CReplaceBundleThread::removeFilesByList( const String& strListPath,
 
 unsigned int CReplaceBundleThread::moveFilesByList( const String& strListPath, const String& strSrcFolder, const String& strDestFolder )
 {
-    unsigned int nError = 0;
+	LOG(TRACE) + "Moving files by list: " + strSrcFolder + " -> " + strDestFolder;
+
+	unsigned int nError = 0;
     String strList;
     CRhoFile::loadTextFile(strListPath.c_str(), strList);
 
@@ -229,9 +261,11 @@ unsigned int CReplaceBundleThread::moveFilesByList( const String& strListPath, c
 
         if ( strType.compare("dir") == 0)
         {
+            LOG(TRACE) + "Creating folder: " + strDstPath;
             CRhoFile::createFolder(strDstPath.c_str());
         }else if ( strType.compare("file") == 0)
         {
+            LOG(TRACE) + "Renaming file: " + strSrcPath + " -> " + strDstPath;
             nError = CRhoFile::renameFile( strSrcPath.c_str(), strDstPath.c_str() );
             if (nError != 0)
             {
@@ -295,6 +329,12 @@ void CReplaceBundleThread::doReplaceBundle()
     LOG(INFO) + "STOP";
     oFT.commit();
 
+#ifdef OS_ANDROID
+    //rho_file_patch_stat_table(CFilePath::join(m_bundle_path, "RhoBundle/apps/rhofilelist.txt"))
+    CRhoFile::copyFile(CFilePath::join(m_bundle_path, "RhoBundle/rho.dat").c_str(), RHODESAPP().getRhoRootPath().c_str());
+#endif
+
+
     //Delete bundle folder
     CRhoFile::deleteFolder( m_bundle_path.c_str());
 }