rhodes 5.5.0.7 → 5.5.0.22

data/platform/iphone/Classes/rho/net/IPhoneNetRequest.mm

@@ -12,9 +12,31 @@
 #import "common/RhoFilePath.h"
 #import "common/StringConverter.h"
 #import "common/RhoConf.h"
+#import "logging/RhoLog.h"
+
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "iPhoneNetRequest"
 
 extern "C" void rho_net_impl_network_indicator(int active);
 
+
+static bool is_net_trace() {
+    static int res = -1;
+    if (res == -1) {
+        if (rho_conf_getBool("net_trace") ) {
+            res = 1;
+        }
+        else {
+            res = 0;
+        }
+    }
+    return res == 1;
+}
+
+
+
+
 @interface NetRequestDelegateContext : NSObject
 {
     NSCondition* netDelegateThreadStartCond;
@@ -115,6 +137,13 @@ public:
 
 - (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
 
+- (nullable NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(nullable NSURLResponse *)response;
+- (void)connection:(NSURLConnection *)connection   didSendBodyData:(NSInteger)bytesWritten
+ totalBytesWritten:(NSInteger)totalBytesWritten
+totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite;
+
+
+
 //- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response;
 
 @property (retain)NSHTTPURLResponse* response;
@@ -146,18 +175,28 @@ public:
 
   - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)err
   {
+      if (is_net_trace()) {
+          RAWTRACE3("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::didFailWithError uri = %s  ERRCODE = %d,  ERRTEXT = %s", [[[[connection currentRequest] URL] absoluteString] UTF8String], (int)[err code], [err localizedDescription]);
+      }
+      
     self.error = err;
     m_pCppDelegate->onDone();
   }
 
   - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)resp
   {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::didReceiveResponse uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+      }
     self.response = (NSHTTPURLResponse*)resp;
     m_pCppDelegate->onResponse((NSHTTPURLResponse*)resp);
   }
 
   - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
   {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::didReceiveData uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+      }
     if ( m_pCppDelegate->shouldSaveData() )
     {
       [self.data appendData:data];
@@ -167,11 +206,17 @@ public:
 
   - (void)connectionDidFinishLoading:(NSURLConnection *)connection
   {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::connectionDidFinishLoading uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+      }
     m_pCppDelegate->onDone();
   }
 
   - (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
   {
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::willSendRequestForAuthenticationChallenge uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+      }
     if ( (!m_pCppDelegate->verifySSLPeers()) && [challenge.protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust] )
     {
       SecTrustRef trust = challenge.protectionSpace.serverTrust;
@@ -184,6 +229,24 @@ public:
     }
   }
 
