rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -56,6 +56,8 @@
 		5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; };
 		5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */; };
 		5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */; };
+		5CE03CCC12DB7E990058B474 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 5CE03CCA12DB7E990058B474 /* sqlite3.c */; };
+		5CE03CCD12DB7E990058B474 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE03CCB12DB7E990058B474 /* sqlite3.h */; };
 		5CEBCFEF11E6FB8700145F4E /* rhoparams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CEBCFEE11E6FB8700145F4E /* rhoparams.cpp */; };
 		5CECDBB3113FE3620084A75B /* System.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CECDBB2113FE3620084A75B /* System.cpp */; };
 		BD2C950810AE0D4B008D4692 /* PosixThreadImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */; };
@@ -124,6 +126,8 @@
 		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; };
 		5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppMenu.h; path = ../../shared/common/AppMenu.h; sourceTree = SOURCE_ROOT; };
+		5CE03CCA12DB7E990058B474 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = ../../shared/sqlite/sqlite3.c; sourceTree = SOURCE_ROOT; };
+		5CE03CCB12DB7E990058B474 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../../shared/sqlite/sqlite3.h; sourceTree = SOURCE_ROOT; };
 		5CEBCFEE11E6FB8700145F4E /* rhoparams.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rhoparams.cpp; path = ../../shared/common/rhoparams.cpp; sourceTree = SOURCE_ROOT; };
 		5CECDBB2113FE3620084A75B /* System.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = System.cpp; path = ../../shared/rubyext/System.cpp; sourceTree = SOURCE_ROOT; };
 		BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PosixThreadImpl.cpp; path = ../../shared/common/PosixThreadImpl.cpp; sourceTree = SOURCE_ROOT; };
@@ -167,6 +171,7 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				5CE03CC912DB7E670058B474 /* sqlite */,
 				5C59BF4A115B4BA300E96ADE /* unzip */,
 				5C798931113BD10C005F8736 /* rubyext */,
 				5CBD46251087397B00107D0D /* net */,
@@ -292,6 +297,15 @@
 			name = net;
 			sourceTree = "<group>";
 		};
