rhodes 7.4.1 → 7.5.1

data/platform/iphone/rbuild/iphone.rake

@@ -1854,6 +1854,10 @@ namespace "build" do
         framework_build_dir = File.join(framework_dir, "build")
         rm_rf framework_build_dir
 
+
+        ENV["TAU_DEV_ARCHS"] = get_archs_string_device
+        ENV["TAU_SIM_ARCHS"] = get_archs_string_simulator
+
         args = ['clean', 'install', '-target', "Framework",'-project', "Rhodes.xcodeproj"]
         Dir.chdir framework_dir
         ret = IPhoneBuild.run_and_trace($xcodebuild,args,{:rootdir => $startdir})

data/platform/shared/common/RhodesApp.cpp

@@ -73,6 +73,13 @@ bool rho_wmimpl_is_browser_ieforwm();
 void rho_file_set_fs_mode(int mode);
 #endif
 
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+void rho_cocoa_server_init();
+void rho_cocoa_server_start();
+#endif
+#endif
+
 }
 
 // Copy-paste from ApplicationBase.cpp
@@ -561,14 +568,27 @@ void CRhodesApp::run()
 
 #ifdef OS_MACOSX
   bool shouldRunDirectQueue = false;
+  bool shouldUseCocoaServer = true;
+    
   net::CDirectHttpRequestQueue directQueue(*m_httpServer, *this );
 
     if (RHOCONF().isExist("ios_direct_local_requests")) {
         shouldRunDirectQueue = RHOCONF().getBool("ios_direct_local_requests");
     }
+    if (RHOCONF().isExist("ios_use_old_legacy_socket")) {
+        shouldUseCocoaServer = !RHOCONF().getBool("ios_use_old_legacy_socket");
+    }
 #ifdef RHODES_EMULATOR
     shouldRunDirectQueue = false;
+    shouldUseCocoaServer = false;
 #endif
+
+    if ((shouldUseCocoaServer) && (!shouldRunDirectQueue)) {
+#ifndef RHODES_EMULATOR
+        rho_cocoa_server_init();
+#endif
+    }
+
 #endif
 
 
