rhodes 2.2.3 → 2.2.4.beta.1

data/platform/iphone/Classes/TabbedMainView.m

@@ -57,37 +57,52 @@
 @synthesize tabbar, tabbarData, tabindex;
 
 - (id)initWithMainView:(id<RhoMainView>)v parent:(UIWindow*)p tabs:(NSArray *)items {
+	[SimpleMainView disableHiddenOnStart];
     CGRect frame = [[v view] frame];
     
+	
     tabbar = [[UITabBarController alloc] initWithNibName:nil bundle:nil];
     tabbar.delegate = [Rhodes sharedInstance];
     tabbar.view.frame = frame;
     tabbar.selectedIndex = 0;
+    //tabbar.tabBar.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+    //tabbar.tabBar.autoresizesSubviews = YES;
+	
     
-    CGRect childFrame = frame;
+    CGRect childFrame = [[v view] bounds];
+	childFrame.origin.x = 0;
+	childFrame.origin.y = 0;
     CGRect tbFrame = tabbar.tabBar.frame;
-    childFrame.size.height -= tbFrame.size.height;
-    
-    int count = [items count]/4;
+	UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+	//if ((orientation == UIInterfaceOrientationLandscapeLeft)) {
+		//childFrame.size.width -= tbFrame.size.height;
+    //}
+	//else {
+		childFrame.size.height -= tbFrame.size.height;
+	//}
+    int count = [items count]/5;
     NSMutableArray *views = [NSMutableArray arrayWithCapacity:count];
     NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
     
     NSString *initUrl = nil;
     
     for (int i = 0; i < count; ++i) {
-        int index = i*4 - 1;
+        int index = i*5 - 1;
         NSString *label = [items objectAtIndex:++index];
         NSString *url = [items objectAtIndex:++index];
         NSString *icon = [items objectAtIndex:++index];
         NSString *reload = [items objectAtIndex:++index];
+        NSString *colored_icon = [items objectAtIndex:++index];
         
+		colored_icon = nil;
+		
         if (!initUrl)
             initUrl = url;
         
         if (label && url && icon) {
             RhoTabBarData *td = [[RhoTabBarData alloc] init];
             td.url = url;
-            td.reload = [reload isEqualToString:@"true"];
+			td.reload = [reload isEqualToString:@"true"];
             
             SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:tabbar.view frame:childFrame];
             subController.title = label;
@@ -105,6 +120,8 @@
     tabbar.viewControllers = views;
     tabbar.customizableViewControllers = NO;
     tabbar.view.hidden = NO;
+    tabbar.view.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth;
+    tabbar.view.autoresizesSubviews = YES;
     
     self.tabbarData = tabs;
     [tabs release];

data/platform/iphone/Classes/WebView.m

@@ -32,7 +32,7 @@ static int getIndex(NSValue *value)
     // Workaround:
     // Navigation MUST be done through 'redirect_to' - otherwise WebView does not
     // perform actual url loading from time to time
-	[[Rhodes sharedInstance] hideSplash];
+	//[[Rhodes sharedInstance] hideSplash];
     int index = getIndex(value);
     [[[Rhodes sharedInstance] mainView] navigateRedirect:url tab:index];
 }

data/platform/iphone/Info.plist

@@ -17,7 +17,7 @@
 		<string>icon114.png</string>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.rhomobile.brian</string>
+	<string>com.rhomobile.rhosyncclient</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -27,8 +27,17 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.3</string>
+	<string>2.2.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UILaunchImageFile</key>
+	<string>Default</string>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
 </dict>
 </plist>

data/platform/iphone/rbuild/iphone.rake

@@ -52,9 +52,49 @@ def set_app_icon
   rescue => e
     puts "WARNING!!! Can not change icon: #{e.to_s}"
   end
+end
+
+LOADINGIMAGES = ['loading', 'loading@2x', 'loading-Portrait', 'loading-PortraitUpsideDown', 'loading-Landscape', 'loading-LadscapeLeft', 'loading-LandscapeRight']
 
+def restore_default_images
+  puts "restore_default_images"
+  ipath = $config["build"]["iphonepath"]
+  LOADINGIMAGES.each do |name|
+    defname = name.sub('loading', 'Default')
+    ibak = File.join(ipath, defname + '.bak')
+    imag = File.join(ipath, defname + '.png')
+    rm_f imag
+    next if !File.exists? ibak
+    rm_f imag
+    cp ibak, imag
+    rm_f ibak
+  end
+end
+
+def set_default_images
+  puts "set_default_images"
+  ipath = $config["build"]["iphonepath"]
+  begin
+    LOADINGIMAGES.each do |name|
+      defname = name.sub('loading', 'Default')
+      ibak = File.join(ipath, defname + '.bak')
+      imag = File.join(ipath, defname + '.png')
+      appimage = File.join($app_path, 'app', name + '.png')
+      if File.exists? imag
+        cp imag, ibak unless File.exists? ibak
+      end
+      #bundlei = File.join($srcdir, defname + '.png')
+      #cp appimage, bundlei unless !File.exist? appimage
+      cp appimage, imag unless !File.exists? appimage
+    end
+  rescue => e
+    puts "WARNING!!! Can not change default image: #{e.to_s}"
+  end
 end
 
+
+
+
 def set_signing_identity(identity,profile,entitlements)
   fname = $config["build"]["iphonepath"] + "/rhorunner.xcodeproj/project.pbxproj"
   buf = ""
@@ -229,6 +269,7 @@ namespace "build" do
   
       set_app_name($app_config["name"]) unless $app_config["name"].nil?
       set_app_icon
+      set_default_images
 
       set_signing_identity($signidentity,$provisionprofile,$entitlements.to_s) if $signidentity.to_s != ""
 
@@ -239,7 +280,9 @@ namespace "build" do
       ret = $?
 
       chdir $startdir
+      
       set_app_name("Rhodes") unless $app_config["name"].nil?
+      restore_default_images
       restore_app_icon
 
       unless ret == 0
@@ -394,7 +437,7 @@ namespace "run" do
      elements << e
 
      File.open(xmlplist, 'w') do |f|
-       f.puts "<?xml version=\"1.0\" encoding=\"UTF-8'\"?>"
+       f.puts "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
        f.puts "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">"
        f.puts "<plist version=\"1.0\">"
        f.puts "<dict>"
@@ -502,6 +545,10 @@ namespace "clean" do
   namespace "iphone" do
 #    desc "Clean rhodes binaries"
     task :rhodes => ["config:iphone"] do 
+
+      app_path = File.join($app_path, 'bin', 'target', 'iOS')
+      rm_rf app_path
+
       chdir $config["build"]["iphonepath"]
     
       args = ['clean', '-target', 'rhorunner', '-configuration', $configuration, '-sdk', $sdk]
@@ -538,7 +585,7 @@ namespace "clean" do
         end
       end
     end
-    
+
 #    desc "Clean rhobundle"
     task :rhobundle => ["config:iphone"] do
       rm_rf $bindir
@@ -548,10 +595,40 @@ namespace "clean" do
   end
 end
 
+
+
+
 namespace "device" do
   namespace "iphone" do
     desc "Builds and signs iphone for production"
-    task :production => ["config:iphone", "build:iphone:rhodes"]
+    task :production => ["config:iphone", "build:iphone:rhodes"] do
+    
+    #copy build results to app folder
+    
+    app_path = File.join($app_path, 'bin', 'target', 'iOS', $sdk)
+    
+    iphone_path = $config["build"]["iphonepath"]    
+    if $sdk =~ /iphonesimulator/
+       iphone_path = File.join(iphone_path, 'build', $configuration+'-iphonesimulator')
+    else 
+       iphone_path = File.join(iphone_path, 'build', $configuration+'-iphoneos')
+    end
+    appname = $app_config["name"]
+    if appname == nil
+       appname = 'rhorunner'
+    end
+    src_file = File.join(iphone_path, 'rhorunner.app')
+    dst_file = File.join(app_path, appname+'.app')
+    
+    rm_rf dst_file
+    rm_rf app_path
+
+    mkdir_p app_path
+
+    puts 'copy result build package to application target folder ...'    
+    cp_r src_file, dst_file 
+
+    end
   end
 
 end

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

@@ -71,6 +71,10 @@
 		FA291E9811FF2EF70096AC39 /* SignatureDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9511FF2EF70096AC39 /* SignatureDelegate.m */; };
 		FA291E9911FF2EF70096AC39 /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA291E9711FF2EF70096AC39 /* SignatureViewController.m */; };
 		FA4981B511FFC53C00488CB2 /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = FA4981B411FFC53C00488CB2 /* SignatureView.m */; };
