rhodes 7.5.1 → 7.6.0

data/platform/android/build/android.rake

@@ -37,6 +37,7 @@ require File.dirname(__FILE__) + '/../../../lib/build/BuildConfig'
 
 require_relative 'dex_builder'
 require_relative 'build_tools_finder'
+require_relative 'ndkwrapper'
 
 load File.dirname(__FILE__) + '/android-repack.rake'
 require 'pathname'
@@ -62,8 +63,8 @@ JAVA_PACKAGE_NAME = 'com.rhomobile.rhodes'
 # For complete list of android API levels and its mapping to
 # market names (such as "Android-1.5" etc) see output of
 # command "android list targets"
-ANDROID_MIN_SDK_LEVEL = 21 #21 is the minimum API that supports arm64
-ANDROID_SDK_LEVEL = 31
+ANDROID_MIN_SDK_LEVEL = 26 #21 is the minimum API that supports arm64
+ANDROID_SDK_LEVEL = 32
 
 ANDROID_PERMISSIONS = {
     'audio' => ['RECORD_AUDIO', 'MODIFY_AUDIO_SETTINGS'],
@@ -80,7 +81,8 @@ ANDROID_PERMISSIONS = {
     'read_sdcard' => 'READ_EXTERNAL_STORAGE',
     'push' => nil,
     'shared_runtime' => nil,
-    'hardware_acceleration' => nil
+    'hardware_acceleration' => nil,
+    'install_packages' => 'REQUEST_INSTALL_PACKAGES'
 }
 
 ANDROID_CAPS_ALWAYS_ENABLED = ['network_state']
@@ -557,25 +559,35 @@ def get_case_insensetive_property(property)
   return nil
 end
 
-def select_aapt2
+def select_aapt2(build_tools_path)
 
-  platform_dir = ''
-  
-  if OS.windows?
-    platform_dir = 'windows'
-  elsif OS.mac?
-    platform_dir = 'osx'
-  elsif OS.linux?
-    platform_dir = 'linux'
+  aapt2 = nil
+
+  buildToolsVerMajor = $build_tools_ver&.split('.')[0].to_i
+  if ( buildToolsVerMajor >= 34 )
+    aapt2 = File.join(build_tools_path,'aapt2'+$exe_ext)
   else
-    raise "unknown host OS"
-  end  
+    platform_dir = ''
+    
+    if OS.windows?
+      platform_dir = 'windows'
+    elsif OS.mac?
+      platform_dir = 'osx'
+    elsif OS.linux?
+      platform_dir = 'linux'
+    else
+      raise "unknown host OS"
+    end  
 
-  File.join($startdir, "res", "build-tools", "aapt2", platform_dir , 'aapt2'+$exe_ext)
+    aapt2 = File.join($startdir, "res", "build-tools", "aapt2", platform_dir , 'aapt2'+$exe_ext)
+  end
+
+  $logger.debug( "AAPT2 path is: #{aapt2}")
+  return aapt2
 end
 
 
-def init_aapt2_helper
+def init_aapt2_helper( build_tools_path )
   helper = Aapt2Helper.instance
 
   helper.logger = $logger
@@ -589,7 +601,7 @@ def init_aapt2_helper
   helper.androidjar = $androidjar
   helper.manifest = $appmanifest
 
-  helper.aapt2 = select_aapt2
+  helper.aapt2 = select_aapt2(build_tools_path)
   helper.bundletool = $bundletool
   helper.javabin = File.join( $java, 'java' + $exe_ext )
   helper.rjava_dir = $app_rjava_dir
@@ -602,6 +614,29 @@ def init_aapt2_helper
 end
 
 namespace "config" do
+
+  namespace "android" do
+    task :enable_custom_manifest => 'config:load' do
+      
+      unless $app_config['android']&.[]('manifest_template')
+
+        default_manifest_file = File.join $startdir, 'res', 'generators', 'templates', 'application', 'AndroidManifest.erb'
+        
+        custom_manifest_file = File.join($app_path,'AndroidManifest.erb')
+        
+        cp default_manifest_file, custom_manifest_file
+
+        $app_config['android']['manifest_template'] = 'AndroidManifest.erb'
+
+        buildyml = File.join( $app_path, 'build.yml' )
+        cp buildyml,buildyml+'.bak'
+
+        File.open(buildyml, 'w') {|f| f.write $app_config.to_yaml }
+
+      end
+    end
+  end
+
   task :set_android_platform do
     $current_platform = "android"
   end
@@ -1014,7 +1049,7 @@ namespace "config" do
     mkdir_p $targetdir if not File.exists? $targetdir
     mkdir_p $srcdir if not File.exists? $srcdir
 
-    init_aapt2_helper
+    init_aapt2_helper build_tools_path
 
     print_timestamp('config:android FINISH')
 
@@ -1055,6 +1090,11 @@ namespace "config" do
       $app_extensions_list.each do |ext, extpath|
         next if extpath.nil?
 
+        # com.android.ndk.thirdparty:openssl:1.1.1 openssl.so and openssl.so - obsolete
+        if ext == 'openssl.so'
+          next
+        end
+
         puts "#{extpath} is configuring..."
         extyml = File.join(extpath, "ext.yml")
         if File.file? extyml
@@ -1255,14 +1295,14 @@ namespace "config" do
           end
         end
 
-        preload_java_classes.push(*extconf_android["preload_java_classes"]) if (extconf_android && extconf_android["preload_java_classes"])
+        preload_java_classes.push(extconf_android["preload_java_classes"]) if (extconf_android && extconf_android["preload_java_classes"])
 
         puts "#{extpath} is configured"
       end # $app_extensions_list.each
 
       mkdir_p(File.join( $tmpdir, "include" ) )
       File.open( File.join( $tmpdir, "include", "rhojava_extra.inc" ), "w" ) { |f|
-        preload_java_classes.each { |cls| f.puts( "\"#{cls}\"," ) }
+        preload_java_classes.each { |cls| f.puts( "RHODES_DEFINE_JAVA_CLASS(#{cls[0]}, \"#{cls[1]}\")") }
       }
 
       puts "Extensions' java source lists: #{$ext_android_additional_sources.inspect}"
@@ -1425,14 +1465,22 @@ namespace "build" do
       unless $app_config['android']&.[]('barcode_engine').nil?
         engine = $app_config['android']['barcode_engine']
         case engine
+        when 'google'
+          ENV["BARCODE_ENGINE"] = 'google'
         when 'zxing'
           ENV["BARCODE_ENGINE"] = 'zxing'
+        when 'google'
+          ENV["BARCODE_ENGINE"] = 'google'
         else
           raise 'Only supported barcode engines are: google(default) and zxing'
         end
       end
       
       $ext_android_build_scripts.each do |ext, builddata|
+        # com.android.ndk.thirdparty:openssl:1.1.1 extension openssl.so - obsolete
+        if ext == 'openssl.so'
+          next
+        end
 
         puts "Building #{ext}: #{builddata.inspect}"
 
@@ -1625,29 +1673,6 @@ namespace "build" do
       print_timestamp('build:android:libsqlite FINISH')
     end
 
-    #not real build, just copy existing .so to build dir
-    task :libopenssl => "config:android" do
-
-      skip = ($app_config['extensions'].index('openssl.so') || $app_config['extensions'].index('openssl'))    
-      next if skip
-
-      print_timestamp('build:android:libopenssl START')
-
-      libdir = File.join($app_builddir, 'openssl')
-      mkdir_p libdir unless File.directory? libdir
-
-      src_dir = "#{$shareddir}/../../lib/extensions/openssl.so/ext/android"
-
-      $abis.each do |abi|
-        realabi = abi
-        realabi = 'armeabi' if abi == 'arm'
-        mkdir_p File.join(libdir, realabi) unless File.directory? File.join(libdir, realabi)
-        cp_r File.join(src_dir, realabi, "libopenssl.so.a"), File.join(libdir, realabi, "libopenssl.a")
-      end
-
-      LibBuilder.results['openssl'] = libdir
-    end
-
     task :libcurl => "config:android" do
       print_timestamp('build:android:libcurl START')
       # Steps to get curl_config.h from fresh libcurl sources:
@@ -1815,8 +1840,7 @@ namespace "build" do
       :librhocommon, 
       :librhomain, 
       :librhosync, 
-      :librholog, 
-      :libopenssl
+      :librholog
     ]
 
     task :genconfig => "config:android" do
