rhodes 7.4.1 → 7.5.1

data/platform/android/build/config.yml

@@ -0,0 +1,5 @@
+maven_deps:  
+  - 'androidx.core:core:1.3.2'
+  - 'androidx.lifecycle:lifecycle-common:2.3.1'
+  - 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
+  - 'org.conscrypt:conscrypt-android:2.5.1'

data/platform/android/build/dex_builder.rb

@@ -0,0 +1,88 @@
+require_relative '../../../lib/build/jake.rb'
+require_relative 'hostplatform.rb'
+require 'singleton'
+
+module AndroidTools
+
+    class DexBuilder
+      include Singleton
+
+      attr_accessor :logger, :sdk_path, :build_tools_path, :androidplatform, :javabin
+
+      def build( jarlist = [], outdex )
+        tools_path = detect_tools_path
+
+        bin,args = build_cmd_line(tools_path, jarlist, outdex)
+
+        @logger.debug "BIN: #{bin}, ARGS: #{args}"
+        return false unless bin
+
+        Jake.run(bin,args)
+        $?.success?
+      end
+
+      def detect_tools_path
+        
+        if (@build_tools_path)
+            path = @build_tools_path
+        else
+            path_guess_1 = File.join(@sdk_path, "platforms", @androidplatform, "tools")
+            if (File.directory?(path_guess_1))
+                path = path_guess_1                
+            else
+                path_guess_2 = File.join(@sdk_path, "platform-tools")
+                if (File.directory?(path_guess_2))
+                    path = path_guess_2
+                end
+            end
+
+        end
+
+        path
+      end
+
+        def build_cmd_line(tools_path, jarlist, outdex)
+
+            @logger.error( "DEX builder: path to build tools not set" ) unless @build_tools_path
+
+            @logger.info( "DEX builder: looking for DEX tool in #{@build_tools_path}")
+
+            #try to find dx.jar first
+            dexjar = File.join(@build_tools_path,"lib","dx.jar")
+            if File.file?(dexjar)
+
+                @logger.info( "DEX builder: found dx.jar")
+
+                args = []
+                args << "-Xmx1024m"
+                args << "-jar"
+                args << dexjar
+                args << "--dex"
+                args << "--output=#{outdex}"
+                args.concat jarlist
+
+                return @javabin, args
+                
+            else #then go for d8
+                d8 = File.join(@build_tools_path,"d8"+HostPlatform::bat_ext)                
+                if File.file?(d8)
+                    @logger.info( "DEX builder: found d8")
+
+                    raise "I'm expecting to have output dex named classes.dex for d8 tool but found #{File.basename(outdex)}" if (File.basename(outdex) != 'classes.dex')
+                    
+                    args = []
+                    args << '--output'
+                    args << "#{File.dirname(outdex)}"
+                    #args << '--no-desugaring'
+                    args.concat jarlist
+
+                    return d8, args
+                else
+                    @logger.error( "Can't find proper DEX builder in the build tools")
+                end
+
+                return nil,nil
+            end
+        end
+    end
+end

data/platform/android/build/hostplatform.rb

@@ -23,6 +23,15 @@ module HostPlatform
 	end
 	module_function :exe_ext
 
+	def bat_ext
+		if HostPlatform.windows?
+			'.bat'
+		else
+			''
+		end
+	end
+	module_function :bat_ext
+
 	def num_cpus
 		num = nil
 	 	if HostPlatform.linux?

data/platform/android/build/manifest_generator.rb

@@ -54,6 +54,7 @@ class ManifestGenerator
   
   def addGoogleMaps
     @usesLibraries['com.google.android.maps'] = true 
+    @usesLibraries['org.apache.http.legacy'] = false 
   end
   
   def addGooglePush(erbPath)

data/platform/android/build/maven_deps_extractor.rb

@@ -25,6 +25,8 @@ class MavenDepsExtractor
     @file_deps = []
 
     @rhoroot = File.join( File.dirname(__FILE__),'..','..','..')
+
+    #@m2home = ENV["APPVEYOR_BUILD_WORKER_IMAGE"].nil? ? File.join( @rhoroot, 'res', 'build-tools', 'maven' ) : File.join('C:','PROGRA~2','Apache','Maven')
     @m2home = File.join( @rhoroot, 'res', 'build-tools', 'maven' )
     @mvnbin = File.join( @m2home, 'bin', 'mvn' )
 