@@ -576,8 +596,13 @@ void CRhodesApp::run()
 		if(!m_isJSFSApp)
     {
 #ifdef OS_MACOSX
-      if ( shouldRunDirectQueue )
+      if ( shouldRunDirectQueue || shouldUseCocoaServer)
       {
+          if ((shouldUseCocoaServer) && (!shouldRunDirectQueue)) {
+#ifndef RHODES_EMULATOR
+              rho_cocoa_server_start();
+#endif
+          }
         directQueue.run();
       }
       else

data/platform/shared/net/HttpServer.cpp

@@ -95,6 +95,19 @@ typedef unsigned __int16 uint16_t;
 
 #endif
 
+
+
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+
+extern "C" {
+    void rho_cocoa_server_stop();
+}
+
+#endif
+#endif
+
+
 #undef DEFAULT_LOGCATEGORY
 #define DEFAULT_LOGCATEGORY "HttpServer"
 
@@ -511,6 +524,13 @@ void CHttpServer::close_listener()
 
 void CHttpServer::stop()
 {
+    
+#ifdef OS_MACOSX
+#ifndef RHODES_EMULATOR
+    rho_cocoa_server_stop();
+#endif
+#endif
+    
     // WARNING!!! It is not enough to just close listener on Android
     // to stop server. By unknown reason accept does not unblock if
     // it was closed in another thread. However, on iPhone it works

data/platform/shared/qt/RhoSimulator.pro

@@ -37,7 +37,7 @@ unix:!macx {
 }
 macx {
  SUBDIRS += curl
- QMAKE_MAC_SDK = macosx10.13
+ QMAKE_MAC_SDK = macosx11.1
 }
 
 win32{

data/platform/shared/ruby/osx/ruby/config.h

@@ -70,6 +70,8 @@
 #define HAVE_TYPE_STRUCT_SOCKADDR_STORAGE 1
 #define HAVE_GAI_STRERROR 1
 #define HAVE_INET_PTON 1
+#define HAVE_INET_NTOP 1
+#define HAVE_ARPA_INET_H 1
 
 #define HAVE_TYPE_STRUCT_IP_MREQ 1
 //<<<

data/platform/shared/ruby/win32/win32.c

@@ -2437,7 +2437,7 @@ static size_t pioinfo_extra = 0;	/* workaround for VC++8 SP1 */
 static void
 set_pioinfo_extra(void)
 {
-#if RUBY_MSVCRT_VERSION >= 140
+#if RUBY_MSVCRT_VERSION >= 140 
 # define FUNCTION_RET 0xc3 /* ret */
 
 //RHO start : trying to get _asatty address from both debug and release crt dlls
@@ -2477,18 +2477,25 @@ set_pioinfo_extra(void)
 //   vvv
 
 #define FUNCTION_BEFORE_RET_MARK "\x5d"
+#define FUNCTION_BEFORE_RET_MARK_2 "\xc9"
 
 #  define FUNCTION_SKIP_BYTES 0
     /* mov eax,dword ptr [eax*4+100EB430h] */
 #  define PIOINFO_MARK "\x8B\x04\x85"
 # endif
     if (p) {
-        for (pend += 10; pend < p + 300; pend++) {
+        for (pend += 10; pend < p + 500; pend++) {
 
 			int beforeRetFound = (memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0);
 			char* pret = (pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES);
 			int retFound = ( (*(pret) & FUNCTION_RET ) == FUNCTION_RET);
-			
+
+#ifdef FUNCTION_BEFORE_RET_MARK_2
+			if (!(beforeRetFound && retFound)) {
+				beforeRetFound = (memcmp(pend, FUNCTION_BEFORE_RET_MARK_2, sizeof(FUNCTION_BEFORE_RET_MARK_2) - 1) == 0);
+				pret = (pend + (sizeof(FUNCTION_BEFORE_RET_MARK_2) - 1) + FUNCTION_SKIP_BYTES);
+			}
+#endif			
             // find end of function
 			if ( beforeRetFound && retFound ) {
 			/*

data/rakefile.rb

@@ -3985,11 +3985,11 @@ namespace "build" do
 
     rho_ruby_project = File.join($startdir, "platform/win32/RubyWin/RubyWin.2015.sln")
     argsClean = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32",
-      '/p:VisualStudioVersion=14.0', '/t:Clean']
+      '/p:VisualStudioVersion=14.2', '/t:Clean']
     Jake.run(msbuild, argsClean)
 
     argsBuild = [rho_ruby_project, "/p:Configuration=Release_RubyCompiler", "/p:Platform=Win32",
-      '/p:VisualStudioVersion=14.0', '/t:Build']
+      '/p:VisualStudioVersion=14.2', '/t:Build']
     Jake.run(msbuild, argsBuild)
     puts "RhoRuby rebuilded"
   end
@@ -4296,9 +4296,9 @@ namespace "run" do
         end
 
         if $config['env']['paths']['rhosimulator'] and $config['env']['paths']['rhosimulator'].length() > 0
-          path = File.join( $config['env']['paths']['rhosimulator'], "rhosimulator.exe" )
+          path = File.join( $config['env']['paths']['rhosimulator'], "RhoSimulator.exe" )
         else
-          path = File.join( $startdir, "platform/win32/RhoSimulator/rhosimulator.exe" )
+          path = File.join( $startdir, "platform/win32/RhoSimulator/RhoSimulator.exe" )
         end
 
         oldDir = File.join( $startdir, "platform/win32/RhoSimulator" )
@@ -4307,7 +4307,7 @@ namespace "run" do
         qtdir = ENV['QTDIR']
         args << "-remote-debugging-port=9090"
 
-        cmd = File.join(newDir, 'rhosimulator.exe')
+        cmd = File.join(newDir, 'RhoSimulator.exe')
       elsif RUBY_PLATFORM =~ /darwin/
 
         path = File.join( $startdir, "platform/osx/bin/RhoSimulator" )
@@ -4452,59 +4452,68 @@ namespace "build" do
 end
 
 def downloadRhosim( targetPath )
-  require 'tempfile'
 
-  commit = `git rev-parse HEAD`.strip
-  branch = `git rev-parse --abbrev-ref HEAD`.strip
+    require 'tempfile'
 
-  if RUBY_PLATFORM =~ /(win|w)32$/
-    url = "https://tau-autobuilds.s3.eu-central-1.amazonaws.com/rhomobile/rhodes/#{branch}/#{commit}/win32-RhoSimulator/RhoSimulator.zip"
-  elsif RUBY_PLATFORM =~ /darwin/
-    url = "https://tau-autobuilds.s3.eu-central-1.amazonaws.com/rhomobile/rhodes/#{branch}/#{commit}/osx-rhosimulator_osx-/RhoSimulator.app.zip"    
-  else
-    return
-  end
+    commit = `git rev-parse HEAD`.strip
+    branch = `git rev-parse --abbrev-ref HEAD`.strip
 
-  $logger.info "Downloading rhosim from #{url}"
+    if RUBY_PLATFORM =~ /(win|w)32$/
+      url = "https://tau-autobuilds.s3.eu-central-1.amazonaws.com/rhomobile/rhodes/#{branch}/#{commit}/win32-RhoSimulator/RhoSimulator.zip"
+    elsif RUBY_PLATFORM =~ /darwin/
+      url = "https://tau-autobuilds.s3.eu-central-1.amazonaws.com/rhomobile/rhodes/#{branch}/#{commit}/osx-rhosimulator_osx-/RhoSimulator.app.zip"    
+    else
+      return
+    end
 
-  file = Tempfile.new('rhosim.zip')
-  file.binmode
+    $logger.info "Downloading rhosim from #{url}"
 
-  uri = URI.parse(url)
+    file = Tempfile.new('rhosim.zip')
+    file.binmode
 
-  http = Net::HTTP.new(uri.host, uri.port)
-  http.use_ssl = true
+    uri = URI.parse(url)
 
-  http.request_get(uri.path) do |response|
-    length = response['Content-Length'].to_i
-    x = 0
+    http = Net::HTTP.new(uri.host, uri.port)
+    http.use_ssl = true
 
-    response.read_body do |fragment|
-      x += fragment.length
-      file.write(fragment)
-    end
-  end
+    begin
 
-  file.flush
-  file.close
+      http.request_get(uri.path) do |response|
+        length = response['Content-Length'].to_i
+        x = 0
 
-  $logger.info "Unzipping #{file.path} to #{targetPath}"
+        response.read_body do |fragment|
+          x += fragment.length
+          file.write(fragment)
+        end
+      end
 
-  mkdir_p( targetPath )
+      file.flush
+      file.close
 
-  require 'zip'
+      $logger.info "Unzipping #{file.path} to #{targetPath}"
 
-  zipfile = file.path
-  file.close
+      mkdir_p( targetPath )
 
-  Zip::File.open(zipfile) do |zip_file|
-    zip_file.each do |f|
-      fpath = File.join(targetPath, f.name)
-      zip_file.extract(f, fpath)
-    end
-  end
+      require 'zip'
 
-  file.delete
+      zipfile = file.path
+      file.close
+
+      Zip::File.open(zipfile) do |zip_file|
+        zip_file.each do |f|
+          fpath = File.join(targetPath, f.name)
+          zip_file.extract(f, fpath)
+        end
+      end
+      
+  rescue Exception => e
+    $logger.error "Can't download RhoSimulator: #{e.inspect}"
+
+    rm_r targetPath
+  ensure
+    file.delete
+  end
 
 end
 

data/res/generators/templates/application/AndroidManifest.erb

@@ -47,6 +47,7 @@
               android:launchMode='singleTask'
               android:configChanges='orientation|screenSize|fontScale|smallestScreenSize|keyboard|keyboardHidden'
               android:screenOrientation='<%= @screenOrientation %>'
+              android:exported='true'
               <% if @hardwareAcceleration %>
               android:hardwareAccelerated='true'
               <% end %> >
@@ -68,7 +69,7 @@
       <grant-uri-permission android:pathPrefix='/rhodata/apps/'/>
     </provider>
 
-	<receiver android:name='com.rho.notification.AlarmReceiver' android:enabled="false">
+	<receiver android:name='com.rho.notification.AlarmReceiver' android:enabled="false" android:exported='true'>
      <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
      </intent-filter>

data/res/generators/templates/application/build.yml

@@ -62,8 +62,11 @@ applog: rholog.txt
   #- ios_uiwebview
   ## iOS do not support direct(intercept by application's code) http/https request processing in WKWebView
   ## add this capability for add some code with support this feature by some "unofficial" method.
-  ## set ios_direct_local_requests = 1 in rhoconfig.txt for use this code 
+  ## set ios_direct_local_requests = 1 in rhoconfig.txt for use this code
+  ## ios_wkwebview_http_direct_processing_method_2 is recommended because it is small lightweight access to undocumented API
   #- ios_wkwebview_http_direct_processing
+  #- ios_wkwebview_http_direct_processing_method_2
+  #- ios_wkwebview_http_direct_processing_method_3
 
 iphone:
   configuration: Release

data/res/generators/templates/application/rhoconfig.txt

@@ -95,9 +95,14 @@ sync_poll_interval=0
 #If true, request to local server will be applied directly, bypassing socket intercommunication, no network requests are involved. If false, a legacy client-server intercommunication will be made for local requests. Default is TRUE. To support per-app VPN (i.e. MobileIron) this option should be set to TRUE.
 #We make default value to FALSE because now WKWebView is default (UIWebView was deprecated by Apple and you can not submit application with UIWebView to AppStore!)
 # WkWebView do not support http/https request direct processing, but you can not enable it if you add this capability to build.yml: ios_wkwebview_http_direct_processing
+# or/and ios_wkwebview_http_direct_processing_method_2 or/and ios_wkwebview_http_direct_processing_method_3
 # With this capability some additional code will be added to project. That code provide unofficiall direct work with http/https requests from WKWebView and you will be able set
 # ios_direct_local_requests = 1
 
+#ios_use_old_legacy_socket = 0
+# Use old legacy socket based http server instead of CocoaServer.
+# Default value is FALSE
+
 #ios_https_local_server = 0
 #ATTENTION !!! this option works only with ios_net_curl = 0 AND ios_direct_local_requests = 1 !!!
 #default value is FALSE

data/rhobuild.yml.example

@@ -1,11 +1,11 @@
 env:
   #app: C:/rhodes-app
   paths:
-    java: C:/Program Files/Java/jdk1.7.0_67/bin
-    android: C:/android-sdk-windows
-    android-ndk: C:/android-ndk-r16
+    java: C:/Program Files/Java/jdk11/bin
+    android: C:/Program Files (x86)/Android/android-sdk
+    android-ndk: C:/ProgramData/Microsoft/AndroidNDK64/android-ndk-r17
     cabwiz:  C:/Program Files (x86)/Windows Mobile 6 SDK/Tools/CabWiz
-    msbuild: C:/Program Files (x86)/MSBuild/14.0/Bin/MSBuild.exe
+    msbuild: C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Current/Bin/MSBuild.exe
     vcbuild: C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe
     nsis:    C:/Program Files (x86)/NSIS/makensis.exe
     sailfish: C:/AuroraOS

data/rhodes.gemspec

@@ -35,10 +35,9 @@ Gem::Specification.new do |s|
   s.add_dependency('simctl', '1.6.8')
   s.add_dependency('listen', '3.0.6')
   s.add_dependency('rubyzip', '1.3.0')
-  s.add_dependency('ffi', '1.12.2')
   s.add_dependency('rdoc', '4.2.2')
   s.add_dependency('deep_merge','1.1.1')
-  s.add_dependency('nokogiri', '1.10.9')
+  s.add_dependency('nokogiri', '1.10.10')
 
   s.post_install_message = "Thanks for installing Rhodes ! Please visit our website: http://tau-platform.com" if s.respond_to? :post_install_message=
   s.executables << 'rhogen'

data/version

@@ -1 +1 @@
-7.4.1
+7.5.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhodes
 version: !ruby/object:Gem::Version
-  version: 7.4.1
+  version: 7.5.1
 platform: ruby
 authors:
 - TAU Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: templater
@@ -192,20 +192,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.12.2
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -240,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 1.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.10.9
+        version: 1.10.10
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -286,7 +272,9 @@ files:
 - README.html
 - README.md
 - Rakefile
+- SECURITY.md
 - appveyor.yml
+- azure-pipelines.yml
 - bin/build_wmbinaries.bat
 - bin/c2dm.rb
 - bin/get-rhodes-info
@@ -2781,26 +2769,15 @@ files:
 - lib/commonAPI/mediacapture/ext/platform/android/AndroidManifest_rhomobile.xml
 - lib/commonAPI/mediacapture/ext/platform/android/ApplicationCameraActivity.erb
 - lib/commonAPI/mediacapture/ext/platform/android/ApplicationFileProvider.erb
-- lib/commonAPI/mediacapture/ext/platform/android/adds/res/drawable/camera_btn.xml
-- lib/commonAPI/mediacapture/ext/platform/android/adds/res/layout/camera_land.xml
-- lib/commonAPI/mediacapture/ext/platform/android/adds/res/layout/camera_port.xml
 - lib/commonAPI/mediacapture/ext/platform/android/adds/res/xml/image_fileprovider_paths.xml
 - lib/commonAPI/mediacapture/ext/platform/android/ext_java.files
 - lib/commonAPI/mediacapture/ext/platform/android/ext_native.files
 - lib/commonAPI/mediacapture/ext/platform/android/jni/Videocapture_impl.cpp
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraActivity.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraEclair.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraExtension.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraFactory.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraGingerbread.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraObject.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraPreview.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraRhoListener.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingletonEclair.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingletonGingerbread.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingletonObject.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/ICameraObject.java
-- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/ICameraSingletonObject.java
+- lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraSingleton.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/OrientationListnerService.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/mediacapture/RhoListener.java
 - lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/videocapture/Videocapture.java
@@ -3674,7 +3651,6 @@ files:
 - lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMFacade.java
 - lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMIntentService.java
 - lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMListener.java
-- lib/extensions/fcm-push/ext/android/src/com/rhomobile/rhodes/fcm/FCMTokenRefresherService.java
 - lib/extensions/fcm-push/ext/build
 - lib/extensions/fcm-push/ext/build.bat
 - lib/extensions/fcm-push/ext/fcm.xml
@@ -5784,7 +5760,6 @@ files:
 - neon/R2D1/Build/Config/Plugin.xml
 - neon/R2D1/Build/Config/RegEx.xml
 - neon/R2D1/Build/Windows/Binaries/prtlib.dll
-- platform/android/Rhodes/AndroidManifest.xml.erb
 - platform/android/Rhodes/jni/Android.mk
 - platform/android/Rhodes/jni/Application.mk
 - platform/android/Rhodes/jni/genconfig.h
@@ -6042,7 +6017,7 @@ files:
 - platform/android/build/Rakefile
 - platform/android/build/RhodesGEN_build.files
 - platform/android/build/RhodesSRC_build.files
-- platform/android/build/aab_builder.rb
+- platform/android/build/aapt2_helper.rb
 - platform/android/build/android-repack.rake
 - platform/android/build/android.rake
 - platform/android/build/android_debug.rb
@@ -6050,6 +6025,9 @@ files:
 - platform/android/build/android_tools.rb
 - platform/android/build/androidcommon.rb
 - platform/android/build/apk_builder.rb
+- platform/android/build/build_tools_finder.rb
+- platform/android/build/config.yml
+- platform/android/build/dex_builder.rb
 - platform/android/build/eclipse_project_generator.rb
 - platform/android/build/hostplatform.rb
 - platform/android/build/libcurl_build.files
@@ -6090,6 +6068,10 @@ files:
 - platform/iphone/Classes/Camera.old/PickImageDelegate.m
 - platform/iphone/Classes/Camera/PickImageDelegate.h
 - platform/iphone/Classes/Camera/PickImageDelegate.m
+- platform/iphone/Classes/CocoaServer/CCocoaServer.h
+- platform/iphone/Classes/CocoaServer/CCocoaServer.m
+- platform/iphone/Classes/CocoaServer/RhoHTTPConnection.h
+- platform/iphone/Classes/CocoaServer/RhoHTTPConnection.m
 - platform/iphone/Classes/DateTime.h
 - platform/iphone/Classes/DateTime.m
 - platform/iphone/Classes/DateTimePicker.m
@@ -6204,6 +6186,70 @@ files:
 - platform/iphone/Classes/rho/net/IPhoneNetRequest.h
 - platform/iphone/Classes/rho/net/IPhoneNetRequest.mm
 - platform/iphone/Classes/rho/net/NetRequestImpl.m
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDData.h
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDData.m
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDNumber.h
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDNumber.m
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDRange.h
+- platform/iphone/CocoaHTTPServer/Core/Categories/DDRange.m
+- platform/iphone/CocoaHTTPServer/Core/HTTPAuthenticationRequest.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPAuthenticationRequest.m
+- platform/iphone/CocoaHTTPServer/Core/HTTPConnection.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPConnection.m
+- platform/iphone/CocoaHTTPServer/Core/HTTPLogging.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPMessage.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPMessage.m
+- platform/iphone/CocoaHTTPServer/Core/HTTPResponse.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPServer.h
+- platform/iphone/CocoaHTTPServer/Core/HTTPServer.m
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.h
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartFormDataParser.m
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.h
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeader.m
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.h
+- platform/iphone/CocoaHTTPServer/Core/Mime/MultipartMessageHeaderField.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPAsyncFileResponse.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDataResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDataResponse.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPDynamicFileResponse.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPErrorResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPErrorResponse.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPFileResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPFileResponse.m
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.h
+- platform/iphone/CocoaHTTPServer/Core/Responses/HTTPRedirectResponse.m
+- platform/iphone/CocoaHTTPServer/Core/WebSocket.h
+- platform/iphone/CocoaHTTPServer/Core/WebSocket.m
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.h
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVConnection.m
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.h
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DAVResponse.m
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.h
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/DELETEResponse.m
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.h
+- platform/iphone/CocoaHTTPServer/Extensions/WebDAV/PUTResponse.m
+- platform/iphone/CocoaHTTPServer/LICENSE.txt
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/About.txt
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaAsyncSocket/GCDAsyncSocket.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/About.txt
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDASLLogger.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDAbstractDatabaseLogger.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDFileLogger.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDLog.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/DDTTYLogger.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/ContextFilterLogFormatter.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.h
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/DispatchQueueLogFormatter.m
+- platform/iphone/CocoaHTTPServer/Vendor/CocoaLumberjack/Extensions/README.txt
 - platform/iphone/Default-568h@2x.png
 - platform/iphone/Default-667h@2x.png
 - platform/iphone/Default-736h@3x.png
@@ -14944,8 +14990,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: The Rhodes framework is the easiest way to develop NATIVE apps with full

data/lib/commonAPI/mediacapture/ext/platform/android/adds/res/drawable/camera_btn.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:shape="oval">
-    <gradient
-        android:centerX="0.5"
-        android:centerY="0.5"
-        android:startColor="#FFFFFFFF"
-        android:endColor="#FF7777FF"
-        android:gradientRadius="50"
-        android:type="radial" />
-       <size
-        android:width="50dp"
-        android:height="50dp" />
-</shape>

data/lib/commonAPI/mediacapture/ext/platform/android/adds/res/layout/camera_land.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/camera"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <SurfaceView
-        android:id="@+id/previewSurface"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-    </SurfaceView>
-
-    <Button
-        android:id="@+id/cameraButton"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
-        android:layout_gravity="right|center_vertical"
-        android:layout_marginRight="25dp"
-        android:background="@drawable/camera_btn"
-        android:clickable="true" />
-
-</FrameLayout>