@@ -1900,6 +1924,12 @@ namespace "build" do
         next
       end
       srcdir = File.join $androidpath, "Rhodes", "jni", "src"
+      openssl_include = File.join AndroidTools::MavenDepsExtractor.instance.prefab_dirs[0], "modules", "crypto", "include"
+
+      # maven dependency com.android.ndk.thirdparty:openssl:1.1.1
+      openssl_crypto_lib = File.join AndroidTools::MavenDepsExtractor.instance.prefab_dirs[0], "modules", "crypto", "libs"
+      openssl_ssl_lib = File.join AndroidTools::MavenDepsExtractor.instance.prefab_dirs[0], "modules", "ssl", "libs"
+      abi_prefab_target_dirs = { "arm" => "android.armeabi-v7a", "aarch64" => "android.arm64-v8a", "x86" => "android.x86", "armeabi-v7a" => "android.armeabi-v7a", "x86_64" => "android.x86_64" }
 
       args = []
       args << "-I\"#{$appincdir}\""
@@ -1912,7 +1942,8 @@ namespace "build" do
       args << "-I\"#{$shareddir}/curl/include\""
       args << "-I\"#{$shareddir}/ruby/include\""
       args << "-I\"#{$shareddir}/ruby/android\""
-      args << "-I\"#{$shareddir}/../../lib/extensions/openssl.so/ext/sources/include\""
+      # maven dependency com.android.ndk.thirdparty:openssl:1.1.1
+      args << "-I\"#{openssl_include}\""
       args << "-I\"#{$coreapidir}\""
       args << "-I\"#{File.join($tmpdir,"include")}\""
 