+- (nullable NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(nullable NSURLResponse *)response {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::willSendRequest uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+    }
+    return request;
+}
+
+
+- (void)connection:(NSURLConnection *)connection   didSendBodyData:(NSInteger)bytesWritten
+ totalBytesWritten:(NSInteger)totalBytesWritten
+totalBytesExpectedToWrite:(NSInteger)totalBytesExpectedToWrite {
+    if (is_net_trace()) {
+        RAWTRACE1("$NetRequestProcess$ DELEGATE IPhoneNetRequest::delegate::didSendBodyData uri = %s ", [[[[connection currentRequest] URL] absoluteString] UTF8String]);
+    }
+}
+
+
+
 /*
   - (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)response
   {
@@ -651,16 +714,28 @@ public:
   
   INetResponse* perform( Hashtable<String,String>* pHeaders, IRhoSession* pSession )
   {
-  
-    [m_pPerformCond lock];
+      if (is_net_trace()) {
+          RAWLOG_INFO1("$NetRequestProcess$ PRE LOCK IPhoneNetRequest::perform uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
+
+      [m_pPerformCond lock];
+      if (is_net_trace()) {
+          RAWLOG_INFO1("$NetRequestProcess$ POST LOCK IPhoneNetRequest::perform uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
 
     //start();
     rho_net_impl_network_indicator(1);
 
     [m_pConnDelegate performSelector:@selector(startAsyncRequest) onThread:[[NetRequestDelegateContext sharedInstance] netRequestDelegateThread] withObject:nil waitUntilDone:NO];
 
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ PRE WAIT IPhoneNetRequest::perform uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
     [m_pPerformCond wait];
     [m_pPerformCond unlock];
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ POST WAIT IPhoneNetRequest::perform uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
   
     NSHTTPURLResponse* resp = nil;
     NSError* err = nil;
@@ -739,6 +814,11 @@ public:
       }
     }
     rho_net_impl_network_indicator(0);
+      
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ FINISH IPhoneNetRequest::perform uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
+      
     return ret;
     
   }
@@ -747,8 +827,15 @@ public:
   {
     [m_pConn initWithRequest:m_pReq delegate:m_pConnDelegate startImmediately:NO];
 //    [m_pConn setDelegateQueue:[NSOperationQueue mainQueue]];
-//    [m_pConn scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+    //[m_pConn scheduleInRunLoop:[NSRunLoop mainRunLoop] forMode:NSDefaultRunLoopMode];
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ PRE START IPhoneNetRequest::start uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
+      
     [m_pConn start];
+      if (is_net_trace()) {
+          RAWTRACE1("$NetRequestProcess$ POST START IPhoneNetRequest::start uri = %s", [[[m_pReq URL] absoluteString] UTF8String]);
+      }
   }
   
   void cancel()
@@ -933,4 +1020,4 @@ void CIPhoneNetRequest::setCallback(INetRequestCallback* cb)
 
 }
 
-}
+}

data/platform/iphone/rbuild/iphone.rake

@@ -28,6 +28,35 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'iphonecommon'))
 require File.dirname(__FILE__) + '/../../../lib/build/BuildConfig'
 
 
+$out_file_buf_enable = false
+$out_file_buf_path = 'rhobuildlog.txt'
+$out_file_buf = []
+
+puts 'iphone.rake execute'
+puts 'ENV["RHO_BUNDLE_BUILD_LOG_FILE"] = '+ENV["RHO_BUNDLE_BUILD_LOG_FILE"].to_s
+if (ENV["RHO_BUNDLE_BUILD_LOG_FILE"] != nil)
+    $out_file_buf_path = ENV["RHO_BUNDLE_BUILD_LOG_FILE"]
+    $out_file_buf_enable = true
+    load File.expand_path(File.join(File.dirname(__FILE__), 'putsOverride.rake'))
+end
+
+
+
+def save_out_file
+    if $out_file_buf_enable
+        f = File.new($out_file_buf_path,"w")
+        $out_file_buf.each do |line|
+            f.write(line)
+            f.write("\n")
+        end
+        f.close
+    end
+end
+
+
+
+
+
 def load_plist(fname)
   require 'cfpropertylist'
 
@@ -149,6 +178,205 @@ end
 #     return ret_value
 # end
 
+def recursive_replace_bool(value)
+    if value.kind_of?(Hash)
+        value.each_key do |nkey|
+            value[nkey] = recursive_replace_bool(value[nkey])
+        end
+    elsif value.kind_of?(Array)
+        new_array = []
+        value.each do |el|
+            new_array << recursive_replace_bool(el)
+        end
+    else
+        if (value.to_s.downcase == 'true') || (value.to_s.downcase == 'yes')
+            value = true
+        end
+        if (value.to_s.downcase == 'false') || (value.to_s.downcase == 'no')
+            value = false
+        end
+    end
+    return value
+end
+
+def recursive_merge_hash(hash, key, value)
+    old_value = hash[key]
+    if old_value.nil?
+        hash[key] = value
+    elsif value.kind_of?(Array)
+        if old_value.kind_of?(Array)
+            value.each do |element|
+                if !old_value.include?(element)
+                    old_value << element
+                end
+            end
+        else
+            hash[key] = value
+        end
+    elsif value.kind_of?(Hash)
+        if old_value.kind_of?(Hash)
+            value.each do |nkey, nvalue|
+                recursive_merge_hash(old_value, nkey, nvalue)
+            end
+        else
+            hash[key] = value
+        end
+    else
+        hash[key] = value
+    end
+end
+
+
+def recursive_remove_hash(hash, key)
+    if key.kind_of?(Array)
+        key.each do |element|
+            recursive_remove_hash(hash, element)
+        end
+    elsif key.kind_of?(Hash)
+        key.each do |keykey, keyvalue|
+            if hash.has_key? keykey
+                oldkey = hash[keykey]
+                recursive_remove_hash(oldkey, keyvalue)
+            end
+        end
+    elsif key.kind_of?(String)
+        #if hash.has_key? key
+            hash.delete(key)
+        #end
+    end
+end
+
+
+
+def update_plist_procedure
+      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
+      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
+
+      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?
+
+      on_suspend = $app_config["iphone"]["UIApplicationExitsOnSuspend"]
+      on_suspend_value = false
+
+      if on_suspend.nil?
+        puts "UIApplicationExitsOnSuspend not configured, using default of false"
+      elsif on_suspend.to_s.downcase == "true" || on_suspend.to_s == "1"
+        on_suspend_value = true
+      elsif on_suspend.to_s.downcase == "false" || on_suspend.to_s == "0"
+        on_suspend_value = false
+      else
+        raise "UIApplicationExitsOnSuspend is not set to a valid value. Current value: '#{$app_config["iphone"]["UIApplicationExitsOnSuspend"]}'"
+      end
+
+      init_extensions( nil, "get_ext_xml_paths")
+
+      ext_name, changed_value = get_ext_plist_changes($app_extension_cfg)
+
+      set_app_plist_options($app_path + "/project/iphone/Info.plist", appname, bundle_identifier, $app_config["version"], $app_config["iphone"]["BundleURLScheme"]) do |hash|
+         hash['UIApplicationExitsOnSuspend'] = on_suspend_value
+
+        changed_value.each do |k, v|
+          puts "Info.plist: Setting key #{k} = #{v} from #{File.basename(ext_name[k])}"
+          hash[k] = v
+        end
+
+        #setup GPS access
+        gps_request_text = nil
+        if $app_config["capabilities"].index("gps") != nil
+          gps_request_text = 'application tracks your position'
+        end
+        if !$app_config["iphone"].nil?
+          if !$app_config["iphone"]["capabilities"].nil?
+            if $app_config["iphone"]["capabilities"].index("gps") != nil
+              gps_request_text = 'application tracks your position'
+            end
+          end
+        end
+        if gps_request_text != nil
+          if hash['NSLocationWhenInUseUsageDescription'] == nil
+            puts "Info.plist: added key [NSLocationWhenInUseUsageDescription]"
+            hash['NSLocationWhenInUseUsageDescription'] = gps_request_text
+          end
+        end
+
+        #setup Camera access
+        camera_request_text = nil
+        if $app_config["capabilities"].index("camera") != nil
+          camera_request_text = 'application wants to use camera'
+        end
+        if !$app_config["iphone"].nil?
+          if !$app_config["iphone"]["capabilities"].nil?
+            if $app_config["iphone"]["capabilities"].index("camera") != nil
+              camera_request_text = 'application wants to use camera'
+            end
+          end
+        end
+        if camera_request_text != nil
+          if hash['NSCameraUsageDescription'] == nil
+            puts "Info.plist: added key [NSCameraUsageDescription]"
+            hash['NSCameraUsageDescription'] = camera_request_text
+          end
+        end
+
+
+        #LSApplicationQueriesSchemes
+        if $app_config["iphone"].has_key?("ApplicationQueriesSchemes")
+          arr_app_queries_schemes = $app_config["iphone"]["ApplicationQueriesSchemes"]
+          if arr_app_queries_schemes.kind_of?(Array)
+            hash['LSApplicationQueriesSchemes'] = arr_app_queries_schemes
+          else
+            hash['LSApplicationQueriesSchemes'] = []
+          end
+        end
+
+        #http_connection_domains
+        if !hash.has_key?("NSAppTransportSecurity")
+            hash['NSAppTransportSecurity'] = {}
+        end
+        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoads")
+            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoads'] = true
+        end
+        if $app_config["iphone"].has_key?("http_connection_domains")
+          http_connection_domains = $app_config["iphone"]["http_connection_domains"]
+          if http_connection_domains.kind_of?(Array)
+              hash['NSAppTransportSecurity']['NSExceptionDomains'] = {}
+              http_connection_domains.each do |domain|
+                  domain_hash = {}
+                  domain_hash['NSIncludesSubdomains'] = true
+                  domain_hash['NSTemporaryExceptionAllowsInsecureHTTPLoads'] = true
+                  domain_hash['NSTemporaryExceptionMinimumTLSVersion'] = 'TLSv1.0'
+
+                  hash['NSAppTransportSecurity']['NSExceptionDomains'][domain.to_s] = domain_hash
+              end
+          end
+        end
+
+        # add custom data
+        if $app_config["iphone"].has_key?("info_plist_data_remove")
+            info_plist_data_remove = $app_config["iphone"]["info_plist_data_remove"]
+            if info_plist_data_remove.kind_of?(Array)
+                info_plist_data_remove.each do |key|
+                    recursive_remove_hash(hash, key)
+                end
+            end
+        end
+        if $app_config["iphone"].has_key?("info_plist_data")
+            info_plist_data = $app_config["iphone"]["info_plist_data"]
+            if info_plist_data.kind_of?(Hash)
+                info_plist_data.each do |key, value|
+                    value = recursive_replace_bool(value)
+                    recursive_merge_hash(hash, key, value)
+                end
+            end
+        end
+
+
+         set_app_icon(false)
+         set_default_images(false, hash)
+      end
+end
+
 def set_signing_identity(identity,profile,entitlements)
 
   appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
@@ -591,6 +819,31 @@ def update_xcode_project_files_by_capabilities
         remove_lines_from_xcode_project(['com.apple.Push = {enabled = 1;};'])
     end
 
+    #keychain access
+    enable_keychain = false
+    if $app_config['capabilities'] != nil
+        if $app_config['capabilities'].index('keychain')
+            enable_keychain = true
+        end
+    end
+    if $app_config['iphone'] != nil
+        if $app_config['iphone']['capabilities'] != nil
+            if $app_config['iphone']['capabilities'].index('keychain')
+                enable_keychain = true
+            end
+        end
+    end
+    # required for database encryption
+    if $app_config['encrypt_database'] != nil
+        if $app_config['encrypt_database'] == '1'
+            enable_keychain = true
+        end
+    end
+    if enable_keychain
+    else
+        remove_lines_from_xcode_project(['com.apple.Keychain = {enabled = 1;};'])
+    end
+
     save_plist(info_plist, hash_info_plist)
     save_plist(dev_ent, hash_dev_ent)
     save_plist(prd_ent, hash_prd_ent)
@@ -955,6 +1208,8 @@ namespace "build" do
 
       print_timestamp('build:iphone:rhobundle FINISH')
 
+      save_out_file
+
     end
 
     desc "build upgrade package with full bundle"
@@ -1158,6 +1413,7 @@ namespace "build" do
     end
 
     def is_options_was_changed(options_hash, options_file)
+        puts "      is_options_was_changed( "+options_hash.to_s+", "+options_file.to_s+")"
       if !File.exist?(options_file)
          File.open(options_file,"w") {|f| f.write(YAML::dump(options_hash)) }
          return true
@@ -1196,6 +1452,7 @@ namespace "build" do
       arch = ENV['ARCHS']
       gccbin = bindir + '/gcc-4.2'
       arbin = bindir + '/ar'
+      xcode_version = ENV['XCODE_VERSION_ACTUAL']
 
       iphone_path = '.'
 
@@ -1208,33 +1465,53 @@ namespace "build" do
       result_lib = iphone_path + '/build/' + configuration + '-' + ( simulator ? "iphonesimulator" : "iphoneos") + '/lib'+xcodetarget+'.a'
       target_lib = targetdir + '/lib'+xcodetarget+'.a'
 
-      if check_for_rebuild(result_lib, depfile) || is_options_was_changed({"configuration" => configuration,"sdk" => sdk}, "lastbuildoptions.yml")
+      puts "BEGIN build xcode extension : ["+extpath+"]"
+      puts "      result_lib : ["+result_lib+"]"
+      puts "      target_lib : ["+target_lib+"]"
+      puts "      depfile : ["+depfile.to_s+"]"
+      puts "      configuration : ["+configuration+"]"
+      puts "      sdk : ["+sdk+"]"
 
-           rm_rf 'build'
-           rm_rf target_lib
 
-           args = ['build', '-target', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
 
-           additional_string = ''
-           if simulator
-               #args << '-arch'
-               #args << 'i386'
-               additional_string = ' ARCHS="i386 x86_64"'
-           end
+      rm_rf target_lib
 
-           require   rootdir + '/lib/build/jake.rb'
+      check_f_r = check_for_rebuild(result_lib, depfile)
+      puts "      check_for_rebuild = "+check_f_r.to_s
+      is_opt_c = is_options_was_changed({"configuration" => configuration,"sdk" => sdk, "xcode_version" => xcode_version}, "lastbuildoptions.yml")
+      puts "      is_options_was_changed = "+is_opt_c.to_s
 
-           ret = IPhoneBuild.run_and_trace(xcodebuild,args,{:rootdir => rootdir, :string_for_add_to_command_line => additional_string})
+      if check_f_r || is_opt_c
+          puts "      we should rebuild because previous builded library is not actual or not exist !"
       else
+          puts "      ssskip rebuild because previous builded library is still actual !"
+      end
+
+      if !File.exist?(result_lib)
+          # library bot found ! We should build it !
+          puts "      build xcode extension !"
+
+          rm_rf 'build'
 
-        puts "ssskip rebuild because previous builded library is still actual !"
-        rm_rf target_lib
+          args = ['build', '-target', xcodetarget, '-configuration', configuration, '-sdk', sdk, '-project', xcodeproject]
+
+          additional_string = ''
+          if simulator
+              #args << '-arch'
+              #args << 'i386'
+              additional_string = ' ARCHS="i386 x86_64"'
+          end
+
+          require   rootdir + '/lib/build/jake.rb'
+
+          ret = IPhoneBuild.run_and_trace(xcodebuild,args,{:rootdir => rootdir, :string_for_add_to_command_line => additional_string})
 
       end
 
       cp result_lib,target_lib
 
       Dir.chdir currentdir
+      puts "END build xcode extension : ["+extpath+"]"
 
 
     end
@@ -1246,6 +1523,9 @@ namespace "build" do
 
       puts "build extension START :" + extpath
 
+
+      ENV["SDK_NAME"] ||= sdk
+      sdk = ENV["SDK_NAME"]
       #puts "xcodeproject = "+xcodeproject.to_s
       #puts "xcodetarget = "+xcodetarget.to_s
 
@@ -1276,7 +1556,7 @@ namespace "build" do
       # added by dmitrys
       ENV["XCODEBUILD"] = $xcodebuild
       ENV["CONFIGURATION"] ||= $configuration
-      ENV["SDK_NAME"] ||= sdk
+
 
 
       build_script = File.join(extpath, 'build')
@@ -1836,121 +2116,12 @@ namespace "build" do
 
 
     task :update_plist => ["config:iphone"] do
-      appname = $app_config["name"] ? $app_config["name"] : "rhorunner"
-      appname_fixed = appname.split(/[^a-zA-Z0-9]/).map { |w| w }.join("")
 
       chdir $app_path
 
       puts 'update info.plist'
 
-      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?
-
-      on_suspend = $app_config["iphone"]["UIApplicationExitsOnSuspend"]
-      on_suspend_value = false
-
-      if on_suspend.nil?
-        puts "UIApplicationExitsOnSuspend not configured, using default of false"
-      elsif on_suspend.to_s.downcase == "true" || on_suspend.to_s == "1"
-        on_suspend_value = true
-      elsif on_suspend.to_s.downcase == "false" || on_suspend.to_s == "0"
-        on_suspend_value = false
-      else
-        raise "UIApplicationExitsOnSuspend is not set to a valid value. Current value: '#{$app_config["iphone"]["UIApplicationExitsOnSuspend"]}'"
-      end
-
-      init_extensions( nil, "get_ext_xml_paths")
-
-      ext_name, changed_value = get_ext_plist_changes($app_extension_cfg)
-
-      set_app_plist_options($app_path + "/project/iphone/Info.plist", appname, bundle_identifier, $app_config["version"], $app_config["iphone"]["BundleURLScheme"]) do |hash|
-         hash['UIApplicationExitsOnSuspend'] = on_suspend_value
-
-        changed_value.each do |k, v|
-          puts "Info.plist: Setting key #{k} = #{v} from #{File.basename(ext_name[k])}"
-          hash[k] = v
-        end
-
-        #setup GPS access
-        gps_request_text = nil
-        if $app_config["capabilities"].index("gps") != nil
-          gps_request_text = 'application tracks your position'
-        end
-        if !$app_config["iphone"].nil?
-          if !$app_config["iphone"]["capabilities"].nil?
-            if $app_config["iphone"]["capabilities"].index("gps") != nil
-              gps_request_text = 'application tracks your position'
-            end
-          end
-        end
-        if gps_request_text != nil
-          if hash['NSLocationWhenInUseUsageDescription'] == nil
-            puts "Info.plist: added key [NSLocationWhenInUseUsageDescription]"
-            hash['NSLocationWhenInUseUsageDescription'] = gps_request_text
-          end
-        end
-
-        #setup Camera access
-        camera_request_text = nil
-        if $app_config["capabilities"].index("camera") != nil
-          camera_request_text = 'application wants to use camera'
-        end
-        if !$app_config["iphone"].nil?
-          if !$app_config["iphone"]["capabilities"].nil?
-            if $app_config["iphone"]["capabilities"].index("camera") != nil
-              camera_request_text = 'application wants to use camera'
-            end
-          end
-        end
-        if camera_request_text != nil
-          if hash['NSCameraUsageDescription'] == nil
-            puts "Info.plist: added key [NSCameraUsageDescription]"
-            hash['NSCameraUsageDescription'] = camera_request_text
-          end
-        end
-
-
-        #LSApplicationQueriesSchemes
-        if $app_config["iphone"].has_key?("ApplicationQueriesSchemes")
-          arr_app_queries_schemes = $app_config["iphone"]["ApplicationQueriesSchemes"]
-          if arr_app_queries_schemes.kind_of?(Array)
-            hash['LSApplicationQueriesSchemes'] = arr_app_queries_schemes
-          else
-            hash['LSApplicationQueriesSchemes'] = []
-          end
-        end
-
-        #http_connection_domains
-        if !hash.has_key?("NSAppTransportSecurity")
-            hash['NSAppTransportSecurity'] = {}
-        end
-        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoads")
-            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoads'] = true
-        end
-        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoadsInWebContent")
-            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoadsInWebContent'] = true
-        end
-        if $app_config["iphone"].has_key?("http_connection_domains")
-          http_connection_domains = $app_config["iphone"]["http_connection_domains"]
-          if http_connection_domains.kind_of?(Array)
-              hash['NSAppTransportSecurity']['NSExceptionDomains'] = {}
-              http_connection_domains.each do |domain|
-                  domain_hash = {}
-                  domain_hash['NSIncludesSubdomains'] = true
-                  domain_hash['NSTemporaryExceptionAllowsInsecureHTTPLoads'] = true
-                  domain_hash['NSTemporaryExceptionMinimumTLSVersion'] = 'TLSv1.0'
-
-                  hash['NSAppTransportSecurity']['NSExceptionDomains'][domain.to_s] = domain_hash
-              end
-          end
-        end
-
-
-         set_app_icon(false)
-         set_default_images(false, hash)
-      end
-
+      update_plist_procedure
 
       set_signing_identity($signidentity,$provisionprofile,$entitlements) #if $signidentity.to_s != ""
     end
@@ -1981,112 +2152,7 @@ namespace "build" do
       #xml_path = File.join($startdir, "/lib/commonAPI/coreapi/ext/Application.xml")
       #Jake.run3("\"#{$startdir}/bin/rhogen\" api \"#{xml_path}\"")
 
-      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?
-
-      on_suspend = $app_config["iphone"]["UIApplicationExitsOnSuspend"]
-      on_suspend_value = false
-
-      if on_suspend.nil?
-        puts "UIApplicationExitsOnSuspend not configured, using default of false"
-      elsif on_suspend.to_s.downcase == "true" || on_suspend.to_s == "1"
-        on_suspend_value = true
-      elsif on_suspend.to_s.downcase == "false" || on_suspend.to_s == "0"
-        on_suspend_value = false
-      else
-        raise "UIApplicationExitsOnSuspend is not set to a valid value. Current value: '#{$app_config["iphone"]["UIApplicationExitsOnSuspend"]}'"
-      end
-
-      init_extensions( nil, "get_ext_xml_paths")
-
-      ext_name, changed_value = get_ext_plist_changes($app_extension_cfg)
-
-      set_app_plist_options($app_path + "/project/iphone/Info.plist", appname, bundle_identifier, $app_config["version"], $app_config["iphone"]["BundleURLScheme"]) do |hash|
-        hash['UIApplicationExitsOnSuspend'] = on_suspend_value
-
-        changed_value.each do |k, v|
-          puts "Info.plist: Setting key #{k} = #{v} from #{File.basename(ext_name[k])}"
-          hash[k] = v
-        end
-
-        #setup GPS access
-        gps_request_text = nil
-        if $app_config["capabilities"].index("gps") != nil
-          gps_request_text = 'application tracks your position'
-        end
-        if !$app_config["iphone"].nil?
-          if !$app_config["iphone"]["capabilities"].nil?
-            if $app_config["iphone"]["capabilities"].index("gps") != nil
-              gps_request_text = 'application tracks your position'
-            end
-          end
-        end
-        if gps_request_text != nil
-          if hash['NSLocationWhenInUseUsageDescription'] == nil
-            puts "Info.plist: added key [NSLocationWhenInUseUsageDescription]"
-            hash['NSLocationWhenInUseUsageDescription'] = gps_request_text
-          end
-        end
-
-        #setup Camera access
-        camera_request_text = nil
-        if $app_config["capabilities"].index("camera") != nil
-          camera_request_text = 'application wants to use camera'
-        end
-        if !$app_config["iphone"].nil?
-          if !$app_config["iphone"]["capabilities"].nil?
-            if $app_config["iphone"]["capabilities"].index("camera") != nil
-              camera_request_text = 'application wants to use camera'
-            end
-          end
-        end
-        if camera_request_text != nil
-          if hash['NSCameraUsageDescription'] == nil
-            puts "Info.plist: added key [NSCameraUsageDescription]"
-            hash['NSCameraUsageDescription'] = camera_request_text
-          end
-        end
-
-
-        #LSApplicationQueriesSchemes
-        if $app_config["iphone"].has_key?("ApplicationQueriesSchemes")
-          arr_app_queries_schemes = $app_config["iphone"]["ApplicationQueriesSchemes"]
-          if arr_app_queries_schemes.kind_of?(Array)
-            hash['LSApplicationQueriesSchemes'] = arr_app_queries_schemes
-          else
-            hash['LSApplicationQueriesSchemes'] = []
-          end
-        end
-
-        #http_connection_domains
-        if !hash.has_key?("NSAppTransportSecurity")
-            hash['NSAppTransportSecurity'] = {}
-        end
-        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoads")
-            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoads'] = true
-        end
-        if !hash['NSAppTransportSecurity'].has_key?("NSAllowsArbitraryLoadsInWebContent")
-            hash['NSAppTransportSecurity']['NSAllowsArbitraryLoadsInWebContent'] = true
-        end
-        if $app_config["iphone"].has_key?("http_connection_domains")
-          http_connection_domains = $app_config["iphone"]["http_connection_domains"]
-          if http_connection_domains.kind_of?(Array)
-              hash['NSAppTransportSecurity']['NSExceptionDomains'] = {}
-              http_connection_domains.each do |domain|
-                  domain_hash = {}
-                  domain_hash['NSIncludesSubdomains'] = true
-                  domain_hash['NSTemporaryExceptionAllowsInsecureHTTPLoads'] = true
-                  domain_hash['NSTemporaryExceptionMinimumTLSVersion'] = 'TLSv1.0'
-
-                  hash['NSAppTransportSecurity']['NSExceptionDomains'][domain.to_s] = domain_hash
-              end
-          end
-        end
-
-        set_app_icon(false)
-        set_default_images(false, hash)
-      end
+      update_plist_procedure
 
 
       if $entitlements == ""