rhodes 7.5.1 → 7.6.0

data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.cpp

@@ -170,6 +170,19 @@ void CSystemImplBase::setLocalServerPort( int value, CMethodResult& oResult)
     //Local port can be set only in confuguration file
 }
 
+
+void CSystemImplBase::getRubyLocalServerURL(CMethodResult& oResult)
+{
+    oResult.set( RHODESAPP().getRubyHomeURL() );
+}
+
+void CSystemImplBase::setRubyLocalServerURL( const rho::String& value, CMethodResult& oResult)
+{
+    //Local port can be set only in confuguration file
+}
+
+
+
 void CSystemImplBase::getNodejsServerPort(CMethodResult& oResult)
 {
     oResult.set( atoi(RHODESAPP().getNodeJSListeningPort()) );

data/lib/commonAPI/coreapi/ext/shared/SystemImplBase.h

@@ -19,6 +19,8 @@ public:
     virtual void getIsSymbolDevice(CMethodResult& oResult);
     virtual void getLocalServerPort(CMethodResult& oResult);
     virtual void setLocalServerPort( int value, CMethodResult& oResult);
+    virtual void getRubyLocalServerURL(CMethodResult& oResult);
+    virtual void setRubyLocalServerURL( const rho::String& value, CMethodResult& oResult);
     virtual void getNodejsServerPort(CMethodResult& oResult);
     virtual void setNodejsServerPort( int value, CMethodResult& oResult);
     virtual void getFreeServerPort(rho::apiGenerator::CMethodResult& oResult);

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

@@ -174,6 +174,9 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
             <PROPERTY name="localServerPort" type="INTEGER" default="8080" readOnly="true">
                 <DESC>Port of the local (embedded) HTTP server. This parameter is mainly for debug purposes. If not specified, the platform will detect a free port on the device and use that one.</DESC>
             </PROPERTY>
+            <PROPERTY name="RubyLocalServerURL" type="STRING" readOnly="true">
+                <DESC>Local server full URL prefix://ip:port</DESC>
+            </PROPERTY>
             <PROPERTY name="NodejsServerPort" type="INTEGER" default="3000" readOnly="true">
                 <DESC>Port of the local (embedded) Node.js HTTP server if it started (only for Node.js type applications).</DESC>
             </PROPERTY>

data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationCameraActivity.erb

@@ -1,2 +1,2 @@
-<activity android:name="com.rho.camera.CameraActivity"/>
-<service android:name="com.rho.camera.OrientationListnerService"/>
+<activity android:name="com.rho.camera.CameraActivity" android:exported='false'/>
+<service android:name="com.rho.camera.OrientationListnerService" android:exported='false'/>

data/lib/commonAPI/mediacapture/ext/platform/android/ApplicationFileProvider.erb

@@ -1,5 +1,5 @@
 <provider
-        android:name="androidx.core.content.FileProvider"
+        android:name="com.rho.mediacapture.RhoCameraFileProvider"
         android:authorities="<%= @appPackageName %>.fileprovider"
         android:exported="false"
         android:grantUriPermissions="true">

data/lib/commonAPI/mediacapture/ext/platform/android/ext_java.files

@@ -1,4 +1,5 @@
 ext/platform/android/src/com/rho/mediacapture/RhoListener.java
+ext/platform/android/src/com/rho/mediacapture/RhoCameraFileProvider.java
 ext/platform/android/generated/src/com/rho/camera/ICamera.java
 ext/platform/android/generated/src/com/rho/camera/ICameraSingleton.java
 ext/platform/android/generated/src/com/rho/camera/ICameraFactory.java

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraObject.java

@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.ArrayList;
+import java.util.UUID;
  
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -49,7 +50,7 @@ import com.rho.camera.ICameraSingleton;
 
 public class CameraObject extends CameraBase implements ICamera{
     private static final String TAG = CameraObject.class.getSimpleName();
-    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_hhmmss");
+    private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_hhmmss");
 
     private Camera mCamera = null;
     private int mCameraUsers;   
@@ -189,9 +190,12 @@ public class CameraObject extends CameraBase implements ICamera{
         }
     }
 
+    public static String createFileName(){
+        return dateFormat.format(new Date(System.currentTimeMillis())) + "_" + UUID.randomUUID().toString();
+    }
+
     private File createImageFile() throws IOException {
-        String timeStamp = dateFormat.format(new Date(System.currentTimeMillis()));
-        String imageFileName = "JPEG_" + timeStamp + "_";
+        String imageFileName = "JPEG_" + createFileName() + "_";
         File storageDir = RhodesActivity.getContext().getExternalFilesDir(Environment.DIRECTORY_PICTURES);
         File image = File.createTempFile(imageFileName, ".jpg", storageDir);
         return image;
@@ -223,7 +227,7 @@ public class CameraObject extends CameraBase implements ICamera{
             String fileDir = storageDir.getAbsolutePath();
             String fileName = actualPropertyMap.get(ICameraSingleton.PROPERTY_FILE_NAME);
             if (fileName == null || fileName.isEmpty()){
-               fileName = "IMG_" + dateFormat.format(new Date(System.currentTimeMillis()));
+               fileName = "IMG_" + createFileName();
             }
             String filePath = fileDir + "/" + fileName + ".jpg";
 

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/camera/CameraRhoListener.java

@@ -833,6 +833,14 @@ public static void verifyStoragePermissions() {
     if (permission != PackageManager.PERMISSION_GRANTED) {
         ActivityCompat.requestPermissions(RhodesActivity.safeGetInstance(), PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
     }
+
+    /*int permission = ActivityCompat.checkSelfPermission(RhodesActivity.safeGetInstance(), Manifest.permission.WRITE_EXTERNAL_STORAGE);
+    final int REQUEST_EXTERNAL_STORAGE = 1;
+	final String[] PERMISSIONS_STORAGE = {Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE};
+
+    if (permission != PackageManager.PERMISSION_GRANTED) {
+        ActivityCompat.requestPermissions(RhodesActivity.safeGetInstance(), PERMISSIONS_STORAGE, REQUEST_EXTERNAL_STORAGE);
+    }*/
 }
 
 

data/lib/commonAPI/mediacapture/ext/platform/android/src/com/rho/mediacapture/RhoCameraFileProvider.java

@@ -0,0 +1,6 @@
+package com.rho.mediacapture;
+
+import androidx.core.content.FileProvider;
+
+public class RhoCameraFileProvider extends FileProvider {
+}

data/lib/commonAPI/mediacapture/ext/platform/qt/MediaCapture.pro.erb

@@ -1,6 +1,6 @@
 QT += core gui widgets multimedia network webkit widgets quick
 DEFINES += OS_SAILFISH OS_LINUX
-CONFIG += sailfishapp c++14 sailfishapp_i18n
+CONFIG += c++14
 
 
 TARGET = mediacapture

data/lib/commonAPI/mediacapture/ext/platform/qt/Mediacapture.pro

@@ -8,7 +8,7 @@ equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6): {
         QT += webkit quick
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n
+        CONFIG += auroraapp c++14 auroraapp_i18n
     }
     greaterThan(QT_MINOR_VERSION, 7): {
         QT += webengine webenginecore webenginewidgets multimediawidgets widgets

data/lib/commonAPI/signature/ext/platform/iphone/impl/readme.txt

@@ -0,0 +1,7 @@
+contains files with module API Implementation.
+
+Developer should create it - after first generation this folder is empty and this folder do not changed with next generation processes !!!.
+
+Developer should make at least <ModuleName>FactorySingleton.m with acees to <ModuleName>Factory interface!
+All other files include base_impl can be removed from project if it wants by developer.
+Default stub generated code placed in stub_impl folder - you can just copy all files from /generated/stub_impl to this folder and implement unemplemented methods.

data/lib/commonAPI/signature/ext/platform/qt/Signature.pro

@@ -10,19 +10,12 @@ isEqual(QT_MAJOR_VERSION, 5):{
     }
 
     equals(QT_MINOR_VERSION, 6) {
-        DEFINES += ENABLE_Q_WEB_ENGINE
-
-        !contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-            QT += webkit
-            message(Deprecated sailfish webkit enabled)
-        }
-        contains(DEFINES, ENABLE_Q_WEB_ENGINE)  {
-            QT += webengine
-        }
+        QT += webkit
+        message(Deprecated sailfish webkit enabled)
 
         QT += quick multimedia dbus bluetooth
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n qmlcache
+        CONFIG += auroraapp c++14 auroraapp_i18n qmlcache
     }
 
     greaterThan(QT_MINOR_VERSION, 6): {

data/lib/commonAPI/signature/ext/platform/qt/Signature.pro.erb

@@ -1,6 +1,6 @@
-QT += core gui widgets multimedia network webkit widgets
+QT += core gui widgets multimedia network webkit quick
 DEFINES += OS_SAILFISH OS_LINUX
-CONFIG += sailfishapp c++14 sailfishapp_i18n
+CONFIG += c++14
 
 
 TARGET = Signature

data/lib/extensions/fcm-push/ext/iphone/Podfile

@@ -1,5 +1,6 @@
-platform :ios, '10.0'
-#use_frameworks!
+platform :ios, '12.0'
+use_frameworks!
+#use_modular_headers!
 
 project 'fcm-push.xcodeproj'
 
@@ -9,3 +10,15 @@ pod 'Firebase/Messaging'
 
 target 'fcm-push' do
 end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
+      end
+    end
+  end
+end

data/lib/extensions/fcm-push/ext/iphone/fcm-push.xcodeproj/project.pbxproj

@@ -7,7 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		B1618C73C1AFDF2D84EDF1B3 /* libPods-fcm-push.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */; };
+		DE3320874BA7A270A0ADF5E8 /* Pods_fcm_push.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */; };
 		FAC155E7145855CF0016F3BD /* applePush_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = FAD45FD51225FED600141873 /* applePush_Prefix.pch */; };
 		FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AACBBE490F95108600F1A2B1 /* Foundation.framework */; };
 		FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAD4602C12260A8500141873 /* UIKit.framework */; };