+		5CE03CC912DB7E670058B474 /* sqlite */ = {
+			isa = PBXGroup;
+			children = (
+				5CE03CCA12DB7E990058B474 /* sqlite3.c */,
+				5CE03CCB12DB7E990058B474 /* sqlite3.h */,
+			);
+			name = sqlite;
+			sourceTree = "<group>";
+		};
 		C6A0FF2B0290797F04C91782 /* Documentation */ = {
 			isa = PBXGroup;
 			children = (
@@ -345,6 +359,7 @@
 				5C663BEB11F3712C005F60AF /* RhodesAppBase.h in Headers */,
 				5C2CE255122AEC87005EDBC4 /* RhoAppAdapter.h in Headers */,
 				FA5F58E012ADDA6D00C7613A /* app_build_configs.h in Headers */,
+				5CE03CCD12DB7E990058B474 /* sqlite3.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -375,7 +390,14 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91EF08733DB70010E9CD /* Build configuration list for PBXProject "RhoLib" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 08FB7794FE84155DC02AAC07 /* RhoLib */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -416,6 +438,7 @@
 				5C663BEA11F3712C005F60AF /* RhodesAppBase.cpp in Sources */,
 				5C2CE15C122ACA9E005EDBC4 /* RhoAppAdapter.cpp in Sources */,
 				FA5F58DF12ADDA6D00C7613A /* app_build_configs.c in Sources */,
+				5CE03CCC12DB7E990058B474 /* sqlite3.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -439,7 +462,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphonesimulator3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -459,7 +482,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -520,7 +543,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphoneos3.2;
+				SDKROOT = iphoneos;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};

data/platform/iphone/rbuild/iphone.rake

@@ -284,6 +284,16 @@ namespace "config" do
       end
     end
 
+    if $sdk !~ /iphone/
+      if Rake.application.top_level_tasks.to_s =~ /run/
+        $sdk = "iphonesimulator#{$sdk}"
+      else
+        $sdk = "iphoneos#{$sdk}"
+      end
+    end
+
+    puts $sdk
+    
     if $sdk =~ /iphonesimulator/
       $sdkver = $sdk.gsub(/iphonesimulator/,"")
       $sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" + $sdkver + ".sdk"
@@ -395,11 +405,15 @@ namespace "build" do
 
       saved_name = set_app_name($app_config["name"]) unless $app_config["name"].nil?
       saved_version = set_app_version($app_config["version"]) unless $app_config["version"].nil?
-      saved_identifier = set_app_bundle_identifier($app_config["iphone"]["BundleIdentifier"]) unless $app_config["iphone"]["BundleIdentifier"].nil?
+
+      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+      vendor = $app_config['vendor'] ? $app_config['vendor'] : "rhomobile"
+      bundle_identifier = "com.#{vendor}.#{appname}"
+      bundle_identifier = $app_config["iphone"]["BundleIdentifier"] unless $app_config["iphone"]["BundleIdentifier"].nil?
+      saved_identifier = set_app_bundle_identifier(bundle_identifier)
+      
       saved_url_scheme = set_app_url_scheme($app_config["iphone"]["BundleURLScheme"]) unless $app_config["iphone"]["BundleURLScheme"].nil?
-      saved_url_name = set_app_url_name($app_config["iphone"]["BundleIdentifier"]) unless $app_config["iphone"]["BundleIdentifier"].nil?
- 
-            
+      saved_url_name = set_app_url_name(bundle_identifier)
 
       set_app_icon
       set_default_images
@@ -441,8 +455,88 @@ end
 
 namespace "run" do
   namespace "iphone" do
+
+ 
+
+
+
     task :spec => ["clean:iphone",:buildsim] do
 
+      # Run local http server
+      $iphonespec = true
+      httpserver = false
+      httpserver = true if File.exist? "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server.rb"
+
+      if httpserver
+        require "#{$app_path}/app/spec/library/net/http/http/fixtures/http_server"
+        NetHTTPSpecs.start_server
+      end
+
+      Jake.before_run_spec
+
+      puts 'kill iPhone Simulator'
+      'killall -9  "iPhone Simulator"'
+      'killall -9 iphonesim'
+
+      mkdir_p $tmpdir
+      log_name  =   File.join($tmpdir, 'logout')
+      File.delete(log_name) if File.exist?(log_name)
+
+      Thread.new {
+            # run spec
+            iphonesim = File.join($startdir, 'res/build-tools/iphonesim/build/Release/iphonesim')
+            commandis = iphonesim + ' launch "' + File.join($simrhodes, 'rhorunner.app') + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
+            puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
+            puts 'execute command : ' + commandis
+            system(commandis)  	
+            $iphone_end_spec = true
+     }
+
+        start = Time.now        
+
+        puts "waiting for log"
+      
+        while !File.exist?(log_name)
+            sleep(1)
+        end
+
+        puts "start read log"
+        
+        $iphone_end_spec = false
+
+        while !$iphone_end_spec do
+            io = File.new(log_name, "r")
+        
+            io.each do |line|
+                puts line
+                $iphone_end_spec = !Jake.process_spec_output(line)
+                break if $iphone_end_spec
+            end
+            io.close
+            
+            sleep(5) unless $iphone_end_spec
+        end
+      puts 'spec logging is finished'
+
+      Jake.process_spec_results(start)
+
+      File.delete(log_name) if File.exist?(log_name)
+
+      $stdout.flush
+
+      puts 'kill iPhone Simulator'
+      'killall -9  "iPhone Simulator"'
+      'killall -9 iphonesim'
+
+      $stdout.flush
+
+      NetHTTPSpecs.stop_server if httpserver
+
+      exit $failed.to_i unless $dont_exit_on_failure
+    end
+
+    task :spec_old => ["clean:iphone",:buildsim] do
+
       sdkroot = $devroot + "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" +
                 $sdk.gsub(/iphonesimulator/,"") + ".sdk"
 
@@ -497,6 +591,8 @@ namespace "run" do
       exit $failed.to_i unless $dont_exit_on_failure
     end
 
+
+
     task :phone_spec do
       Jake.run_spec_app('iphone','phone_spec')
     end

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

@@ -119,6 +119,7 @@
 		F5E363080EB7A0DB00226287 /* newline.c in Sources */ = {isa = PBXBuildFile; fileRef = F5E363070EB7A0DB00226287 /* newline.c */; };
 		F5FD0A3D10619E7900B7B8ED /* mapview_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = F5FD0A3C10619E7900B7B8ED /* mapview_wrap.c */; };
 		FA291E8911FF2BF90096AC39 /* signature_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = FA291E8811FF2BF90096AC39 /* signature_wrap.c */; };