@@ -1938,6 +1969,10 @@ namespace "build" do
         rlibs << "z"
         rlibs << "stdc++"
 
+        # maven dependency com.android.ndk.thirdparty:openssl:1.1.1
+        rlibs << "crypto"
+        rlibs << "ssl"
+
         rlibs.map! { |x| "-l#{x}" }
 
         realabi = abi
@@ -1949,6 +1984,9 @@ namespace "build" do
           args << "-L\"#{File.dirname(lib)}\""
         end
 
+        # maven dependency com.android.ndk.thirdparty:openssl:1.1.1
+        args << "-L\"#{File.join(openssl_crypto_lib, abi_prefab_target_dirs[abi])}\""
+        args << "-L\"#{File.join(openssl_ssl_lib, abi_prefab_target_dirs[abi])}\""
        
         deps = []
         libs = []
@@ -2041,6 +2079,10 @@ namespace "build" do
           end
 
           if cap_item.is_a? String
+
+            if $target_sdk_level >= 30 && cap_item == 'WRITE_EXTERNAL_STORAGE' || cap_item == 'READ_EXTERNAL_STORAGE'
+              usesPermissions << "android.permission.MANAGE_EXTERNAL_STORAGE"
+            end
             usesPermissions << "android.permission.#{cap_item}"
             next
           end
@@ -2049,8 +2091,14 @@ namespace "build" do
       usesPermissions.uniq!
 
       hidden = get_boolean($app_config['hidden_app'])
+      home_app = false
+      if $app_config['android'] != nil
+          if $app_config['android']['home_app'] != nil
+              home_app = $app_config['android']['home_app']
+          end
+      end
 
-      generator = ManifestGenerator.new JAVA_PACKAGE_NAME, $app_package_name, hidden, usesPermissions
+      generator = ManifestGenerator.new JAVA_PACKAGE_NAME, $app_package_name, hidden, home_app, usesPermissions
 
       generator.versionName = $app_config["version"]
       generator.versionCode = version
@@ -2202,15 +2250,16 @@ namespace "build" do
       Dir.glob($app_builddir + "/**/lib*.so").each do |lib|
         arch = File.basename(File.dirname(lib))
         file = File.basename(lib)
+
+        ndkwrapper = NDKWrapper.new($androidndkpath)
+        llvm_stl = ndkwrapper.get_llvm_stl_path(arch)
         arch = 'arm64-v8a' if arch == "aarch64"
         cp_r lib, File.join($applibs,arch,file)
