rhodes 3.3.3.beta.4 → 3.3.3

data/platform/iphone/Classes/NativeView/NVViewController.m

@@ -46,7 +46,7 @@
 	nvDelegate = delegate;
 	self.view.frame = rect;
 
-	self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
 	self.view.autoresizesSubviews = YES;
 	
 	
@@ -54,7 +54,7 @@
 	srect.origin.y = 0;
 	
 	nvView = nvview;
-	nvView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+	nvView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin;
 	nvView.autoresizesSubviews = YES;
 	nvView.frame = srect;
 	
@@ -92,12 +92,44 @@
 	[signatureView setNeedsDisplay];
 }
  */
+- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {
+    UIViewController* ctrl = [self findViewController:nvView];
+    if (ctrl != nil) {
+        [ctrl willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
+    }
+}
+
+- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
+    UIViewController* ctrl = [self findViewController:nvView];
+    if (ctrl != nil) {
+        [ctrl didRotateFromInterfaceOrientation:fromInterfaceOrientation];
+    }
+}
+
 
 - (void)viewDidUnload {
 	// Release any retained subviews of the main view.
 	// e.g. self.myOutlet = nil;
 }
 
+
+- (UIViewController *)findViewController:(UIView*)view {
+    UIResponder *responder = view;
+    while (![responder isKindOfClass:[UIViewController class]]) {
+        responder = [responder nextResponder];
+        if (responder == self) {
+            return nil;
+        }
+        if (nil == responder) {
+            break;
+        }
+    }
+    if (responder == self) {
+        return nil;
+    }
+    return (UIViewController *)responder;
+}
+
 - (void)dealloc {
 	[nvView removeFromSuperview];
     [super dealloc];

data/platform/iphone/Classes/Rhodes.m

@@ -40,6 +40,8 @@
 
 #include "common/app_build_capabilities.h"
 
+#include "InitMemoryInfoCollector.h"
+
 
 
 /*
@@ -427,10 +429,11 @@ static Rhodes *instance = NULL;
 }
 
 
-- (void)choosePicture:(NSString*) url {
+- (void)choosePicture:(RhoCameraSettings*) settings {
     if (!rho_rhodesapp_check_mode())
         return;
-    [pickImageDelegate setPostUrl:url];
+    [pickImageDelegate setPostUrl:settings.callback_url];
+    pickImageDelegate.settings = settings;
     [self startCameraPicker:pickImageDelegate 
                  sourceType:UIImagePickerControllerSourceTypePhotoLibrary];
 }
@@ -574,6 +577,7 @@ static Rhodes *instance = NULL;
         const char *szUserPath = rho_native_rhouserpath();
         NSLog(@"Init logconf");
         rho_logconf_Init_with_separate_user_path(szRootPath, szRootPath, "", szUserPath);
+        InitMemoryInfoCollector();
         NSLog(@"Create rhodes app");
         rho_rhodesapp_create_with_separate_user_path(szRootPath, szUserPath);
         app_created = YES;
@@ -934,6 +938,22 @@ static Rhodes *instance = NULL;
         */
         //exit(EXIT_SUCCESS);
     }
+    if (!rho_can_app_started_with_current_licence()) {
+		NSLog(@"############################");
+		NSLog(@" ");
+		NSLog(@"ERROR: motorola_license is INVALID !");
+		NSLog(@" ");
+		NSLog(@"############################");
+        //exit(EXIT_SUCCESS);
+        //[self exit_with_errormessage:@"Motorola Licence" message:@"Your licence key is invalid !"];
+            UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Motorola License" 
+                                                            message:@"Please provide RhoElements license key."
+                                                           delegate:nil 
+                                                  cancelButtonTitle:@"OK" 
+                                                  otherButtonTitles: nil];
+            [alert show];
+            [alert release];
+    }
 	
 	return NO;
 }

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

@@ -28,6 +28,7 @@
 #import "SignatureDelegate.h"
 #import "AppManager.h"
 #import "common/RhodesApp.h"
+#import "logging/RhoLog.h"
 #include "ruby/ext/rho/rhoruby.h"
 
 SignatureDelegate* ourSD = nil;
