rhodes 7.4.1 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 43f0cb24d9b4bc90ae296b771c8f11db34b6ba05
-  data.tar.gz: da7f51bbf2043b713862d144b4d2181a2b2aa817
+SHA256:
+  metadata.gz: 7af07706b4bd3b1bc920e413e23a92e35e7e97a89ee20d8b89082b23b12124a2
+  data.tar.gz: a98e541aa0cc59dee93ee1d49dbecf6eb8aa50cfafa56573d07c442bc51b11cc
 SHA512:
-  metadata.gz: a28711656f80ee9ee6d35a375755d35e7529c773e4d37c5ae122ecdd75e4119c792c2ff4d8b72bc4e4182f136fe2cf31fe9a323ffc1aa42f25475dc4d261a16b
-  data.tar.gz: 16cb997336dc241454426e0630e7bd8a87b6044bd4c832b8e392229b5ab71cee8f254f60088579de45593d1e322d3a8240a3a48fbc4d5fc148ec58d6860ea162
+  metadata.gz: 207190b03c514b89222e71ff9633f1c7c1b60adc4b4f8dfcce2d6b465374e9dcde193a9f60a02fb484d306e7bb69f5e158c43c887f6438d970e3e9fce73941b0
+  data.tar.gz: 2b39d62c30c75909826719ca8c67000ba21333cb5babe782072d427709071571152480d735d361b85e8e012761795d657d95b37247c311349a7c6ec1bef9cdb6

data/CREDITS