@@ -46,7 +48,6 @@ class MavenDepsExtractor
     @jni_libs = []
     @manifests = []
 
-    @have_v4_support_lib = false
 
   end
 
@@ -159,7 +160,6 @@ class MavenDepsExtractor
 
     Dir[File.join(src,'*')].each do |f|
 
-      @have_v4_support_lib = true if ( File.basename(f) =~ /support-v4/ )
 
       if File.extname(f) == '.aar'        
         target = File.join(dst,File.basename(f,'.aar'))
@@ -204,9 +204,9 @@ class MavenDepsExtractor
   def dep_copy_cmd
     argv = []
     argv << @mvnbin
-    argv << 'dependency:copy-dependencies'
+    argv << '"dependency:copy-dependencies"'
 #    argv << '-o' #work offline
-    argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
+    argv << "\"-Dmaven.repo.local=#{File.join(@m2home,'m2')}\""
     argv << '-e' if Rake.application.options.trace
     argv << '-X' if Rake.application.options.trace
   
@@ -236,21 +236,24 @@ class MavenDepsExtractor
 
   def dep_get_cmd(grp_id, art_id, ver, repos)
     argv = []
-    argv << @mvnbin
-    argv << 'dependency:get'
-    argv << "-Dmaven.repo.local=#{File.join(@m2home,'m2')}"
-
-    argv << "-DgroupId=#{grp_id}"
-    argv << "-DartifactId=#{art_id}"
-    argv << "-Dversion=#{ver}"
-    argv << "-DremoteRepositories=#{repos}"
-    argv << "-Dpackaging=pom"
-    argv << "-Ddest=./"
-    argv << "-Dtransitive=false"
-
+    argv << "\"" + @mvnbin + "\""
+    argv << '"dependency:get"'
+    argv << "\"-Dmaven.repo.local=#{File.join(@m2home,'m2')}\""
+
+    argv << "\"-DgroupId=#{grp_id}\""
+    argv << "\"-DartifactId=#{art_id}\""
+    argv << "\"-Dversion=#{ver}\""
+    argv << "\"-DremoteRepositories=#{repos}\""
+    argv << "\"-Dpackaging=pom\""
+    argv << "\"-Ddest=./\""
+    argv << "\"-Dtransitive=false\""
+
+    argv << '-B'
+    argv << '-q'
     argv << '-e' if Rake.application.options.trace
     argv << '-X' if Rake.application.options.trace
 
+
     argv.join(' ')
   end
 
@@ -267,9 +270,10 @@ class MavenDepsExtractor
     Jake.run3( cmd, pwd, env )
     rm pom
 
+    target = File.join(path,'target')
     @logger.debug "Moving extracted dependencies to #{path}"
-    Dir[File.join(path,'target','dependency','*')].each { |f| mv(f,path) }
-    rm_r File.join(path,'target')
+    Dir[File.join(target,'dependency','*')].each { |f| mv(f,path) }
+    rm_r File.join(target) if File.directory?(target)
   end
 
   def split_dependency( dep )
@@ -377,9 +381,6 @@ class MavenDepsExtractor
     @jars.join(separator)
   end
 
-  def have_v4_support_lib?
-    @have_v4_support_lib
-  end
 
 end
 

data/platform/android/build/ndkwrapper.rb

@@ -1,5 +1,8 @@
 require_relative 'hostplatform'
 
+#RTFM first: https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md
+
+
 class NDKWrapper
 
   @root_path = nil
@@ -10,6 +13,16 @@ class NDKWrapper
 
   @gccver = "unknown"  
 
+  #https://android.googlesource.com/platform/ndk/+/ndk-release-r16/docs/UnifiedHeaders.md
+  @@abi_triple = {
+      'arm'   => 'arm-linux-androideabi',
+      'aarch64' => 'aarch64-linux-android',
+      'mips'  => 'mipsel-linux-android',
+      'mips64'=> 'mips64el-linux-android',
+      'x86'   => 'i686-linux-android',
+      'x86_64'=> 'x86_64-linux-android'
+    }
+
   def self.create( ndk_path )
   end
 
@@ -46,30 +59,36 @@ class NDKWrapper
   end
 
   def link_sysroot( api, abi )