@@ -284,6 +285,13 @@ void rho_signature_take(char* callback_url, rho_param* p) {
 
 void rho_signature_visible(bool b, rho_param* p)
 {
+    // check for RhoElements :
+    if (!rho_is_rho_elements_extension_can_be_used()) {
+        RAWLOG_ERROR("Rho::SignatureCapture.visible() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
+        return;
+    }
+    
+    
     if (!b) {
         SignatureDelegate* deleg = [SignatureDelegate getSharedInstance]; 
         [deleg hideSignatureInlineView]; 
@@ -374,6 +382,12 @@ void rho_signature_visible(bool b, rho_param* p)
 
 void rho_signature_capture(const char* callback_url) 
 {
+    // check for RhoElements :
+    if (!rho_is_rho_elements_extension_can_be_used()) {
+        RAWLOG_ERROR("Rho::SignatureCapture.capture() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
+        return;
+    }
+    
 	SignatureDelegate* deleg = [SignatureDelegate getSharedInstance]; 
     
     [deleg setPostUrl:[NSString stringWithUTF8String:callback_url]];
@@ -383,6 +397,11 @@ void rho_signature_capture(const char* callback_url)
 
 void rho_signature_clear() 
 {
+    // check for RhoElements :
+    if (!rho_is_rho_elements_extension_can_be_used()) {
+        RAWLOG_ERROR("Rho::SignatureCapture.clear() is unavailable without RhoElements ! For more information go to http://www.motorolasolutions.com/rhoelements");
+        return;
+    }
 	SignatureDelegate* deleg = [SignatureDelegate getSharedInstance]; 
     [deleg clearSignatureInlineView];
     

data/platform/iphone/Classes/SimpleMainView.m

@@ -640,11 +640,11 @@ static BOOL makeHiddenUntilLoadContent = YES;
 	self.webView.backgroundColor = bc;
 	self.view.backgroundColor = bc;
 	
-	NSString* data = [NSString stringWithFormat:@"<body bgcolor=\"#%6$X\"></body>", bkg_color]; 
-	
+	NSString* datas = [NSString stringWithFormat:@"<body bgcolor=\"#%6X\"></body>", bkg_color]; 
+	    
 	self.webView.hidden = YES;
 	
-	[self loadHTMLString:data];
+	[self loadHTMLString:datas];
 }
 
 

data/platform/iphone/rbuild/iphone.rake

@@ -204,9 +204,16 @@ def prepare_production_ipa (app_path, app_name)
   payload_dir = File.join(tmp_dir, "Payload")  
   mkdir_p payload_dir
   app_file = File.join(app_path, app_name + ".app")
-  app_in_payload = File.join(payload_dir,  app_name + ".app") 
+  app_in_payload = File.join(payload_dir,  app_name + ".app")
+
+  mprovision_in_app = File.join(app_file,  "embedded.mobileprovision") 
+  mprovision_in_payload = File.join(payload_dir,  app_name + ".mobileprovision") 
+  
   cp_r app_file, app_in_payload
   
+  cp mprovision_in_app, mprovision_in_payload
+  
+  
   itunes_artwork = File.join($config["build"]["iphonepath"], "iTunesArtwork.jpg")
   itunes_artwork_dst = File.join(tmp_dir, "iTunesArtwork")
   
@@ -634,10 +641,36 @@ namespace "build" do
       $app_config["extensions"].each do |ext|
         $app_config["extpaths"].each do |p|
           extpath = File.join(p, ext, 'ext')
-          next unless File.executable? File.join(extpath, 'build')
-
-          puts Jake.run('./build', [], extpath)
-          exit 1 unless $? == 0
+          build_script = File.join(extpath, 'build')
+          
+          # modify executable attribute
+          if File.exists? build_script
+              if !File.executable? build_script
+                   #puts 'change executable attribute for build script in extension : '+build_script
+                   begin
+                       #File.chmod 0700, build_script
+                       #puts 'executable attribute was writed for : '+build_script
+                   rescue Exception => e
+                       puts 'ERROR: can not change attribute for build script in extension ! Try to run build command with sudo: prefix.' 
+                   end    
+              else
+                   puts 'build script in extension already executable : '+build_script
+              end
+              #puts '$$$$$$$$$$$$$$$$$$     START'
+              currentdir = Dir.pwd()      
+              Dir.chdir extpath 
+              sh %{$SHELL ./build}
+              Dir.chdir currentdir 
+              #puts '$$$$$$$$$$$$$$$$$$     FINISH'
+              #if File.executable? build_script
+                   #puts Jake.run('./build', [], extpath)
+                   #exit 1 unless $? == 0
+              #else
+              #     puts 'ERROR: build script in extension is not executable !' 
+              #end
+            else
+              puts 'build script in extension not found => pure ruby extension'
+          end
         end
       end
     end
@@ -927,6 +960,7 @@ namespace "run" do
       exit $failed.to_i
     end
 
+    desc "Run application on RhoSimulator"    
     task :rhosimulator => ["config:set_iphone_platform","config:common"] do        
         $rhosim_config = "platform='iphone'\r\n"
         
@@ -1118,21 +1152,55 @@ namespace "run" do
   desc "Builds everything, launches iphone simulator"
   task :iphone => :buildsim do
     
+    mkdir_p $tmpdir
+    log_name  =   File.join($tmpdir, 'logout')
+    File.delete(log_name) if File.exist?(log_name)
+
     rhorunner = File.join($startdir, $config["build"]["iphonepath"],"build/#{$configuration}-iphonesimulator/rhorunner.app")
-    commandis = $iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget
+    commandis = $iphonesim + ' launch "' + rhorunner + '" ' + $sdkver.gsub(/([0-9]\.[0-9]).*/,'\1') + ' ' + $emulatortarget + ' "' +log_name+'"'
 
+    puts 'kill iPhone Simulator'
+    `killall -9  "iPhone Simulator"`
+    `killall -9 iphonesim`
+
+
+    $ios_run_completed = false
+    
+    
+    #thr = Thread.new do
+    #end 
+    #Thread.new {
     thr = Thread.new do
        puts 'start thread with execution of application' 
        if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
            puts  'use old execution way - just open iPhone Simulator'
            system("open \"#{$sim}/iPhone Simulator.app\"")
+           $ios_run_completed = true
+           sleep(1000)
        else
            puts 'use iphonesim tool - open iPhone Simulator and execute our application, also support device family (iphone/ipad)'
            system(commandis)
+           $ios_run_completed = true
+           sleep(1000)
        end
+    #}
     end
     
-    thr.join
+    if ($emulatortarget != 'iphone') && ($emulatortarget != 'ipad')
+       thr.join
+    else
+       puts 'start waiting for run application in Simulator'
+       while (!File.exist?(log_name)) && (!$ios_run_completed)
+          puts ' ... still waiting'
+          sleep(1)
+       end
+       puts 'stop waiting - application started'
+       #sleep(1000)
+       thr.kill
+       #thr.join
+       puts 'application is started in Simulator' 
+       exit
+    end
   
     puts "end build iphone app"  
     exit

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

@@ -54,6 +54,7 @@
 		BDFBD9A410B1B9E500BAAFAB /* forward_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A210B1B9E500BAAFAB /* forward_btn.png */; };
 		BDFBD9A510B1B9E500BAAFAB /* home_btn.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A310B1B9E500BAAFAB /* home_btn.png */; };
 		BDFBD9A710B1BA2000BAAFAB /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = BDFBD9A610B1BA2000BAAFAB /* icon.png */; };
+		C5D0D0C1153F279A00B8BF21 /* InitMemoryInfoCollector.mm in Sources */ = {isa = PBXBuildFile; fileRef = C5D0D0C0153F279A00B8BF21 /* InitMemoryInfoCollector.mm */; };
 		F5128ADD1069752F002F00E5 /* MapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128ADC1069752F002F00E5 /* MapAnnotation.m */; };
 		F5128C2C106C1FF3002F00E5 /* GoogleGeocoder.m in Sources */ = {isa = PBXBuildFile; fileRef = F5128C2B106C1FF3002F00E5 /* GoogleGeocoder.m */; };
 		F51668E00FFD5F740079F023 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F51668DF0FFD5F740079F023 /* AudioToolbox.framework */; };
@@ -94,6 +95,7 @@
 		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 */; };