@@ -2227,4 +2227,6 @@ Rhodes contains code from the following other projects:
 
  JXcore (https://github.com/jxcore/jxcore)
  License: MIT-Style (https://github.com/jxcore/jxcore/blob/master/JXCORE_LICENSE)
- 
+
+ CocoaHTTPServer (https://github.com/robbiehanson/CocoaHTTPServer)
+ License: BSD-style (https://github.com/robbiehanson/CocoaHTTPServer/blob/master/LICENSE.txt)

data/LICENSE

@@ -2,7 +2,7 @@
 
 Copyright (c) 2008-2010 Rhomobile, Inc.
 Copyright (c) 2011-2016 Symbol Technologies LLC
-Copyright (c) 2016-2020 Tau Technologies, Inc.
+Copyright (c) 2016-2022 Tau Technologies, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://dev.azure.com/TauPlatform/rhodes/_apis/build/status/rhomobile.rhodes?branchName=master)](https://dev.azure.com/TauPlatform/rhodes/_build/latest?definitionId=1&branchName=master)
+
 [![Build Status](https://travis-ci.org/rhomobile/rhodes.svg?branch=master)](https://travis-ci.org/rhomobile/rhodes)
 
 [![Build status](https://ci.appveyor.com/api/projects/status/4c1uqndnfau9c8hq/branch/master?svg=true)](https://ci.appveyor.com/project/alex-epifanoff/rhodes/branch/master)
@@ -5,7 +7,7 @@
 # Current state of Rhomobile solution
 
 Currently Rhomobile solution supported and improved by TAU Technologies Inc (partner of Zebra Technologies).
-For questions on commercial support contact [contact mail](mailto:info@tau-platform.com) or reach out to the [TAU Technologies website](http://www.tau-platform.com).
+For questions on commercial support contact [contact mail](mailto:info@tau-platform.com) or reach out to the [TAU Technologies website](http://tau-platform.com).
 
 Current actual version is Rhomobile Suite 7.0. [Download RMS 7.0](http://tau-platform.com/developers/downloads/)
 

data/Rakefile

@@ -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/SECURITY.md

@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 7.4.x   | :white_check_mark: |
+| 7.3.x   | :white_check_mark: |
+| 7.2.x   | :white_check_mark: |
+| 7.1.x   | :white_check_mark: |
+| < 7.1   | :x:                |
+
+## Reporting a Vulnerability
+
+Ways to submit a support request or security issue:
+
+1. Github issue.
+2. Zendesk ( for paid customers ): https://tautechnologies.zendesk.com/
+3. Community forums: https://forums.tau-platform.com

data/appveyor.yml

@@ -94,8 +94,6 @@ environment:
       target_artefact_path: C:\TAU\RMS-Testing\auto\feature_def\framework_spec\bin\target\win32\
       #target_artefact_file_name: framework_spec-setup.exe
 
-
-
     - win32_kitchensinkJS:
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       QTDIR: C:\Qt\5.13\msvc2017
@@ -119,8 +117,8 @@ environment:
       target_artefact_file_name: kitchensinkRuby-setup.exe
 
     - win32_rho_ruby:
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      QTDIR: C:\Qt\5.13\msvc2017
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      QTDIR: C:\Qt\5.15\msvc2019
       testable_application_repository: https://github.com/rhomobile/RMS-Testing.git
       test_app_folder: C:\TAU\RMS-Testing\
       test_app_subfolder: auto\feature_def\auto_common_spec\
@@ -129,13 +127,70 @@ environment:
       after_build_command: "run:win32:spec"
       app_name: auto_common_spec
       target_os: win32
+
+    # - android_auto_common_spec_2017:
+    #   APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    #   QTDIR: C:\Qt\5.13\msvc2017
+    #   testable_application_repository: https://github.com/rhomobile/RMS-Testing.git
+    #   test_app_folder: C:\TAU\RMS-Testing\
+    #   test_app_subfolder: auto\feature_def\auto_common_spec\
+    #   build_command: "device:android:debug"
+    #   #after_build_command: "run:win32:spec"
+    #   app_name: auto_common_spec
+    #   target_os: android
+    #   target_artefact_path: C:\TAU\RMS-Testing\auto\feature_def\auto_common_spec\bin\target\android\
+    #   target_artefact_file_name: auto_common_spec-debug.apk
+    #   JAVA_HOME: C:\Program Files\Java\jdk11
+    #   ANDROID_NDK_HOME: C:\ProgramData\Microsoft\AndroidNDK64\android-ndk-r17
+
+    - android_framework_spec_2017:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      QTDIR: C:\Qt\5.13\msvc2017
+      testable_application_repository: https://github.com/rhomobile/RMS-Testing.git
+      test_app_folder: C:\TAU\RMS-Testing\
+      test_app_subfolder: auto\feature_def\framework_spec\
+      build_command: "device:android:debug"
+      #after_build_command: "run:win32:spec"
+      app_name: framework_spec
+      target_os: android
+      target_artefact_path: C:\TAU\RMS-Testing\auto\feature_def\framework_spec\bin\target\android\
+      target_artefact_file_name: framework_spec-debug.apk
+      JAVA_HOME: C:\Program Files\Java\jdk11
+      ANDROID_NDK_HOME: C:\ProgramData\Microsoft\AndroidNDK64\android-ndk-r17
+
+    - android_system-api-samples_2017:
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      QTDIR: C:\Qt\5.13\msvc2017
+      testable_application_repository: https://github.com/tauplatform/rhodes-system-api-samples.git
+      test_app_folder: C:\TAU\rhodes-system-api-samples\
+      build_command: "device:android:debug"
+      #after_build_command: "run:win32:spec"
+      app_name: SAS
+      target_os: android
+      target_artefact_path: C:\TAU\rhodes-system-api-samples\bin\target\android\
+      target_artefact_file_name: SAS-debug.apk
+      JAVA_HOME: C:\Program Files\Java\jdk11
+      ANDROID_NDK_HOME: C:\ProgramData\Microsoft\AndroidNDK64\android-ndk-r17
     
 
 build: off
 
 install:
+  - ps: Set-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem' -Name 'LongPathsEnabled' -Value 1
+  - ps: Start-Sleep -s 10
+  - ps: Restart-Computer -Force
+  - ps: Start-Sleep -s 10
   - set PATH=C:\Ruby26\bin;%PATH%
   - set RAKEOPT=-rdevkit
+
+
+  - IF %target_os%==android appveyor DownloadFile https://s3.amazonaws.com/files.tau-platform.com/buildenv/addon-symbol-emdk_v4.2-API-22.zip -FileName C:\TAU\emdk.zip
+  - IF %target_os%==android 7z x -y C:\TAU\emdk.zip -oC:\PROGRA~2\Android\android-sdk\add-ons\ -r
+
+  - IF %target_os%==android keytool -genkey -v -keystore %USERPROFILE%\.android\debug.keystore -keyalg RSA -keysize 2048 -validity 10000 -alias androiddebugkey -noprompt -dname "CN=Rho-Android-appveyor-build" -storepass android -keypass android
+
+
+#  - Tree "C:\Program Files (x86)\Android\android-sdk\add-ons" /F
 #  - gem install rest-client --no-document -f
 #  - gem install listen --no-document -f
 #  - gem install zip --no-document -f
@@ -147,6 +202,7 @@ before_test:
   - ruby -v
   - gem -v
   - bundle -v
+  - cd C:\TAU\rhodes\
   - cp rhobuild.yml.example rhobuild.yml
   - ruby C:\TAU\rhodes\lib\build\buildgem.rb
   - set /P BUILD_VERSION=<version
@@ -158,8 +214,6 @@ before_test:
   - set /P BUILD_VERSION_RHOCONNECT=<version
   - gem install rhoconnect-client-%BUILD_VERSION_RHOCONNECT%.gem --no-document -f
  
-  #- appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
-  #- nuget restore C:\TAU\rhodes\platform\uwp\rhodes_dev.sln
 
   - cd C:\TAU\
   - rmdir /Q /S rhodes
@@ -170,7 +224,6 @@ test_script:
   - cd %test_app_folder%
   - IF DEFINED test_app_subfolder cd %test_app_subfolder%
   - rake clean:win32
-  #- rake clean:uwp
   - IF DEFINED pre_build_command rake %pre_build_command% --trace
   - rake %build_command% --trace
   - IF DEFINED after_build_command rake %after_build_command%

data/azure-pipelines.yml

@@ -0,0 +1,67 @@
+name: rhomobile
+
+variables:
+- name: BUILD_DIR
+  value: $(Build.Repository.LocalPath)
+- name: TRAVIS_BUILD_DIR
+  value: $(Build.Repository.LocalPath)
+- name: OS_NAME
+  value: osx
+- name: RHO_TARGET
+  value: rhosimulator_osx
+- name: RHO_RUNNER_SCRIPT
+  value: run_app_on_simulator.sh
+- name: RHO_RUBY
+  value: ruby-2.7
+- name: ruby_version
+  value: '2.7'
+- name: BUILD_ARTEFACTS_DIR
+  value: $(Pipeline.Workspace)/build_artefacts
+- name: RHO_APP
+  value: ""
+
+- name: QTDIR
+  value: $(Pipeline.Workspace)/Qt5.15.2/5.15.2/clang_64
+
+- name: S3_JOB_DIR
+  value: "$(Build.SourceVersion)/${{ variables.OS_NAME }}"
+
+- name: S3_DEPLOY_DIR
+  value: "$(Build.Repository.Name)/$(Build.SourceBranchName)"
+
+trigger:
+  branches:
+    exclude:
+      - '*'
+
+stages:  
+  - stage: build
+    jobs:
+      - job: build
+        pool:
+          vmImage: 'macOS-10.15'
+        steps:
+#        - task: Bash@3
+#          inputs:
+#            targetType: 'inline'
+#            script: 'env | sort'
+        - task: UseRubyVersion@0
+          inputs:
+            versionSpec: $(ruby_version)      
+        - task: Bash@3
+          inputs:
+            targetType: 'inline'
+            script: 'mkdir $BUILD_ARTEFACTS_DIR'
+
+        - script: $BUILD_DIR/.ci/azure-build.sh        
+        
+        - task: S3Upload@1
+          inputs:
+            regionName: 'eu-central-1'
+            bucketName: 'tau-autobuilds'
+            sourceFolder: '$(BUILD_ARTEFACTS_DIR)'
+            globExpressions: '**'
+            targetFolder: $(S3_DEPLOY_DIR)/$(S3_JOB_DIR)-$(RHO_TARGET)-$(RHO_APP)
+            filesAcl: 'public-read'
+            logRequest: true
+            logResponse: true

data/extensions/rhoconnect-push/ext/rhoconnect-push/platform/android/src/com/rhomobile/rhoelements/ans/ANSManager.java

@@ -31,7 +31,7 @@ public class ANSManager {
         Intent intent = createExplicitFromImplicitIntent( context, new Intent(ANSConstants.ANS_REGISTER_ACTION));
         // The pending intent provides a spoof-proof way to pass the
         // package-name string
-        intent.putExtra(ANSConstants.ANS_EXTRA_APP, PendingIntent.getBroadcast(context, 0, new Intent(), 0));
+        intent.putExtra(ANSConstants.ANS_EXTRA_APP, PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_IMMUTABLE));
 
         // send the sender ID to the reg service
         intent.putExtra(ANSConstants.ANS_EXTRA_APP_NAME, appName);
@@ -66,7 +66,7 @@ public class ANSManager {
         Intent intent = createExplicitFromImplicitIntent( context, new Intent( ANSConstants.ANS_CHECK_REGISTRATION_ACTION) );
         // The pending intent provides a spoof-proof way to pass the
         // package-name string
-        intent.putExtra(ANSConstants.ANS_EXTRA_APP, PendingIntent.getBroadcast(context, 0, new Intent(), 0));
+        intent.putExtra(ANSConstants.ANS_EXTRA_APP, PendingIntent.getBroadcast(context, 0, new Intent(), PendingIntent.FLAG_IMMUTABLE));
 
         // send the sender ID to the reg service
         intent.putExtra(ANSConstants.ANS_EXTRA_APP_NAME, appName);

data/lib/commonAPI/barcode/ext/platform/android/AndroidManifest.xml

@@ -10,7 +10,9 @@
               android:screenOrientation="landscape"
               android:configChanges="orientation|keyboardHidden|screenSize"
               android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-              android:windowSoftInputMode="stateAlwaysHidden">
+              android:windowSoftInputMode="stateAlwaysHidden"
+              android:exported='true'
+              >
       <intent-filter>
         <action android:name="com.google.zxing.client.android.SCAN"/>
         <category android:name="android.intent.category.DEFAULT"/>

data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/BarcodeCaptureActivity.java

@@ -29,10 +29,10 @@ import android.hardware.Camera;
 import android.hardware.Camera.Parameters;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+//import com.google.android.material.snackbar.Snackbar;
+import androidx.core.app.ActivityCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
@@ -66,7 +66,7 @@ import com.rhomobile.rhodes.Logger;
 import com.rho.barcode.BarcodeFactory;
 import com.rho.barcode.BarcodeCommon;
 import android.content.pm.ActivityInfo;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageButton;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.media.MediaPlayer.OnCompletionListener;
@@ -268,27 +268,25 @@ public final class BarcodeCaptureActivity extends AppCompatActivity implements B
 
         final String[] permissions = new String[]{Manifest.permission.CAMERA};
 
-        if (!ActivityCompat.shouldShowRequestPermissionRationale(this,
-                Manifest.permission.CAMERA)) {
+        if (!ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.CAMERA)) {
             ActivityCompat.requestPermissions(this, permissions, RC_HANDLE_CAMERA_PERM);
             return;
         }
 
-        final Activity thisActivity = this;
+        /*final Activity thisActivity = this;
 
         View.OnClickListener listener = new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                ActivityCompat.requestPermissions(thisActivity, permissions,
-                        RC_HANDLE_CAMERA_PERM);
+                ActivityCompat.requestPermissions(thisActivity, permissions,  RC_HANDLE_CAMERA_PERM);
             }
         };
 
         findViewById(R.id.topLayout).setOnClickListener(listener);
-        Snackbar.make(mGraphicOverlay, R.string.permission_camera_rationale,
-                Snackbar.LENGTH_INDEFINITE)
+        Snackbar.make(mGraphicOverlay, R.string.permission_camera_rationale, Snackbar.LENGTH_INDEFINITE)
                 .setAction(R.string.ok, listener)
-                .show();
+                .show();*/
+        
     }
 
     @Override

data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/BarcodeGraphicTracker.java

@@ -16,7 +16,7 @@
 package com.google.barcodereader;
 
 import android.content.Context;
-import android.support.annotation.UiThread;
+import androidx.annotation.UiThread;
 
 import com.google.barcodereader.ui.camera.GraphicOverlay;
 import com.google.android.gms.vision.Detector;

data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/ui/camera/CameraSource.java

@@ -25,9 +25,9 @@ import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresPermission;
-import android.support.annotation.StringDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresPermission;
+import androidx.annotation.StringDef;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;

data/lib/commonAPI/barcode/ext/platform/android/src/com/google/barcodereader/ui/camera/CameraSourcePreview.java

@@ -18,7 +18,7 @@ package com.google.barcodereader.ui.camera;
 import android.Manifest;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.RequiresPermission;
+import androidx.annotation.RequiresPermission;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.SurfaceHolder;

data/lib/commonAPI/barcode/ext.yml

@@ -10,14 +10,10 @@ android:
   exttype: rakefile
   sdk_addons: ['EMDK']
   maven_deps:
-    - 'com.google.android.gms:play-services-vision:9.4.0'
-    - 'com.android.support:support-v4:25.2.0'
-    - 'com.android.support:design:25.2.0'
-   # - 'com.android.support:support-compat:25.2.0'
-   # - 'com.android.support:support-core-ui:25.2.0'
-   # - 'com.android.support:support-media-compat:25.2.0'
-   # - 'com.android.support:support-fragment:25.2.0'
-   # - 'com.android.support:support-core-utils:25.2.0'
+    - 'com.google.android.gms:play-services-vision:20.1.3'
+    - 'androidx.appcompat:appcompat:1.3.0'
+    - 'androidx.lifecycle:lifecycle-common:2.3.1'
+    - 'androidx.lifecycle:lifecycle-common-java8:2.3.1'
   
 sailfish:
   proerb: ext/platform/qt/Barcode.pro.erb

data/lib/commonAPI/coreapi/ext/platform/android/Rakefile

@@ -50,8 +50,6 @@ TARGETLIB_x86 = File.join(TARGETDIR_x86,'libcoreapi.a')
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,'libcoreapi.a')
 TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,'libcoreapi.a')
 
-V4JAR = File.join(TARGETDIR, 'android-support-v4.jar')
-
 cd '../../..'
 
 namespace 'config' do
@@ -123,16 +121,6 @@ end
 multitask TARGETLIB_AARCH64 => OBJ_AARCH64
 
 multitask TARGETLIB_MIPS => OBJ_MIPS
-file V4JAR => [TARGETDIR] do
-    v4jar = Dir.glob(File.join(ENV['ANDROID_SDK'],'extras','android','**','v4','android-support-v4.jar'))
-
-    if v4jar.size != 1
-      puts "Cannot locate android-support-v4.jar, check Android SDK (#{v4jar})" if v4jar.size != 1
-    else
-      v4jar = v4jar.first
-      cp v4jar, TARGETDIR
-    end
-end
 
 namespace 'arch' do
   task :arm => [TARGETLIB_ARM]

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/Notification.java

@@ -320,7 +320,8 @@ public class Notification {
         }
 
         builder.setSmallIcon(R.drawable.ic_notification);
-        builder.setContentIntent(PendingIntent.getActivity(ctx, id, new Intent(ctx, RhodesActivity.class), PendingIntent.FLAG_UPDATE_CURRENT));
+        builder.setContentIntent(PendingIntent.getActivity(ctx, id, new Intent(ctx, RhodesActivity.class), 
+            PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
 
         builder.setDefaults(android.app.Notification.DEFAULT_VIBRATE | android.app.Notification.DEFAULT_SOUND);
 
@@ -347,7 +348,8 @@ public class Notification {
                     resId = R.drawable.ic_action_cancel;
                 }
                 
-                builder.addAction(resId, action.title, PendingIntent.getService(ctx, id, actionIntent, PendingIntent.FLAG_UPDATE_CURRENT));
+                builder.addAction(resId, action.title, PendingIntent.getService(ctx, id, actionIntent, 
+                    PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE));
             }
         }
         

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationScheduler.java

@@ -18,8 +18,8 @@ import com.rhomobile.rhodes.Logger;
 import android.os.SystemClock;
 
 import android.net.Uri;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
 import android.media.RingtoneManager;
 import android.content.SharedPreferences;
 
@@ -219,7 +219,7 @@ public class NotificationScheduler {
 
         Intent new_intent = new Intent(context, cls);
         PendingIntent pendingIntent = PendingIntent.getBroadcast(context, RHO_NOTIFICATION_CODE, new_intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         AlarmManager am = (AlarmManager) context.getSystemService(ALARM_SERVICE);
         am.cancel(pendingIntent);
         pendingIntent.cancel();

data/lib/commonAPI/coreapi/ext/platform/android/src/com/rho/notification/NotificationSingleton.java

@@ -20,7 +20,7 @@ import android.media.AudioManager;
 import android.media.AudioTrack;
 import android.media.MediaPlayer;
 import android.os.Vibrator;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.View;

data/lib/commonAPI/coreapi/ext/push.xml

@@ -15,8 +15,11 @@ For FCM:
     :::ruby
     capabilities: ["push"]
     extensions: ["fcm-push"]
-    fcmSenderID: 'your_fcm_sender_id'
-    fcmAppID: 'your_fcm_app_id'
+    fcm:
+        mobilesdk_app_id: "mobilesdk_app_id from google-services.json"
+        project_number: "project_number from google-services.json"
+        current_key: "current_key from google-services.json"
+        project_id: "project_id from google-services.json"
 
 **Supporting FCM Push on iOS** Download GoogleService-Info.plist and put it into the root of your application. Please read guide [Add Firebase to your iOS project](https://firebase.google.com/docs/ios/setup) for more details.