-    linkabi = abi == "aarch64" ? "arm64" : abi
-    #locate closest available NDK platform for target API
-    n_api = api.to_i
-    n_api.downto(1) { |i|
-      path = File.join( @root_path, 'platforms', "android-#{i.to_s}", "arch-#{linkabi}" )
 
-      return path if File.directory?(path)
-    }
+    path = nil
+
+    if @rev_major >= 22
+      #look for libs inside toolchain      
+      p = File.join( sysroot_18,'usr','lib',@@abi_triple[abi])      
+      puts "Checking NDK sysroot at: #{p}"
+      path = p if File.directory?(p)
+
+    else
+      linkabi = abi == "aarch64" ? "arm64" : abi
+      #locate closest available NDK platform for target API
+      n_api = api.to_i
+      n_api.downto(1) { |i|
+        path = File.join( @root_path, 'platforms', "android-#{i.to_s}", "arch-#{linkabi}" )
+
+        break if File.directory?(path)
+      }
+    end
+
+    raise "Unable to detect NDK link root for API: #{api}, ABI: #{abi}" unless path
 
-    raise "Unable to detect NDK link root for API: #{api}, ABI: #{abi}"      
+    puts "NDK sysroot detected at: #{path}"
+    return path
   end
 
   def link_sysroot_level_ext( api, abi )
 
-    if @rev_major >= 18
-      triple = {
-        'arm'   => 'arm-linux-androideabi',
-        'aarch64' => 'aarch64-linux-android',
-        'mips'  => 'mipsel-linux-android',
-        'mips64'=> 'mips64el-linux-android',
-        'x86'   => 'i686-linux-android',
-        'x86_64'=> 'x86_64-linux-android'
-      }
-      File.join( sysroot_18, 'usr', 'lib', triple[abi], api.to_s)
+    if @rev_major >= 18      
+      File.join( sysroot_18, 'usr', 'lib', @@abi_triple[abi], api.to_s)
     else
       nil
     end
@@ -89,8 +108,8 @@ class NDKWrapper
     File.join( @root_path, 'sysroot' )
   end
 
-  def toolchain
-    $toolchain
+  def toolchain_name
+    @toolchain_name
   end
 
   def sysroot_18
@@ -169,34 +188,34 @@ class NDKWrapper
       toolchainversions = ['4.8','4.9']
     end
 
-    $toolchain = 'unknown-toolchain'
+    toolchain = 'unknown-toolchain'
     if abi == 'arm'
       if @rev_major >= 18
-        $toolchain = 'armv7a-linux-androideabi'
+        @toolchain_name = 'armv7a-linux-androideabi'
       else
-        $toolchain = 'arm-linux-androideabi'
+        @toolchain_name = 'arm-linux-androideabi'
       end
     elsif abi == 'x86'
       if @rev_major >= 18
-        $toolchain = 'i686-linux-android'
+        @toolchain_name = 'i686-linux-android'
       else
-        $toolchain = 'x86'
+        @toolchain_name = 'x86'
       end
     elsif abi == 'x86_64'
       if @rev_major >= 18
-        $toolchain = 'x86_64-linux-android'
+        @toolchain_name = 'x86_64-linux-android'
       else
-        $toolchain = 'x86_64'
+        @toolchain_name = 'x86_64'
       end
     elsif abi == 'mips'
       if @rev_major >= 18
         raise "Mips not supported!"
       else
-        $toolchain = 'mipsel-linux-android'
+        @toolchain_name = 'mipsel-linux-android'
       end
     elsif abi == 'aarch64'
       if @rev_major >= 18
-        $toolchain = 'aarch64-linux-android'
+        @toolchain_name = 'aarch64-linux-android'
       else
         raise "Aarch64 not supported for this ndk version!"
       end
@@ -213,8 +232,8 @@ class NDKWrapper
         if(@rev_major >= 18)
           variants << File.join(@root_path,'toolchains','llvm','prebuilt',ndkhost)
         else
-          variants << File.join(@root_path,'build','prebuilt',ndkhost,"#{$toolchain}-#{version}")
-          variants << File.join(@root_path,'toolchains',"#{$toolchain}-#{version}",'prebuilt',ndkhost)
+          variants << File.join(@root_path,'build','prebuilt',ndkhost,"#{@toolchain_name}-#{version}")
+          variants << File.join(@root_path,'toolchains',"#{@toolchain_name}-#{version}",'prebuilt',ndkhost)
         end
 
 
@@ -223,13 +242,14 @@ class NDKWrapper
           next unless File.directory? variant
 
           ndktools = variant