-        
-        localabi = arch
-        localabi = "armeabi-v7a" if arch == "armeabi"
-        llvm_stl = File.join($androidndkpath, "sources", "cxx-stl", "llvm-libc++", "libs", localabi, "libc++_shared.so")
+
         if File.exists? llvm_stl
           cp_r llvm_stl, File.join($applibs,arch)
         end
+
       end
       $ext_android_additional_lib.each do |lib|
         arch = File.basename(File.dirname(lib))
@@ -2218,6 +2267,23 @@ namespace "build" do
         cp_r lib, File.join($applibs,arch,file)
       end
 
+      abi_prefab_alter_names = { "android.armeabi-v7a" => "arm", "android.arm64-v8a" => "aarch64", "android.x86" => "x86", "armeabi-v7a" => "arm", "android.x86_64" => "x86_64" }
+      abi_prefab_target_dirs = { "android.armeabi-v7a" => "armeabi", "android.arm64-v8a" => "arm64-v8a", "android.x86" => "x86", "armeabi-v7a" => "armeabi", "android.x86_64" => "x86_64" }
+      android_prefab_dir = AndroidTools::MavenDepsExtractor.instance.prefab_dirs
+      android_prefab_dir.each do |dir|
+        Dir.glob(dir + "/**/lib*.so").each do |lib|
+          arch = File.basename(File.dirname(lib))
+          if !$abis.include?(abi_prefab_alter_names[arch])
+            next
+          end
+          arch = abi_prefab_target_dirs[arch]
+          file = File.basename(lib)
+          if Dir.exists? File.join($applibs,arch)
+            cp_r lib, File.join($applibs,arch,file)
+          end
+        end
+      end
+
       abi_alter_names = { "armeabi" => "arm", "arm64-v8a" => "aarch64", "x86" => "x86", "armeabi-v7a" => "arm", "x86_64" => "x86_64" }
       if !$rhodes_as_lib
         $android_jni_libs = AndroidTools::MavenDepsExtractor.instance.jni_libs
@@ -2876,6 +2942,7 @@ def create_bundle()
 
   apk = File.join($targetdir,"#{$appname}-universal.apk")
   apks = File.join($targetdir,"#{$appname}.apks")
+  rm apks if File.file? apks
   Jake.run( $javabin, ["-jar", $bundletool, "build-apks","--bundle=#{signed_bundle}", "--output=#{apks}", "--mode=universal"] )
   rm apk if File.file? apk
   Zip::File.open(apks) { |zip|

data/platform/android/build/android_tools.rb

@@ -912,7 +912,7 @@ module_function :read_manifest_package
   def generateKeystore( keystore, storealias, storepass, keypass )
     @@logger.info "Generating private keystore..."
     
-    mkdir_p File.dirname($keystore) unless File.directory? File.dirname($keystore)
+    mkdir_p File.dirname(keystore) unless File.directory? File.dirname(keystore)
 
     args = []
     args << "-genkey"

data/platform/android/build/androidcommon.rb

@@ -153,18 +153,24 @@ def cpp_def_args
       args << "-std=c++11"
     else
       args << "-stdlib=libc++"
+      #args << "-std=c++17"
     end
 
     args << "-Wno-reorder"
-    #args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','stlport','stlport')}\""
-    args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include')}\""
-    args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include','backward')}\""
+
+    if($ndk_rev_major < 18)
+      args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include')}\""
+      args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'include','backward')}\""
     
-    dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi','include')
-    if !File.directory?(dirArmeabi)
-      dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi-v7a','include')
+      dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi','include')
+      if !File.directory?(dirArmeabi)
+         dirArmeabi = File.join($androidndkpath,'sources','cxx-stl','gnu-libstdc++',$ndkgccver,'libs','armeabi-v7a','include')
+      end
+      args << "-I\"#{dirArmeabi}\""
+    else
+      #args << "-I\"#{File.join($androidndkpath,'sources','cxx-stl','llvm-libc++','include')}\""
     end
-    args << "-I\"#{dirArmeabi}\""
+
     args
 end
 

data/platform/android/build/config.yml

@@ -1,5 +1,8 @@
 maven_deps:  
-  - 'androidx.core:core:1.3.2'
+  - 'androidx.core:core:1.6.0'
+  - 'androidx.core:core-ktx:1.6.0'
   - 'androidx.lifecycle:lifecycle-common:2.3.1'
   - 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
   - 'org.conscrypt:conscrypt-android:2.5.1'