@@ -19,8 +19,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_fcm_push.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4CDA3BB94718F541853D0BC4 /* Pods-fcm-push.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fcm-push.debug.xcconfig"; path = "Target Support Files/Pods-fcm-push/Pods-fcm-push.debug.xcconfig"; sourceTree = "<group>"; };
-		96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-fcm-push.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		AACBBE490F95108600F1A2B1 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		C4D0AD1B4A0521913C12576B /* Pods-fcm-push.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-fcm-push.release.xcconfig"; path = "Target Support Files/Pods-fcm-push/Pods-fcm-push.release.xcconfig"; sourceTree = "<group>"; };
 		FAC155F3145855CF0016F3BD /* libfcm-push.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libfcm-push.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -40,7 +40,7 @@
 			files = (
 				FAC155EE145855CF0016F3BD /* Foundation.framework in Frameworks */,
 				FAC155EF145855CF0016F3BD /* UIKit.framework in Frameworks */,
-				B1618C73C1AFDF2D84EDF1B3 /* libPods-fcm-push.a in Frameworks */,
+				DE3320874BA7A270A0ADF5E8 /* Pods_fcm_push.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -72,7 +72,7 @@
 			children = (
 				AACBBE490F95108600F1A2B1 /* Foundation.framework */,
 				FAD4602C12260A8500141873 /* UIKit.framework */,