-          ndkabi = $toolchain
+          ndkabi = @toolchain_name
           @gccver = version
           
           ndkabi = 'i686-linux-android' if ndkabi == 'x86'
           ndkabi = 'x86_64-linux-android' if ndkabi == 'x86_64'
 
-          puts "Toolchain is detected: #{ndktools}, abi: #{ndkabi}, version: #{@gccver}" if Rake.application.options.trace
+          puts "Toolchain is detected: #{ndktools}, abi: #{ndkabi}, version: #{@gccver}"
+          @toolchain_root = ndktools
 
           tools = {}
           
@@ -244,7 +264,7 @@ class NDKWrapper
     end
 
     if ndktools.nil?
-      raise "Can't detect NDK toolchain path (corrupted NDK installation?)"
+      raise "Can't detect NDK toolchain path (corrupted NDK installation?), toolchain is " + @toolchain_name
     end 
   end
 
@@ -256,12 +276,28 @@ class NDKWrapper
     @rev_major
   end
 
-  def check_tool( tool, ndktoolsdir, abi )
-    if(@rev_major >= 18)
-      abi = 'arm-linux-androideabi' if abi == 'armv7a-linux-androideabi'
+  def select_tool_abi_prefix( tool, abi )
+    prefix = abi
+
+    if (@rev_major >= 22 )
+      prefix = 'llvm'
+    elsif (@rev_major >= 18) 
+      prefix = 'arm-linux-androideabi' if abi == 'armv7a-linux-androideabi'
     end
 
-    toolpath = File.join(ndktoolsdir,'bin',"#{abi}-#{tool}#{HostPlatform.exe_ext}")
+    #is_compiler = ['gcc','g++'].include?(tool)
+    #if is_compiler
+    #else
+    #end
+
+    prefix
+  end
+
+  def check_tool( tool, ndktoolsdir, abi )
+
+    tool_abi_prefix = select_tool_abi_prefix( tool, abi )
+
+    toolpath = File.join(ndktoolsdir,'bin',"#{tool_abi_prefix}-#{tool}#{HostPlatform.exe_ext}")
     if(@rev_major >= 18)
       if (tool == 'gcc')
         toolpath = File.join(ndktoolsdir,'bin',"clang#{HostPlatform.exe_ext}")
@@ -280,20 +316,13 @@ class NDKWrapper
   end
 
   def sysincludes(api,abi)
-    if @rev_major >= 16
-      #https://android.googlesource.com/platform/ndk/+/ndk-release-r16/docs/UnifiedHeaders.md
-      triple = {
-        'arm'   => 'arm-linux-androideabi',
-        'aarch64' => 'aarch64-linux-android',
-        'mips'  => 'mipsel-linux-android',
-        'mips64'=> 'mips64el-linux-android',
-        'x86'   => 'i686-linux-android',
-        'x86_64'=> 'x86_64-linux-android'
-      }
-      if  @rev_major >= 18
-        File.join( sysroot_18, 'usr', 'include', triple[abi])
+    if @rev_major >= 16      
+      if @rev_major >= 22
+        File.join( sysroot_18, 'usr', 'include' )
+      elsif  @rev_major >= 18
+        File.join( sysroot_18, 'usr', 'include', @@abi_triple[abi])
       else