+  - 'com.android.ndk.thirdparty:openssl:1.1.1q-beta-1'
+  - 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'

data/platform/android/build/manifest_generator.rb

@@ -23,11 +23,11 @@ class ManifestGenerator
   attr_accessor :buildToolsVer
   attr_accessor :androidVerMaj
   attr_accessor :androidVerMin
-  
+
   attr_accessor :manifestManifestAdds
   attr_accessor :applicationManifestAdds
-  
-  def initialize(javaPackage, appPackage, hidden, permissions, features = {})
+
+  def initialize(javaPackage, appPackage, hidden, home_app, permissions, features = {})
     @javaPackageName = javaPackage
     @appPackageName = appPackage
     @permissions = {}
@@ -41,7 +41,11 @@ class ManifestGenerator
     @rhodesActivityIntentFilters = []
     @rhodesActivityIntentFilters << {:act=>'android.intent.action.VIEW', :cat=>['android.intent.category.DEFAULT', 'android.intent.category.BROWSABLE']}
     unless hidden
-      @rhodesActivityIntentFilters << {:act=>'android.intent.action.MAIN', :cat=>['android.intent.category.DEFAULT', 'android.intent.category.LAUNCHER']}
+      categors = ['android.intent.category.DEFAULT','android.intent.category.LAUNCHER']
+      if home_app
+          categors << 'android.intent.category.HOME'
+      end
+      @rhodesActivityIntentFilters << {:act=>'android.intent.action.MAIN', :cat=>categors}
     end
     @screenOrientation = 'unspecified'
     @debuggable = 'false'
@@ -51,21 +55,21 @@ class ManifestGenerator
     @applicationManifestAdds = []
     @apikey = ''
   end
-  
+
   def addGoogleMaps
     @usesLibraries['com.google.android.maps'] = true 
     @usesLibraries['org.apache.http.legacy'] = false 
   end
-  
+
   def addGooglePush(erbPath)
     @permissions["#{@appPackageName}.permission.C2D_MESSAGE"] = 'signature'
     @usesPermissions << "#{@appPackageName}.permission.C2D_MESSAGE"
     @usesPermissions << 'com.google.android.c2dm.permission.RECEIVE'
     @applicationManifestAdds << erbPath
   end
-    
-  
-  
+
+
+
   def addUriParams(scheme, host, pathPrefix = nil)
     @rhodesActivityIntentFilters.each do |filter|
       if filter[:act] == 'android.intent.action.VIEW' && filter[:cat] == ['android.intent.category.DEFAULT', 'android.intent.category.BROWSABLE']
@@ -76,7 +80,7 @@ class ManifestGenerator
       end
     end
   end
-  
+
   def makeIntentFilter(filterHash)
     filter = REXML::Element.new 'intent-filter'
     filter.add_element('action', 'android:name'=>filterHash[:act]) if filterHash[:act]

data/platform/android/build/maven_deps_extractor.rb

@@ -47,7 +47,7 @@ class MavenDepsExtractor
     @asset_dirs = []
     @jni_libs = []
     @manifests = []
-
+    @prefab_dirs = []
 
   end
 
@@ -118,6 +118,10 @@ class MavenDepsExtractor
     @dependencies
   end
 
+  def prefab_dirs
+    @prefab_dirs
+  end
+
   def set_temp_dir( d )
     raise "Maven extractor directory was already set to #{@temp_dir}" if @temp_dir
 
@@ -177,6 +181,7 @@ class MavenDepsExtractor
           libs = File.join(target,'libs')
           jni = File.join(target,'jni')
           classes = File.join(target,'classes.jar')
+          prefab = File.join(target,'prefab')
 
           @asset_dirs << assets if (File.directory?(assets) and !Dir[File.join(assets,'*')].empty? )
           @manifests << manifest if File.file?(manifest) and File.size?(r_txt)
@@ -184,6 +189,7 @@ class MavenDepsExtractor
           @jars += Dir[File.join(libs,'*.jar')]
           @jars << classes if File.file?(classes)
           @jni_libs += Dir[(File.join(jni,'**','*.so'))]