+		FA522E5112DEA22800AB55CC /* nativeviewmanager_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = FA522E5012DEA22800AB55CC /* nativeviewmanager_wrap.c */; };
 		FACC2099123A5F300088A447 /* bluetooth_wrap.c in Sources */ = {isa = PBXBuildFile; fileRef = FACC2098123A5F300088A447 /* bluetooth_wrap.c */; };
 /* End PBXBuildFile section */
 
@@ -236,6 +237,7 @@
 		F5E363070EB7A0DB00226287 /* newline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = newline.c; path = ../../shared/ruby/newline.c; sourceTree = SOURCE_ROOT; };
 		F5FD0A3C10619E7900B7B8ED /* mapview_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mapview_wrap.c; path = ../../shared/ruby/ext/mapview/mapview_wrap.c; sourceTree = SOURCE_ROOT; };
 		FA291E8811FF2BF90096AC39 /* signature_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = signature_wrap.c; path = ext/signature/signature_wrap.c; sourceTree = "<group>"; };
+		FA522E5012DEA22800AB55CC /* nativeviewmanager_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nativeviewmanager_wrap.c; path = ext/nativeviewmanager/nativeviewmanager_wrap.c; sourceTree = "<group>"; };
 		FACC2098123A5F300088A447 /* bluetooth_wrap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bluetooth_wrap.c; path = ext/bluetooth/bluetooth_wrap.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -497,6 +499,7 @@
 		F5E360B00EB6A63B00226287 /* ext */ = {
 			isa = PBXGroup;
 			children = (
+				FA522E4F12DEA20200AB55CC /* nativeview */,
 				FACC2097123A5F0B0088A447 /* bluetooth */,
 				BDB09B76124FB14C004B628C /* calendar */,
 				FA291E8011FF2A5F0096AC39 /* signature */,
@@ -615,6 +618,14 @@
 			name = signature;
 			sourceTree = "<group>";
 		};
+		FA522E4F12DEA20200AB55CC /* nativeview */ = {
+			isa = PBXGroup;
+			children = (
+				FA522E5012DEA22800AB55CC /* nativeviewmanager_wrap.c */,
+			);
+			name = nativeview;
+			sourceTree = "<group>";
+		};
 		FACC2097123A5F0B0088A447 /* bluetooth */ = {
 			isa = PBXGroup;
 			children = (
@@ -795,6 +806,7 @@
 				FACC2099123A5F300088A447 /* bluetooth_wrap.c in Sources */,
 				BD807BB01259E25A00A4E4B2 /* calendar_wrap.c in Sources */,
 				BD807BC31259E37900A4E4B2 /* event_wrap.c in Sources */,
+				FA522E5112DEA22800AB55CC /* nativeviewmanager_wrap.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

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

@@ -24,6 +24,8 @@
 		5C0D0A32121D28BF0022E83C /* sslimpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C0D0A30121D28BF0022E83C /* sslimpl.cpp */; };
 		5C0D0C0D121D337A0022E83C /* RhoThreadImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C0D0C0C121D337A0022E83C /* RhoThreadImpl.m */; };
 		5C53337B0FC1B20000F268F0 /* NetRequestImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C5333790FC1B20000F268F0 /* NetRequestImpl.m */; };
+		5C59AB2912DDA1B800ED4A1E /* RhoCryptImpl.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C59AB2812DDA1B800ED4A1E /* RhoCryptImpl.mm */; };
+		5C59AB4212DDA22E00ED4A1E /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C59AB4112DDA22E00ED4A1E /* Security.framework */; };
 		BD38E6DC115CFF14001CE05C /* WebView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD38E6DB115CFF14001CE05C /* WebView.m */; };
 		BD38E755115D1AAC001CE05C /* TabbedMainView.m in Sources */ = {isa = PBXBuildFile; fileRef = BD38E754115D1AAC001CE05C /* TabbedMainView.m */; };
 		BD486F59124FB66600F8A93F /* Event.m in Sources */ = {isa = PBXBuildFile; fileRef = BD486F58124FB66600F8A93F /* Event.m */; };
