rhodes 7.4.1 → 7.6.0

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}"      
+    raise "Unable to detect NDK link root for API: #{api}, ABI: #{abi}" unless path
+
+    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,40 @@ 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 get_llvm_stl_path( arch )
+    if @rev_major <= 24
+      arch = 'arm64-v8a' if arch == "aarch64"
+      localabi = arch
+      localabi = "armeabi-v7a" if arch == "armeabi"
+      File.join(@root_path, "sources", "cxx-stl", "llvm-libc++", "libs", localabi, "libc++_shared.so")
+    else
+      arch = "arm" if arch == "armeabi"
+      File.join(@root_path, "toolchains", "llvm", "prebuilt", "darwin-x86_64", "sysroot", "usr", "lib", @@abi_triple[arch], "libc++_shared.so")
+    end
+  end
+
+  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 +328,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/android/proguard/proguard-base-rules.pro

@@ -613,3 +613,8 @@ public static final android.os.Parcelable$Creator *;
 -dontwarn android.support.design.internal.**
 -dontwarn com.google.android.gms.**
 -dontwarn android.support.v4.**
+
+-keep public class androidx.**
+-keep public class kotlin.**
+-dontwarn androidx.**
+-dontwarn kotlin.**

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
+
+

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

@@ -0,0 +1,107 @@
+
+#import "CCocoaServer.h"
+#import "RhoHTTPConnection.h"
+
+
+#import "DDLog.h"
+#import "DDTTYLogger.h"
+
+
+extern int rho_http_get_port();
+extern const char* rho_http_direct_request( const char* method, const char* uri, const char* query, const void* headers, const char* body, int bodylen, int* responseLength );
+extern void rho_http_free_response( const char* data );
+
+extern void* rho_http_init_headers_list();
+extern void rho_http_add_header( void* list, const char* name, const char* value );
+extern void rho_http_free_headers_list( void* list );
+
+static const int ddLogLevel = LOG_LEVEL_VERBOSE;
+
+
+static CCocoaServer* ourSharedInstance = nil;
+
+@implementation CCocoaServer
+
++ (CCocoaServer*)sharedInstance {
+    if (ourSharedInstance == nil) {
+        ourSharedInstance = [[CCocoaServer alloc] init];
+    }
+    return ourSharedInstance;
+}
+
+-(id)init {
+    self = [super init];
+    httpServer = nil;
+    return self;
+}
+
+-(void) createServer {
+    NSLog(@"$$$$$ HTTP SERVER CREATE()");
+
+    [DDLog addLogger:[DDTTYLogger sharedInstance]];
+
+    httpServer = [[HTTPServer alloc] init];
+    [httpServer setType:@"_http._tcp."];
+    [httpServer setPort:rho_http_get_port()]; // setup port
+    [httpServer setInterface:@"localhost"]; // accept only inner connections
+    [httpServer setConnectionClass:[RhoHTTPConnection class]]; // replace connection for replace responce functionlity
+}
+
+-(void)start{
+    
+    if (httpServer == nil) {
+        NSLog(@"$$$$$ HTTP SERVER START() - NO SERVER !");
+        return;
+    }
+    NSLog(@"$$$$$ HTTP SERVER START()");
+
+    NSError *error;
+    
+    if (![httpServer isRunning]) {
+        if([httpServer start:&error])
+        {
+            NSLog(@"Started HTTP Server on port %hu", [httpServer listeningPort]);
+        }
+        else
+        {
+            NSLog(@"Error starting HTTP Server: %@", [error localizedDescription]);
+        }
+    }
+}
+
+
+
+-(void)stop {
+    if (httpServer == nil) {
+        NSLog(@"$$$$$ HTTP SERVER STOP() - NO SERVER !");
+
+        return;
+    }
+    NSLog(@"$$$$$ HTTP SERVER STOP()");
+
+    if ([httpServer isRunning]) {
+        [httpServer stop];
+    }
+}
+
+
+@end
+
+
+
+
+void rho_cocoa_server_init() {
+    CCocoaServer* server = [CCocoaServer sharedInstance];
+    [server createServer];
+    [server start];
+}
+
+void rho_cocoa_server_stop() {
+    CCocoaServer* server = [CCocoaServer sharedInstance];
+    [server stop];
+}
+
+void rho_cocoa_server_start() {
+    CCocoaServer* server = [CCocoaServer sharedInstance];
+    [server start];
+}

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

@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+#import "HTTPConnection.h"
+
+
+
+@interface RhoHTTPConnection : HTTPConnection
+{
+    UInt64         mBodyLen;
+    NSMutableData* mBody;
+    NSData* mResponseData;
+}
+
+- (void)replyToHTTPRequest;
+
+@end
+