+          @prefab_dirs << prefab if (File.directory?(prefab) and !Dir[File.join(prefab,'**')].empty? )
 
         end
       elsif File.extname(f) == '.jar'

data/platform/android/build/ndkwrapper.rb

@@ -276,6 +276,18 @@ class NDKWrapper
     @rev_major
   end
 
+  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
 

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/RhoAppBaseLib-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

data/platform/iphone/Classes/RhoAppBaseStandaloneLib-Bridging-Header.h

@@ -0,0 +1,4 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+

data/platform/iphone/Classes/RhoCryptAESGCM.swift

@@ -0,0 +1,105 @@
+//
+//  RhoCryptAESGCM.swift
+//  RhoAppBaseLib
+//
+//  Created by Dmitry Soldatenkov on 13.04.2023.
+//
+
+import Foundation
+import os
+import CryptoKit
+
+
+@objc(RhoCryptAESGCM)
+public class RhoCryptAESGCM : NSObject {
+    
+    
+    @objc(generate_new_key)
+    public func generate_new_key() -> Data? {
+        if #available(iOS 13.0, *) {
+            let key = SymmetricKey(size: .bits256)
+            let key_data = key.withUnsafeBytes { Data(Array($0)) }
+            return key_data
+        }
+        return nil;
+    }
+    
+    @objc(encrypt_page::)
+    public func encrypt_page(page : Data, key : Data) -> Data? {
+        
+        if #available(iOS 13.0, *) {
+            let data_to_encrypt : Data = page.subdata(in: 0 ..< (page.count-32) )
+            let symm_key = SymmetricKey(data: key)
+            
+            // encrypt
+            do {
+            
+                let sealedBox = try AES.GCM.seal(data_to_encrypt, using: symm_key)
+                
+                //
+                var result_data : Data = sealedBox.ciphertext
+                let nonce_data : Data = Data(sealedBox.nonce)
+                let tag_data : Data = sealedBox.tag
+                
+                let random_4_bytes_data : Data = Data((0 ..< 4).map { _ in UInt8.random(in: UInt8.min ... UInt8.max) })
+                
+                result_data.append(nonce_data)
+                result_data.append(random_4_bytes_data)
+                result_data.append(tag_data)
+
+                return result_data
+            }
+            catch {
+                return nil
+            }
+
+        }
+        else {
+            return nil
+        }
+        
+    }
+    
+    @objc(decrypt_page::)
+    public func decrypt_page(page : Data, key : Data) -> Data? {
+        
+        
+        if #available(iOS 13.0, *) {
+            
+            do {
+                let data_to_decrypt : Data = page.subdata(in: 0 ..< (page.count-32) )
+                
+                let nonce_data : Data = page.subdata(in: (page.count-32) ..< (page.count-32+12))
+                let tag_data : Data = page.subdata(in: (page.count-16) ..< (page.count))
+                
+                let nonce : AES.GCM.Nonce = try AES.GCM.Nonce(data: nonce_data)
+                let symm_key = SymmetricKey(data: key)
+                
+                
+                
+                let sealedBoxRestored = try AES.GCM.SealedBox(nonce: nonce, ciphertext: data_to_decrypt, tag: tag_data)
+                let result_data : Data = try AES.GCM.open(sealedBoxRestored, using: symm_key)
+                
+                return result_data
+            }
+            catch {
+                return nil
+            }
+        }
+        else {
+            return nil
+        }
+        
+    }
+    
+    
+    @objc(is_aes_gcm_available)
+    public func is_aes_gcm_available() -> Bool {
+        if #available(iOS 13.0, *) {
+            return true
+        }
+        return false
+    }
+    
+}
+    

data/platform/iphone/Classes/RhoUIWebView.h

@@ -50,7 +50,7 @@
 
 // UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer;
 
 - (void)loadRequest:(NSURLRequest *)request;
 

data/platform/iphone/Classes/RhoUIWebView.m

@@ -108,7 +108,7 @@
 
 //UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script {
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer{
     return [webview stringByEvaluatingJavaScriptFromString:script];
 }
 

data/platform/iphone/Classes/RhoWKWebView.h

@@ -50,7 +50,7 @@
 
 // UIWebView
 
-- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
+- (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script wantAnswer:(BOOL)wantAnswer;
 
 - (void)loadRequest:(NSURLRequest *)request;