+		FAD42C58152CE61A000F906A /* libMotorolaLicence.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD42C57152CE61A000F906A /* libMotorolaLicence.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -235,6 +237,8 @@
 		BDFBD9A210B1B9E500BAAFAB /* forward_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward_btn.png; sourceTree = "<group>"; };
 		BDFBD9A310B1B9E500BAAFAB /* home_btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = home_btn.png; sourceTree = "<group>"; };
 		BDFBD9A610B1BA2000BAAFAB /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = SOURCE_ROOT; };
+		C5D0D0BF153F279300B8BF21 /* InitMemoryInfoCollector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InitMemoryInfoCollector.h; sourceTree = "<group>"; };
+		C5D0D0C0153F279A00B8BF21 /* InitMemoryInfoCollector.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = InitMemoryInfoCollector.mm; sourceTree = "<group>"; };
 		F5128ADB1069752F002F00E5 /* MapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MapAnnotation.h; path = MapView/MapAnnotation.h; sourceTree = "<group>"; };
 		F5128ADC1069752F002F00E5 /* MapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MapAnnotation.m; path = MapView/MapAnnotation.m; sourceTree = "<group>"; };
 		F5128C2A106C1FF3002F00E5 /* GoogleGeocoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GoogleGeocoder.h; path = Classes/MapView/GoogleGeocoder.h; sourceTree = SOURCE_ROOT; };
@@ -304,6 +308,7 @@
 		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; };
+		FAD42C57152CE61A000F906A /* libMotorolaLicence.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libMotorolaLicence.a; path = ../../res/libs/motorolalicence/iphone/libMotorolaLicence.a; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -336,6 +341,7 @@
 				5C59AB4212DDA22E00ED4A1E /* Security.framework in Frameworks */,
 				FA522FE112E49D6F00AB55CC /* QuartzCore.framework in Frameworks */,
 				FA52309412E55CA700AB55CC /* EventKit.framework in Frameworks */,