+		FACA4C781270AC0900777CFF /* LeftViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C711270AC0900777CFF /* LeftViewController.m */; };
+		FACA4C791270AC0900777CFF /* RightViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C731270AC0900777CFF /* RightViewController.m */; };
+		FACA4C7A1270AC0900777CFF /* SplittedMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C751270AC0900777CFF /* SplittedMainView.m */; };
+		FACA4C7B1270AC0900777CFF /* SplitViewDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FACA4C771270AC0900777CFF /* SplitViewDelegate.m */; };
 		FACC20CA123A60F40088A447 /* Bluetooth.m in Sources */ = {isa = PBXBuildFile; fileRef = FACC20C9123A60F40088A447 /* Bluetooth.m */; };
 		FACC2100123A759A0088A447 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FACC20FF123A759A0088A447 /* GameKit.framework */; };
 		FAD45E8E122566CB00141873 /* RhoNativeViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FAD45E8D122566CB00141873 /* RhoNativeViewManager.mm */; };
@@ -249,6 +253,14 @@
 		FA291E9711FF2EF70096AC39 /* SignatureViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureViewController.m; path = Signature/SignatureViewController.m; sourceTree = "<group>"; };
 		FA4981B311FFC53C00488CB2 /* SignatureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureView.h; path = Signature/SignatureView.h; sourceTree = "<group>"; };
 		FA4981B411FFC53C00488CB2 /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureView.m; path = Signature/SignatureView.m; sourceTree = "<group>"; };
+		FACA4C701270AC0900777CFF /* LeftViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LeftViewController.h; path = SplitView/LeftViewController.h; sourceTree = "<group>"; };
+		FACA4C711270AC0900777CFF /* LeftViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LeftViewController.m; path = SplitView/LeftViewController.m; sourceTree = "<group>"; };
+		FACA4C721270AC0900777CFF /* RightViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RightViewController.h; path = SplitView/RightViewController.h; sourceTree = "<group>"; };
+		FACA4C731270AC0900777CFF /* RightViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RightViewController.m; path = SplitView/RightViewController.m; sourceTree = "<group>"; };
+		FACA4C741270AC0900777CFF /* SplittedMainView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplittedMainView.h; path = SplitView/SplittedMainView.h; sourceTree = "<group>"; };
+		FACA4C751270AC0900777CFF /* SplittedMainView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SplittedMainView.m; path = SplitView/SplittedMainView.m; sourceTree = "<group>"; };
+		FACA4C761270AC0900777CFF /* SplitViewDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SplitViewDelegate.h; path = SplitView/SplitViewDelegate.h; sourceTree = "<group>"; };
+		FACA4C771270AC0900777CFF /* SplitViewDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SplitViewDelegate.m; path = SplitView/SplitViewDelegate.m; sourceTree = "<group>"; };
 		FACC20C8123A60F40088A447 /* Bluetooth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bluetooth.h; path = Bluetooth/Bluetooth.h; sourceTree = "<group>"; };
 		FACC20C9123A60F40088A447 /* Bluetooth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Bluetooth.m; path = Bluetooth/Bluetooth.m; sourceTree = "<group>"; };
 		FACC20FF123A759A0088A447 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -508,6 +520,7 @@
 		BDB3735D11441FE0006EA6DA /* MainView */ = {
 			isa = PBXGroup;
 			children = (
+				FACA4C6E1270ABCD00777CFF /* SplitView */,
 				BDB37363114420DE006EA6DA /* RhoMainView.h */,
 				BDB373641144220F006EA6DA /* SimpleMainView.h */,
 				BDB373651144220F006EA6DA /* SimpleMainView.m */,
@@ -628,6 +641,21 @@
 			name = Signature;
 			sourceTree = "<group>";
 		};
+		FACA4C6E1270ABCD00777CFF /* SplitView */ = {
+			isa = PBXGroup;
+			children = (
+				FACA4C701270AC0900777CFF /* LeftViewController.h */,
+				FACA4C711270AC0900777CFF /* LeftViewController.m */,
+				FACA4C721270AC0900777CFF /* RightViewController.h */,
+				FACA4C731270AC0900777CFF /* RightViewController.m */,
+				FACA4C741270AC0900777CFF /* SplittedMainView.h */,
+				FACA4C751270AC0900777CFF /* SplittedMainView.m */,
+				FACA4C761270AC0900777CFF /* SplitViewDelegate.h */,
+				FACA4C771270AC0900777CFF /* SplitViewDelegate.m */,
+			);
+			name = SplitView;
+			sourceTree = "<group>";
+		};
 		FACC20C4123A60800088A447 /* Bluetooth */ = {
 			isa = PBXGroup;
 			children = (
@@ -646,6 +674,7 @@
 			buildPhases = (
 				5C0442920EFBE79D0014E5C6 /* Create RhoBundle */,
 				BD4D7DCE10AE2DA4003DCE59 /* Copy RhoBundle */,
+				FA4207711277930A00BDE415 /* Copy Loading images */,
 				BDFBD98F10B1B98100BAAFAB /* Resources */,
 				5C61F2BD1022321A0013E321 /* Move alerts to root of app */,
 				1D60588E0D05DD3D006BFB54 /* Sources */,
@@ -824,6 +853,20 @@
 			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}";
 		};
+		FA4207711277930A00BDE415 /* Copy Loading images */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Loading images";
+			outputPaths = (
+			);
+			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";
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -869,6 +912,10 @@
 				BD6A622A123E46BB0093E03C /* RhoViewController.m in Sources */,
 				FACC20CA123A60F40088A447 /* Bluetooth.m in Sources */,
 				BD486F59124FB66600F8A93F /* Event.m in Sources */,
+				FACA4C781270AC0900777CFF /* LeftViewController.m in Sources */,
+				FACA4C791270AC0900777CFF /* RightViewController.m in Sources */,
+				FACA4C7A1270AC0900777CFF /* SplittedMainView.m in Sources */,
+				FACA4C7B1270AC0900777CFF /* SplitViewDelegate.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -928,7 +975,7 @@
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphonesimulator4.0;
+				SDKROOT = iphoneos4.1;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
@@ -960,7 +1007,7 @@
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos4.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
@@ -1019,7 +1066,7 @@
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PRODUCT_NAME = rhorunner;
-				SDKROOT = iphoneos4.0;
+				SDKROOT = iphoneos4.1;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/ruby/iphone ../shared/ruby/include ../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};

data/platform/shared/common/RhoConf.cpp

@@ -44,11 +44,11 @@ void RhoSettings::loadFromString(const char* szSettings)
         int len = 0;
 
         const char* end = strchr(start,'\n');
-        if (end){
-            if ( end > start && *(end-1) == '\r' )
-                len = end-start-1;
-            else
-                len = end-start;
+        if (end)
+        {
+            len = end-start;
+            while(start[len-1] == '\r' && len > 0 )
+                len--;
         }else {
             len = (int)strlen(start);
         }

data/platform/shared/db/DBAdapter.cpp

@@ -1,5 +1,6 @@
 #include "DBAdapter.h"
 #include "sync/SyncThread.h"
+#include "sync/SyncEngine.h"
 
 #include "common/RhoFile.h"
 #include "common/RhoFilePath.h"
@@ -141,6 +142,28 @@ void CDBAdapter::open (String strDbPath, String strVer, boolean bTemp)
     sqlite3_busy_handler(m_dbHandle, onDBBusy, 0 );
 
     getAttrMgr().load(*this);
+
+    //copy client_info table
+    if ( !bTemp && !bExist && CRhoFile::isFileExist((strDbPath+"_oldver").c_str()) )
+    {
+        LOG(INFO) + "Copy client_info table from old database";
+        CDBAdapter db(m_strDbPartition.c_str(), true);
+        db.open( strDbPath+"_oldver", m_strDbVer, true );
+        copyTable( "client_info", db, *this );
+        {
+            DBResult( res, executeSQL( "SELECT client_id FROM client_info" ));
+            if ( !res.isEnd() &&  res.getStringByIdx(0).length() > 0 )
+            {
+                LOG(INFO) + "Set reset=1 in client_info";
+                executeSQL( "UPDATE client_info SET reset=1" );
+            }
+        }
+        db.close();
+
+        CRhoFile::deleteFile( (m_strDbPath+"_oldver").c_str());
+        CRhoFile::deleteFile( (m_strDbPath+"_oldver-journal").c_str());
+    }
+
 }
 
 boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer, const String& strAppDBVer )
@@ -153,6 +176,14 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
         return true;
     }
 
+    if ( (dbVer.m_strRhoVer.find("2.0") == 0||dbVer.m_strRhoVer.find("2.1") == 0||dbVer.m_strRhoVer.find("2.2") == 0)&& 
+         (strRhoDBVer.find("2.0")==0||strRhoDBVer.find("2.1")==0||strRhoDBVer.find("2.2")==0) )
+    {
+        LOG(INFO) + "No migration required from " + dbVer.m_strRhoVer + " to " + strRhoDBVer;
+        writeDBVersion( CDBVersion(strRhoDBVer, strAppDBVer) );
+        return true;
+    }
+
     //1.2.x -> 1.5.x,1.4.x
     if ( (dbVer.m_strRhoVer.find("1.2") == 0)&& (strRhoDBVer.find("1.5")==0||strRhoDBVer.find("1.4")==0) )
     {
@@ -189,7 +220,6 @@ boolean CDBAdapter::migrateDB(const CDBVersion& dbVer, const String& strRhoDBVer
         return true;
     }
 
-
     return false;
 }
 
@@ -220,8 +250,11 @@ void CDBAdapter::checkDBVersion(String& strRhoDBVer)
 	{
         LOG(INFO) + "Reset database because version is changed.";
 
-        CRhoFile::deleteFile(m_strDbPath.c_str());
-        CRhoFile::deleteFile((m_strDbPath+"-journal").c_str());
+        CRhoFile::deleteFile( (m_strDbPath+"_oldver").c_str());
+        CRhoFile::deleteFile( (m_strDbPath+"_oldver-journal").c_str());
+
+        CRhoFile::renameFile( m_strDbPath.c_str(), (m_strDbPath+"_oldver").c_str());
+        CRhoFile::renameFile((m_strDbPath+"-journal").c_str(), (m_strDbPath+"_oldver-journal").c_str());
 
         CRhoFile::deleteFilesInFolder(RHODESAPPBASE().getBlobsDirPath().c_str());
 
@@ -412,6 +445,41 @@ void CDBAdapter::copyTable(String tableName, CDBAdapter& dbFrom, CDBAdapter& dbT
     }
 }
 
+void CDBAdapter::copyChangedValues(CDBAdapter& db)
+{
+    copyTable("changed_values", *this, db );
+    {
+        Vector<int> arOldSrcs;
+        {
+            DBResult( resSrc , db.executeSQL( "SELECT DISTINCT(source_id) FROM changed_values" ) );
+            for ( ; !resSrc.isEnd(); resSrc.next() )
+                arOldSrcs.addElement( resSrc.getIntByIdx(0) );
+        }
+        for( int i = 0; i < arOldSrcs.size(); i++)
+        {
+            int nOldSrcID = arOldSrcs.elementAt(i);
+
+            DBResult( res, executeSQL("SELECT name from sources WHERE source_id=?", nOldSrcID) );
+            if ( !res.isEnd() )
+            {
+                String strSrcName = res.getStringByIdx(0);
+
+                DBResult( res2, db.executeSQL("SELECT source_id from sources WHERE name=?", strSrcName) );
+                if ( !res2.isEnd() )
+                {
+                    if ( nOldSrcID != res2.getIntByIdx(0) )
+                        db.executeSQL("UPDATE changed_values SET source_id=? WHERE source_id=?", res2.getIntByIdx(0), nOldSrcID);
+
+                    continue;
+                }
+            }
+
+            //source not exist in new partition, remove this changes
+            db.executeSQL("DELETE FROM changed_values WHERE source_id=?", nOldSrcID);
+        }
+    }
+}
+
 void CDBAdapter::setBulkSyncDB(String fDataName)
 {
     CDBAdapter db(m_strDbPartition.c_str(), true);
@@ -421,23 +489,33 @@ void CDBAdapter::setBulkSyncDB(String fDataName)
     db.startTransaction();
 
     copyTable("client_info", *this, db );
+    copyChangedValues(db);
 
     //update User partition
     if ( m_strDbPartition.compare(USER_PARTITION_NAME())==0 )
     {
         //copy all NOT user sources from current db to bulk db
+        startTransaction();
         executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
         copyTable("sources", *this, db );
+        rollback();
     }else
     {
         //remove all m_strDbPartition sources from user db
         //copy all sources from bulk db to user db
         CDBAdapter& dbUser  = getDB(USER_PARTITION_NAME());
+        dbUser.startTransaction();
         dbUser.executeSQL("DELETE FROM sources WHERE partition=?", m_strDbPartition);
 
         copyTable("sources", db, dbUser );
+
+        dbUser.endTransaction();
     }
 
+    getDBPartitions().put(m_strDbPartition.c_str(), &db);
+    sync::CSyncThread::getSyncEngine().applyChangedValues(db);
+    getDBPartitions().put(m_strDbPartition.c_str(), this);
+
     db.endTransaction();
     db.close();