@@ -71,13 +73,22 @@
 		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 */; };
+		FA522E7F12DEA7B300AB55CC /* NVDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7B12DEA7B300AB55CC /* NVDelegate.m */; };
+		FA522E8012DEA7B300AB55CC /* NVViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7D12DEA7B300AB55CC /* NVViewController.m */; };
+		FA522E8112DEA7B300AB55CC /* RhoNativeViewManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA522E7E12DEA7B300AB55CC /* RhoNativeViewManager.mm */; };
+		FA522FE112E49D6F00AB55CC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA522FE012E49D6F00AB55CC /* QuartzCore.framework */; };
+		FA52300D12E4BBC700AB55CC /* MapViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FA52300C12E4BBC700AB55CC /* MapViewManager.m */; };
+		FA52309412E55CA700AB55CC /* EventKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FA52309312E55CA700AB55CC /* EventKit.framework */; };
+		FA52317A12E7511700AB55CC /* BluePushpin.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317312E7511700AB55CC /* BluePushpin.png */; };
+		FA52317B12E7511700AB55CC /* esri.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317412E7511700AB55CC /* esri.png */; };
+		FA52317C12E7511700AB55CC /* esri@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52317512E7511700AB55CC /* esri@2x.png */; };
+		FA52330112E9204300AB55CC /* BluePushpin@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FA52330012E9204300AB55CC /* BluePushpin@2x.png */; };
 		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 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -179,6 +190,9 @@
 		5C0D0A31121D28BF0022E83C /* sslimpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sslimpl.h; path = ../shared/net/iphone/sslimpl.h; sourceTree = SOURCE_ROOT; };
 		5C0D0C0C121D337A0022E83C /* RhoThreadImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RhoThreadImpl.m; path = ../shared/common/iphone/RhoThreadImpl.m; sourceTree = SOURCE_ROOT; };
 		5C5333790FC1B20000F268F0 /* NetRequestImpl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetRequestImpl.m; path = rho/net/NetRequestImpl.m; sourceTree = "<group>"; };
+		5C59AB2712DDA1B800ED4A1E /* RhoCryptImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoCryptImpl.h; path = ../shared/common/iphone/RhoCryptImpl.h; sourceTree = SOURCE_ROOT; };
+		5C59AB2812DDA1B800ED4A1E /* RhoCryptImpl.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RhoCryptImpl.mm; path = ../shared/common/iphone/RhoCryptImpl.mm; sourceTree = SOURCE_ROOT; };
+		5C59AB4112DDA22E00ED4A1E /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
 		5C7162920F8B7EEC0096B6AA /* RhoLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RhoLib.xcodeproj; path = RhoLib/RhoLib.xcodeproj; sourceTree = "<group>"; };
 		BD2C94A610AE052A008D4692 /* curl.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = curl.xcodeproj; path = curl/curl.xcodeproj; sourceTree = SOURCE_ROOT; };
 		BD38E6DB115CFF14001CE05C /* WebView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebView.m; sourceTree = "<group>"; };
@@ -253,6 +267,20 @@
 		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>"; };
+		FA522E7A12DEA7B300AB55CC /* NVDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NVDelegate.h; path = NativeView/NVDelegate.h; sourceTree = "<group>"; };
+		FA522E7B12DEA7B300AB55CC /* NVDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NVDelegate.m; path = NativeView/NVDelegate.m; sourceTree = "<group>"; };
+		FA522E7D12DEA7B300AB55CC /* NVViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NVViewController.m; path = NativeView/NVViewController.m; sourceTree = "<group>"; };
+		FA522E7E12DEA7B300AB55CC /* RhoNativeViewManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RhoNativeViewManager.mm; path = NativeView/RhoNativeViewManager.mm; sourceTree = "<group>"; };
+		FA522E8212DEA8AE00AB55CC /* RhoNativeViewManagerOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoNativeViewManagerOC.h; path = NativeView/RhoNativeViewManagerOC.h; sourceTree = "<group>"; };
+		FA522E8312DEA8C900AB55CC /* NVViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NVViewController.h; path = NativeView/NVViewController.h; sourceTree = "<group>"; };
+		FA522FE012E49D6F00AB55CC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		FA52300B12E4BBC700AB55CC /* MapViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapViewManager.h; path = MapView/MapViewManager.h; sourceTree = "<group>"; };
+		FA52300C12E4BBC700AB55CC /* MapViewManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapViewManager.m; path = MapView/MapViewManager.m; sourceTree = "<group>"; };
+		FA52309312E55CA700AB55CC /* EventKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = EventKit.framework; path = System/Library/Frameworks/EventKit.framework; sourceTree = SDKROOT; };
+		FA52317312E7511700AB55CC /* BluePushpin.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = BluePushpin.png; path = ESRI/BluePushpin.png; sourceTree = "<group>"; };
+		FA52317412E7511700AB55CC /* esri.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = esri.png; path = ESRI/esri.png; sourceTree = "<group>"; };
+		FA52317512E7511700AB55CC /* esri@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "esri@2x.png"; path = "ESRI/esri@2x.png"; sourceTree = "<group>"; };
+		FA52330012E9204300AB55CC /* BluePushpin@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "BluePushpin@2x.png"; path = "ESRI/BluePushpin@2x.png"; 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>"; };
@@ -264,8 +292,6 @@
 		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; };
-		FAD45E8D122566CB00141873 /* RhoNativeViewManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RhoNativeViewManager.mm; sourceTree = "<group>"; };
-		FAD45EAF122571EE00141873 /* RhoNativeViewManagerOC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RhoNativeViewManagerOC.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -292,6 +318,9 @@
 				46AD7DB31117AFB9009A974A /* MapKit.framework in Frameworks */,
 				46AD7DB71117AFBF009A974A /* CFNetwork.framework in Frameworks */,
 				FACC2100123A759A0088A447 /* GameKit.framework in Frameworks */,