+				FAD42C58152CE61A000F906A /* libMotorolaLicence.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -408,6 +414,7 @@
 				BD72CCE4112D629F003B7D27 /* Info.plist */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
+				FAD42C57152CE61A000F906A /* libMotorolaLicence.a */,
 				46AD7DB21117AFB9009A974A /* MapKit.framework */,
 				46AD7DB61117AFBF009A974A /* CFNetwork.framework */,
 				FACC20FF123A759A0088A447 /* GameKit.framework */,
@@ -606,6 +613,8 @@
 		F547F3D10F9CEB05007C2CD2 /* Log */ = {
 			isa = PBXGroup;
 			children = (
+				C5D0D0C0153F279A00B8BF21 /* InitMemoryInfoCollector.mm */,
+				C5D0D0BF153F279300B8BF21 /* InitMemoryInfoCollector.h */,
 				F52181120F96B13500B7F974 /* LogViewController.m */,
 				F52181110F96B13500B7F974 /* LogViewController.h */,
 				F547F2860F9945D2007C2CD2 /* LogOptionsController.h */,
@@ -1008,6 +1017,7 @@
 				FA52300D12E4BBC700AB55CC /* MapViewManager.m in Sources */,
 				FAC6EE6D143B3AF100B8E352 /* RhoMapViewController.m in Sources */,
 				FA14CECD150130DB00734801 /* DateTimePickerViewController.m in Sources */,
+				C5D0D0C1153F279A00B8BF21 /* InitMemoryInfoCollector.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1065,6 +1075,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 					"$(SRCROOT)/build/Debug-iphonesimulator",
+					"\"$(SRCROOT)/../../res/libs/motorolalicence/iphone\"",
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
@@ -1089,10 +1100,6 @@
 					armv6,
 				);
 				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
-				ARCHS = (
-					armv7,
-					armv6,
-				);
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
@@ -1106,6 +1113,7 @@
 					"$(inherited)",
 					"$(SRCROOT)",
 					"$(SRCROOT)/build/Release-iphoneos",
+					"\"$(SRCROOT)/../../res/libs/motorolalicence/iphone\"",
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";
@@ -1184,6 +1192,7 @@
 					"$(SRCROOT)",
 					"$(SRCROOT)/build/Debug-iphonesimulator",
 					"$(SRCROOT)/openssl/build",
+					"\"$(SRCROOT)/../../res/libs/motorolalicence/iphone\"",
 				);
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "";

data/platform/osx/bin/RhoSimulator/RhoSimulator.app/Contents/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>RhoSimulator 3.3.2.beta.1, Copyright 2010-2012 Rhomobile, Inc.</string>
+	<string>RhoSimulator 3.3.3.beta.5.6, Copyright 2010-2012 Rhomobile, Inc.</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>