rhodes 7.4.1 → 7.5.1

data/lib/commonAPI/mediacapture/ext/camera.xml

@@ -219,11 +219,6 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                 <PLATFORM>WM, CE</PLATFORM>
                 <DESC>In cases where the resident camera application on the device is not used this API is used to control the position of the viewfinder preview window when taking a photo.</DESC>
             </PROPERTY>
-            <PROPERTY name="useSystemViewfinder" type="BOOLEAN" default="true">
-                <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
-                <PLATFORM>Android</PLATFORM>
-                <DESC>Setting the value of this property to "true", shall open the System ViewFinder with its properties. Applicable to takePicture() and choosePicture() both. None of the Rho camera properties shall be applicable except desiredWidth and desiredHeight (desired size aplly if useRealBitmapResize enabled).</DESC>
-            </PROPERTY>
             <PROPERTY name="useRealBitmapResize" type="BOOLEAN" default="true">
                 <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
                 <PLATFORM>Android</PLATFORM>
@@ -322,15 +317,15 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                             <DESC>If the specified 'outputFormat' was 'image' then this field is the URI to the taken image stored on the device.On wp8,wm when 'outputFormat' is 'image' then imageUri shall have only Image name with \ sign, on WP8 ImageName shall be suffixed by DTF when 'outputFormat' is 'image', this image will have an auto-generated name. If the specified 'outputFormat' was 'dataUri' then this field will be the image encoded as a Data URI, In Wp8 dataUri shall provide the thumbnail for the picture taken, It is recommended to use Image over dataUri. If the specified 'outputFormat' was 'imagePath' then this field will have the image path on the device. User can use image path to transfer image over http. </DESC>
 							          </PARAM>
                         <PARAM name="image_height" type="INTEGER" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS, WP8</PLATFORM>
+						    <PLATFORM>WM, CE, iOS, WP8</PLATFORM>
                             <DESC>It is recommended to use imageHeight in preference to this parameter.</DESC>
                         </PARAM>
                         <PARAM name="image_width" type="INTEGER" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS, UWP</PLATFORM>
+						    <PLATFORM>WM, CE, iOS, UWP</PLATFORM>
                             <DESC>It is recommended to use imageWidth in preference to this parameter.</DESC>
                         </PARAM>
                         <PARAM name="image_format" type="STRING" deprecated="true">
-						    <PLATFORM>Android, WM, CE, iOS</PLATFORM>
+						    <PLATFORM>WM, CE, iOS</PLATFORM>
                             <DESC>It is recommended to use imageFormat in preference to this parameter.</DESC>
                         </PARAM>
                     </PARAMS>
@@ -384,7 +379,7 @@ Be sure to review the [Ruby API Usage](/guide/api_ruby) guide for important info
                     <PARAM name="propertyMap" type="HASH" propertyHash="true">
 					     <PLATFORM>Android, WM, CE, UWP, iOS</PLATFORM>
                         <DESC>
-                          Provide a set of properties to configure an image, for example to specify the image size or color mode. In WM/CE,Android and WP8 devices user can only specify the outputFormat in the property bag. In iOS devices user can specify next options: compressionFormat, desiredWidth, desiredHeight, outputFormat, colorModel,  enableEditing.
+                          Provide a set of properties to configure an image, for example to specify the image size or color mode. In WM/CE,Android and WP8 devices user can only specify the outputFormat in the property bag. In iOS devices user can specify next options: compressionFormat, desiredWidth, desiredHeight, outputFormat, colorModel, enableEditing.
                           In UWP dataUri shall provide the thumbnail for the picture taken, It is recommended to use Image over dataUri.On wp8, wm when 'outputFormat' is 'image' then imageUri or image_uri shall have Image name with \ sign, on WP8 ImageName shall be suffixed by DTF when 'outputFormat' is 'image'</DESC>
                         <CAN_BE_NIL>
                             <DESC>Not providing properties to this function will use the Camera's default properties, or those previously set on the Camera instance.</DESC>

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

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

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

@@ -5,17 +5,9 @@ ext/platform/android/generated/src/com/rho/camera/ICameraFactory.java
 ext/platform/android/generated/src/com/rho/camera/CameraBase.java
 ext/platform/android/generated/src/com/rho/camera/CameraSingletonBase.java
 ext/platform/android/generated/src/com/rho/camera/CameraFactorySingleton.java