+				5C59AB4212DDA22E00ED4A1E /* Security.framework in Frameworks */,
+				FA522FE112E49D6F00AB55CC /* QuartzCore.framework in Frameworks */,
+				FA52309412E55CA700AB55CC /* EventKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -301,6 +330,7 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				FA522E6C12DEA74F00AB55CC /* NativeView */,
 				BDC6F34611F4ABBF0056C1C3 /* icon57.png */,
 				BDC6F34711F4ABBF0056C1C3 /* icon72.png */,
 				BDC6F34811F4ABBF0056C1C3 /* icon114.png */,
@@ -346,6 +376,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				FA52317212E750F300AB55CC /* Resources */,
 				BDFBD99910B1B9A900BAAFAB /* Settings.bundle */,
 				BDFBD99510B1B99A00BAAFAB /* Entitlements.plist */,
 				BD2C94A610AE052A008D4692 /* curl.xcodeproj */,
@@ -362,6 +393,9 @@
 				46AD7DB21117AFB9009A974A /* MapKit.framework */,
 				46AD7DB61117AFBF009A974A /* CFNetwork.framework */,
 				FACC20FF123A759A0088A447 /* GameKit.framework */,
+				5C59AB4112DDA22E00ED4A1E /* Security.framework */,
+				FA522FE012E49D6F00AB55CC /* QuartzCore.framework */,
+				FA52309312E55CA700AB55CC /* EventKit.framework */,
 			);
 			name = CustomTemplate;
 			sourceTree = "<group>";