-        File.join( sysroot_16(api,abi), 'usr', 'include', triple[abi])
+        File.join( sysroot_16(api,abi), 'usr', 'include', @@abi_triple[abi])
       end
     else
       nil

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -1523,7 +1523,9 @@ void rho_title_change(const int tabIndex, const char* strTitle) {
 
 // this method called from logging system - loggins system add logmessage to log and also copy it to iOS console by NSLog()
 void rho_ios_log_console_output(const char* message) {
-    NSLog(@"%@", [NSString stringWithUTF8String:message]);
+    NSString* str = [[NSString  alloc] initWithUTF8String:message];
+    NSLog(@"%@", str);
+    [str release];
 }
 
 void rho_startup_logging(const char* message) {

data/platform/iphone/Classes/Camera/PickImageDelegate.h

@@ -100,10 +100,12 @@
     UIPopoverController *popover;
 #endif
     RhoCameraSettings* settings;
+    BOOL isCaptureProcessRunning;
 
 }
 
 @property (retain) RhoCameraSettings* settings;
+@property (atomic) BOOL isCaptureProcessRunning;
 
 
 - (void)imagePickerController:(UIImagePickerController *)picker

data/platform/iphone/Classes/Camera/PickImageDelegate.m

@@ -151,7 +151,7 @@
 
 @implementation PickImageDelegate
 
-@synthesize settings;
+@synthesize settings, isCaptureProcessRunning;
 
 
 -(void) sendCancelCallback {
@@ -517,6 +517,13 @@
 
 - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info
 {
+
+    if (!self.isCaptureProcessRunning) {
+        return;
+    }
+    //NSLog(@"$$$###$$$   didFinishPickingMediaWithInfo");
+    self.isCaptureProcessRunning = NO;
+    
     if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
         NSURL* url = (NSURL*)[info objectForKey:UIImagePickerControllerReferenceURL];
         //const char* cs_url = [[url path] UTF8String];
@@ -538,32 +545,39 @@
             settings.format = CAMERA_SETTINGS_FORMAT_JPG;
         }
     }
+
+    // Remove the picker interface and release the picker object.
+    [picker dismissViewControllerAnimated:NO completion:nil];
+    [picker.view removeFromSuperview];
+    //picker.view.hidden = YES;
+#ifdef __IPHONE_3_2
+    [popover dismissPopoverAnimated:YES];
+#endif
+    [picker release];
+
     UIImage* image = (UIImage*)[info objectForKey:UIImagePickerControllerEditedImage];
     if (image == nil) {
         image = (UIImage*)[info objectForKey:UIImagePickerControllerOriginalImage];
     }
-    if (image != nil) {     
-        [self useImage:image];
+    if (image != nil) {
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            [self useImage:image];
+        });
     }
     else {
         //rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
-        [self sendCancelCallback];
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            [self sendCancelCallback];
+        });
     }
-    // Remove the picker interface and release the picker object. 
-    [picker dismissViewControllerAnimated:YES completion:nil];
-    [picker.view removeFromSuperview];
-	//picker.view.hidden = YES;
-    [picker release];
-#ifdef __IPHONE_3_2
-    [popover dismissPopoverAnimated:YES];
-#endif
 }
 
 
 - (void)imagePickerController:(UIImagePickerController *)picker 
 		didFinishPickingImage:(UIImage *)image 
 		editingInfo:(NSDictionary *)editingInfo 
-{ 
+{
+    //NSLog(@"$$$###$$$   didFinishPickingImage");
     if (settings.format == CAMERA_SETTINGS_FORMAT_NOT_SETTED) {
         settings.format = CAMERA_SETTINGS_FORMAT_JPG;
     }
@@ -573,7 +587,7 @@
     //it (along with the crop rectangle) from the dictionary in the editingInfo parameter. 
     [self useImage:image]; 
     // Remove the picker interface and release the picker object. 
-    [picker dismissViewControllerAnimated:YES completion:nil];
+    [picker dismissViewControllerAnimated:NO completion:nil];
     [picker.view removeFromSuperview];
 	//picker.view.hidden = YES;
     [picker release];
@@ -584,19 +598,27 @@
 
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker 
 { 
-    // Notify view about cancel
-    //rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
-    [self sendCancelCallback];
-    
-    // Remove the picker interface and release the picker object. 
-    [picker dismissViewControllerAnimated:YES completion:nil]; 
+    if (!self.isCaptureProcessRunning) {
+        return;
+    }
+    self.isCaptureProcessRunning = NO;
+    // Remove the picker interface and release the picker object.
+    [picker dismissViewControllerAnimated:YES completion:nil];
     [picker.view removeFromSuperview];
-	//picker.view.hidden = YES;
-    [picker release]; 
+    //picker.view.hidden = YES;
 #ifdef __IPHONE_3_2
     [popover dismissPopoverAnimated:YES];
 #endif
-} 
+    [picker release];
+
+
+    // Notify view about cancel
+    //rho_rhodesapp_callCameraCallback([postUrl UTF8String], "", "", 1);
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self sendCancelCallback];
+    });
+    
+}
 
 #ifdef __IPHONE_3_2
 // UIPopoverControllerDelegate implementation

data/platform/iphone/Classes/CocoaServer/CCocoaServer.h

@@ -0,0 +1,27 @@
+
+#import <Foundation/Foundation.h>
+#import "HTTPServer.h"
+
+
+
+
+@interface CCocoaServer : NSObject {
+
+    HTTPServer *httpServer;
+    
+}
+
++ (CCocoaServer*)sharedInstance;
+
+
+-(id)init;
+-(void)start;
+-(void)stop;
+
+
+
+-(void) createServer;
+
+@end
+
+