-ext/platform/android/src/com/rho/camera/CameraActivity.java
 ext/platform/android/src/com/rho/camera/OrientationListnerService.java
-ext/platform/android/src/com/rho/camera/CameraPreview.java
-ext/platform/android/src/com/rho/camera/ICameraObject.java
-ext/platform/android/src/com/rho/camera/ICameraSingletonObject.java
 ext/platform/android/src/com/rho/camera/CameraObject.java
-ext/platform/android/src/com/rho/camera/CameraEclair.java
-ext/platform/android/src/com/rho/camera/CameraGingerbread.java
-ext/platform/android/src/com/rho/camera/CameraSingletonObject.java
-ext/platform/android/src/com/rho/camera/CameraSingletonEclair.java
-ext/platform/android/src/com/rho/camera/CameraSingletonGingerbread.java
+ext/platform/android/src/com/rho/camera/CameraSingleton.java
 ext/platform/android/src/com/rho/camera/CameraFactory.java
 ext/platform/android/src/com/rho/camera/CameraExtension.java
 ext/platform/android/src/com/rho/camera/CameraRhoListener.java

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

@@ -8,8 +8,6 @@ public class CameraExtension extends AbstractRhoExtension implements IRhoExtensi
     
     private static final String TAG = CameraExtension.class.getSimpleName();
     
-    static final String INTENT_EXTRA_PREFIX = "com.rho.camera.";
-
     @Override
     public String onGetProperty(IRhoExtManager extManager, String name) {
         if (name.equalsIgnoreCase("has_camera")) {

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

@@ -2,23 +2,20 @@ package com.rho.camera;
 
 import android.hardware.Camera;
 import android.os.Build;
-
+import java.util.HashMap;
 import com.rhomobile.rhodes.Logger;
 import com.rhomobile.rhodes.osfunctionality.OsVersionManager;
 
 public class CameraFactory implements ICameraFactory {
     private static final String TAG = CameraFactory.class.getSimpleName();
     
-    private ICameraSingletonObject mSingleton;
-    private ICameraObject[] mCameraList;
+    static private CameraSingleton singleton = null;
+    private HashMap<String, ICamera> camerasMap = new HashMap<String, ICamera>();
     private CameraRhoListener mRhoListener;
     
     public CameraFactory(CameraRhoListener rhoListener) {
         mRhoListener = rhoListener;
-
-        OsVersionManager.registerSelector(ICameraSingletonObject.class, CameraSingletonObject.class.getCanonicalName());
-        OsVersionManager.registerSelector(Build.VERSION_CODES.ECLAIR, ICameraSingletonObject.class, CameraSingletonEclair.class.getCanonicalName());
-        OsVersionManager.registerSelector(Build.VERSION_CODES.GINGERBREAD, ICameraSingletonObject.class, CameraSingletonGingerbread.class.getCanonicalName());
+        OsVersionManager.registerSelector(ICameraSingleton.class, CameraSingleton.class.getCanonicalName());
     }
 
     @Override
@@ -31,28 +28,26 @@ public class CameraFactory implements ICameraFactory {
         return getCameraObject(id);
     }
     
-    ICameraSingletonObject getCameraSingleton() {
-        if (mSingleton == null) {
-            mSingleton = OsVersionManager.getFeature(ICameraSingletonObject.class);
-            
-            int count = mSingleton.getCameraCount();
-            mCameraList = new ICameraObject[count];
+    CameraSingleton getCameraSingleton() {
+        if (singleton == null) {
+            singleton = new CameraSingleton();
         }
-        return mSingleton;
+        return singleton;
     }
     
-    ICameraObject getCameraObject(String id) {
-        int idx = CameraSingletonObject.getCameraIndex(id);
-
-        if (idx >= mCameraList.length) {
-            Logger.E(TAG, "Unknown camera id: " + id);
-            return null;
+    ICamera getCameraObject(String id) {
+        if (!camerasMap.containsKey(id)){
+            ICamera c = null;
+            try{
+                c = new CameraObject(id);
+            }catch(Exception e){
+                Logger.E(TAG, "Can't create camera with id: " + id);
+                return null;
+            }
+            camerasMap.put(id, c);
         }
 
-        if (mCameraList[idx] == null) {
-            mCameraList[idx] = getCameraSingleton().createCameraObject(id);
-        }
-        return mCameraList[idx];
+        return camerasMap.get(id);
     }
     
     CameraRhoListener getRhoListener() {