@@ -447,6 +481,8 @@
 		5C5335490FC2973900F268F0 /* common */ = {
 			isa = PBXGroup;
 			children = (
+				5C59AB2712DDA1B800ED4A1E /* RhoCryptImpl.h */,
+				5C59AB2812DDA1B800ED4A1E /* RhoCryptImpl.mm */,
 				5C0D0C0C121D337A0022E83C /* RhoThreadImpl.m */,
 				5C0D0A2B121D28A30022E83C /* RhoClassFactory.cpp */,
 				5C0D0A2C121D28A30022E83C /* RhoClassFactory.h */,
@@ -526,8 +562,6 @@
 				BDB373651144220F006EA6DA /* SimpleMainView.m */,
 				BD38E753115D1AAC001CE05C /* TabbedMainView.h */,
 				BD38E754115D1AAC001CE05C /* TabbedMainView.m */,
-				FAD45E8D122566CB00141873 /* RhoNativeViewManager.mm */,
-				FAD45EAF122571EE00141873 /* RhoNativeViewManagerOC.h */,
 			);
 			name = MainView;
 			sourceTree = "<group>";
@@ -535,6 +569,8 @@
 		F5425BCD1060539A000CCA8C /* MapView */ = {
 			isa = PBXGroup;
 			children = (
+				FA52300B12E4BBC700AB55CC /* MapViewManager.h */,
+				FA52300C12E4BBC700AB55CC /* MapViewManager.m */,
 				F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */,
 				F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */,
 				F5FD0942106151C200B7B8ED /* MapViewController.h */,
@@ -641,6 +677,30 @@
 			name = Signature;
 			sourceTree = "<group>";
 		};
+		FA522E6C12DEA74F00AB55CC /* NativeView */ = {
+			isa = PBXGroup;
+			children = (
+				FA522E8312DEA8C900AB55CC /* NVViewController.h */,
+				FA522E8212DEA8AE00AB55CC /* RhoNativeViewManagerOC.h */,
+				FA522E7A12DEA7B300AB55CC /* NVDelegate.h */,
+				FA522E7B12DEA7B300AB55CC /* NVDelegate.m */,
+				FA522E7D12DEA7B300AB55CC /* NVViewController.m */,
+				FA522E7E12DEA7B300AB55CC /* RhoNativeViewManager.mm */,
+			);
+			name = NativeView;
+			sourceTree = "<group>";
+		};
+		FA52317212E750F300AB55CC /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				FA52330012E9204300AB55CC /* BluePushpin@2x.png */,
+				FA52317312E7511700AB55CC /* BluePushpin.png */,
+				FA52317412E7511700AB55CC /* esri.png */,
+				FA52317512E7511700AB55CC /* esri@2x.png */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 		FACA4C6E1270ABCD00777CFF /* SplitView */ = {
 			isa = PBXGroup;
 			children = (
@@ -794,6 +854,10 @@
 				BDC6F34911F4ABBF0056C1C3 /* icon57.png in Resources */,
 				BDC6F34A11F4ABBF0056C1C3 /* icon72.png in Resources */,
 				BDC6F34B11F4ABBF0056C1C3 /* icon114.png in Resources */,
+				FA52317A12E7511700AB55CC /* BluePushpin.png in Resources */,
+				FA52317B12E7511700AB55CC /* esri.png in Resources */,
+				FA52317C12E7511700AB55CC /* esri@2x.png in Resources */,
+				FA52330112E9204300AB55CC /* BluePushpin@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -908,7 +972,6 @@
 				5C0D0A2F121D28A30022E83C /* RhoFileImpl.m in Sources */,
 				5C0D0A32121D28BF0022E83C /* sslimpl.cpp in Sources */,
 				5C0D0C0D121D337A0022E83C /* RhoThreadImpl.m in Sources */,
-				FAD45E8E122566CB00141873 /* RhoNativeViewManager.mm in Sources */,
 				BD6A622A123E46BB0093E03C /* RhoViewController.m in Sources */,
 				FACC20CA123A60F40088A447 /* Bluetooth.m in Sources */,
 				BD486F59124FB66600F8A93F /* Event.m in Sources */,
@@ -916,6 +979,11 @@
 				FACA4C791270AC0900777CFF /* RightViewController.m in Sources */,
 				FACA4C7A1270AC0900777CFF /* SplittedMainView.m in Sources */,
 				FACA4C7B1270AC0900777CFF /* SplitViewDelegate.m in Sources */,
+				5C59AB2912DDA1B800ED4A1E /* RhoCryptImpl.mm in Sources */,
+				FA522E7F12DEA7B300AB55CC /* NVDelegate.m in Sources */,
+				FA522E8012DEA7B300AB55CC /* NVViewController.m in Sources */,
+				FA522E8112DEA7B300AB55CC /* RhoNativeViewManager.mm in Sources */,
+				FA52300D12E4BBC700AB55CC /* MapViewManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1025,17 +1093,29 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = (
+					"-all_load",
+					"-ObjC",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = (
+					"-ObjC",
+					"-all_load",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos3.2;
@@ -1088,17 +1168,29 @@
 				IBC_FLATTEN_NIBS = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = (
+					"-all_load",
+					"-ObjC",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = (
+					"-ObjC",
+					"-all_load",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
@@ -1120,17 +1212,29 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphoneos3.2][arch=*]" = (
+					"-all_load",
+					"-ObjC",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				"OTHER_LDFLAGS[sdk=iphonesimulator*][arch=*]" = (
+					"-ObjC",
+					"-all_load",
 					"$(EXTENSIONS_LDFLAGS)",
 					"-weak_framework",
 					EventKit,
 				);
-				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = "$(EXTENSIONS_LDFLAGS)";
+				"OTHER_LDFLAGS[sdk=iphonesimulator3.2][arch=*]" = (
+					"-ObjC",
+					"-all_load",
+					"$(EXTENSIONS_LDFLAGS)",
+				);
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
 				SDKROOT = iphoneos3.2;

data/platform/shared/SyncClient/SyncClient.cpp

@@ -129,19 +129,32 @@ void rho_syncclient_init(RHOM_MODEL* pModels, int nModels)
 void rho_syncclient_database_full_reset_and_logout()
 {
     rho_sync_logout();
-
+	rho_syncclient_database_full_reset();
+}
+	
+void rho_syncclient_database_full_reset()
+{
     db::CDBAdapter& oUserDB = db::CDBAdapter::getUserDB();
     oUserDB.executeSQL("UPDATE client_info SET reset=1");
 
     if ( rho_conf_is_property_exists("bulksync_state") )
         rho_conf_setInt("bulksync_state", 0 );
 
-    oUserDB.executeSQL("UPDATE sources SET token=0");
+    //oUserDB.executeSQL("UPDATE sources SET token=0");
 
     Vector<String> arExclude;
     arExclude.addElement("sources");
     arExclude.addElement("client_info");
-    db::CDBAdapter::destroy_tables_allpartitions(Vector<String>(), arExclude);
+
+    Vector<String> arPartNames = db::CDBAdapter::getDBAllPartitionNames();
+    for( int i = 0; i < (int)arPartNames.size(); i++ )
+    {
+        db::CDBAdapter& dbPart = db::CDBAdapter::getDB(arPartNames.elementAt(i).c_str());
+
+        dbPart.executeSQL("UPDATE sources SET token=0");
+        dbPart.destroy_tables(Vector<String>(), arExclude);
+        //db::CDBAdapter::destroy_tables_allpartitions(Vector<String>(), arExclude);
+    }
 
     //TODO: scema_sources
     //hash_migrate = {}
@@ -833,6 +846,11 @@ namespace rho {
 	{
 		return "1.0";
 	}
+	
+	/*static*/ void _CRhoAppAdapter::resetDBOnSyncUserChanged()
+	{
+		rho_syncclient_database_full_reset();
+	}	
 }
 
 extern "C" 
@@ -856,5 +874,13 @@ void rho_net_impl_network_indicator(int active)
 {
 //	[UIApplication sharedApplication].networkActivityIndicatorVisible = active ? YES : NO;
 }
+
+	void alert_show_status(const char* szTitle, const char* szMessage, const char* szHide)
+	{
+	}
 	
+	const char* get_app_build_config_item(const char* key) 
+	{
+		return 0;
+	}	
 }

data/platform/shared/SyncClient/SyncClient.h

@@ -39,7 +39,8 @@ void rho_syncclient_initmodel(RHOM_MODEL* model);
 void rho_syncclient_init(RHOM_MODEL* pModels, int nModels);
 void rho_syncclient_destroy();
 void rho_syncclient_database_full_reset_and_logout();
-
+void rho_syncclient_database_full_reset();
+	
 void rho_syncclient_parsenotify(const char* msg, RHO_SYNC_NOTIFY* pNotify);
 void rho_syncclient_free_syncnotify(RHO_SYNC_NOTIFY* pNotify);
 

data/platform/shared/common/IRhoClassFactory.h

@@ -14,6 +14,7 @@ struct ICallbackObject
 
 namespace common {
 struct IRhoThreadImpl;
+struct IRhoCrypt;
 
 struct IRhoClassFactory
 {
@@ -22,6 +23,8 @@ struct IRhoClassFactory
     virtual net::INetRequest* createNetRequest() = 0;
     virtual IRhoThreadImpl* createThreadImpl() = 0;
     virtual net::ISSL* createSSLEngine() = 0;
+
+    virtual IRhoCrypt* createRhoCrypt() = 0;
 };
 
 IRhoClassFactory* rho_impl_createClassFactory();