-				96A61BE3E184A0E6B57CF9D2 /* libPods-fcm-push.a */,
+				4A4AB037FE0CB3EB218E130A /* Pods_fcm_push.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -99,7 +99,6 @@
 				4CDA3BB94718F541853D0BC4 /* Pods-fcm-push.debug.xcconfig */,
 				C4D0AD1B4A0521913C12576B /* Pods-fcm-push.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -340,7 +339,7 @@
 					../../../../../lib/commonAPI/coreapi/ext/shared,
 				);
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = "fcm-push";
 				SDKROOT = iphoneos;
@@ -387,7 +386,7 @@
 					../../../../../lib/commonAPI/coreapi/ext/shared,
 				);
 				INSTALL_PATH = /usr/local/lib;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.5;
 				PRODUCT_NAME = "fcm-push";
 				SDKROOT = iphoneos;

data/lib/extensions/nfc/ext/platform/android/src/com/rhomobile/nfc/Nfc.java

@@ -210,10 +210,11 @@ public class Nfc extends AbstractRhoListener implements IRhoListener {
 			IntentFilter[] filters = new IntentFilter[1];
 			filters[0] = new IntentFilter(NfcAdapter.ACTION_NDEF_DISCOVERED);
 			
+			int flags = PendingIntent.FLAG_IMMUTABLE;
 			PendingIntent intent = 
 	            PendingIntent.getActivity(activity, 0,
 	              new Intent(activity, activity.getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 
-	              0);
+	              flags);
 			
 			nfcAdapter.enableForegroundDispatch(activity, intent, null, null);
 			if (ourP2PNdefMessage != null) {

data/lib/extensions/serialport/ext/serialport.pro

@@ -18,7 +18,7 @@ equals(QT_MAJOR_VERSION, 5) {
     equals(QT_MINOR_VERSION, 6): {
         QT += webkit widgets
         DEFINES += OS_SAILFISH OS_LINUX
-        CONFIG += sailfishapp c++14 sailfishapp_i18n
+        CONFIG += auroraapp c++14 auroraapp_i18n
     }
     greaterThan(QT_MINOR_VERSION, 7): {
         QT += webengine webenginecore webenginewidgets multimediawidgets

data/platform/android/Rhodes/jni/include/rhodes/JNIRhodes.h

@@ -58,6 +58,7 @@ extern "C" {
 enum rho_java_class_t {
 #define RHODES_DEFINE_JAVA_CLASS(x, name) x,
 #include "rhojava.inc"
+#include "rhojava_extra.inc"
 #undef RHODES_DEFINE_JAVA_CLASS
 };
 

data/platform/android/Rhodes/jni/src/fileapi.cpp

@@ -1943,6 +1943,10 @@ RHO_GLOBAL int flock(int fd, int operation)
     RHO_NOT_IMPLEMENTED;
 }
 
+RHO_GLOBAL int tau_ioctl(int fd, unsigned long request, void* p) {
+    return real_ioctl(fd, request, p);
+}
+
 RHO_GLOBAL int ioctl(int fd, int command, ...)
 {
      RHO_LOG("ioctl: fd %d, command: %d", fd, command);

data/platform/android/Rhodes/res/drawable/baseline_check_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#40FF00"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>

data/platform/android/Rhodes/res/drawable/baseline_check_240.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#40FF00"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>

data/platform/android/Rhodes/res/drawable/baseline_close_24.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF0000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

data/platform/android/Rhodes/res/drawable/baseline_close_240.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FF0000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>

data/platform/android/Rhodes/res/layout/overlay_layout.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:background="#FFFFFF"
+    android:id="@+id/overlayLayout">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <EditText
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="text"
+            android:text="TextView" />
+
+        <TextView
+            android:id="@+id/accessibilityStatusTv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Overlay mode" />
+
+        <Button
+            android:id="@+id/stopOverlay"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Stop overlay"
+            android:visibility="visible" />
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>