rhodes 6.2.0 → 7.1.17

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

@@ -23,23 +23,30 @@ public class CameraEclair extends CameraObject implements ICameraObject {
         getPropertiesMap().put("cameraType", "back");
         getPropertiesMap().put("compressionFormat", "jpg");
         getPropertiesMap().put("outputFormat", "image");
+        if (hasPermission()) {
+            openCamera();
+            Camera.Parameters params = getCamera().getParameters();
+            closeCamera();
 
-        openCamera();
-        Camera.Parameters params = getCamera().getParameters();
-        closeCamera();
-
-        mSupportedPictureSizes = params.getSupportedPictureSizes();
-        ISize maxSize = null;
-        for(android.hardware.Camera.Size size: mSupportedPictureSizes) {
-            Logger.D(TAG, "Possible picture size: " + size.width + "X" + size.height);
-            ISize curSize = new CameraSize(size);
-            if ((maxSize == null) || (curSize.D2() > maxSize.D2())) {
-                maxSize = curSize;
+            mSupportedPictureSizes = params.getSupportedPictureSizes();
+            ISize maxSize = null;
+            for(android.hardware.Camera.Size size: mSupportedPictureSizes) {
+                Logger.D(TAG, "Possible picture size: " + size.width + "X" + size.height);
+                ISize curSize = new CameraSize(size);
+                if ((maxSize == null) || (curSize.D2() > maxSize.D2())) {
+                    maxSize = curSize;
+                }
             }
-        }
 
-        getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
-        getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
+            getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
+            getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
+        }
+        else {
+            mSupportedPictureSizes = new ArrayList<Camera.Size>();
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+            getPropertiesMap().put("maxWidth", String.valueOf(0));
+            getPropertiesMap().put("maxHeight", String.valueOf(0));
+        }
     }
 
     @Override
@@ -162,6 +169,10 @@ public class CameraEclair extends CameraObject implements ICameraObject {
     }
 
     protected boolean hasAutoFocus() {
+        if (!hasPermission()) {
+            Logger.D(TAG, "Application has no permission to Camera access !!!");
+            return false;
+        }
         String focusMode = getCamera().getParameters().getFocusMode();
         boolean supported = false;
         if (focusMode != null) {

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

@@ -9,6 +9,13 @@ import android.os.Environment;
 
 import com.rhomobile.rhodes.Logger;
 
+
+import android.support.v4.content.PermissionChecker;
+import android.support.v4.content.ContextCompat;
+import android.content.pm.PackageManager;
+import com.rhomobile.rhodes.RhodesActivity;
+import android.Manifest;
+
 public class CameraGingerbread extends CameraEclair implements ICameraObject {
     private static final String TAG = CameraGingerbread.class.getSimpleName();
     
@@ -33,38 +40,49 @@ public class CameraGingerbread extends CameraEclair implements ICameraObject {
             getPropertiesMap().put("cameraType", "unknown");
             break;
         }
-        
-        openCamera();
-        Camera.Parameters params = getCamera().getParameters();
-        closeCamera();
-        
-        List<android.hardware.Camera.Size> listSize = params.getSupportedPictureSizes();
-        ISize maxSize = null;
-        for(android.hardware.Camera.Size curSize: listSize) {
-            Logger.D(TAG, "Possible picture size: " + curSize.width + "X" + curSize.height);
-            if ((maxSize == null) || (curSize.width > maxSize.getWidth())) {
-                maxSize = new CameraSize(curSize);
+
+        if (hasPermission()) {
+            openCamera();
+            Camera.Parameters params = getCamera().getParameters();
+            closeCamera();
+
+            List<android.hardware.Camera.Size> listSize = params.getSupportedPictureSizes();
+            ISize maxSize = null;
+            for(android.hardware.Camera.Size curSize: listSize) {
+                Logger.D(TAG, "Possible picture size: " + curSize.width + "X" + curSize.height);
+                if ((maxSize == null) || (curSize.width > maxSize.getWidth())) {
+                    maxSize = new CameraSize(curSize);
+                }
             }
-        }
 
-        getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
-        getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
+            getPropertiesMap().put("maxWidth", String.valueOf(maxSize.getWidth()));
+            getPropertiesMap().put("maxHeight", String.valueOf(maxSize.getHeight()));
+        }
+        else {
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+            getPropertiesMap().put("maxWidth", String.valueOf(0));
+            getPropertiesMap().put("maxHeight", String.valueOf(0));
+        }
     }
-    
+
 
     @Override synchronized
-    protected void openCamera() { 
-        if (mCameraUsers == 0) {
-            setCamera(Camera.open(getCameraIndex())); 
+    protected void openCamera() {
+        if (hasPermission()) {
+            if (mCameraUsers == 0) {
+                setCamera(Camera.open(getCameraIndex()));
+            }
+            mCameraUsers++;
         }
-        mCameraUsers++;
     }
 
     @Override synchronized
     protected void closeCamera() {
-        mCameraUsers--;
-        if (mCameraUsers == 0) {
-            getCamera().release();
+        if (hasPermission()) {
+            mCameraUsers--;
+            if (mCameraUsers == 0) {
+                getCamera().release();
+            }
         }
     }
 
@@ -102,21 +120,33 @@ public class CameraGingerbread extends CameraEclair implements ICameraObject {
         }
         getCamera().setParameters(params);
         getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
-        
+
         // commented the code because auto focus logic is moved as soon as camera previews not on button click
         /*if (hasAutoFocus()) {
             getCamera().autoFocus(new Camera.AutoFocusCallback() {
                 public void onAutoFocus(boolean success, Camera camera) {
-                	 
+
                     openCamera();
                 	getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
                     closeCamera();
                 }
             });
-            
+
         } else {
             getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
         }*/
         closeCamera();
     }
+
+    public boolean hasPermission() {
+        boolean res = (PermissionChecker.checkSelfPermission(RhodesActivity.getContext(), Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED);
+        if (!res) {
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+        }
+        //else {
+        //    Logger.E(TAG, "Application has permission to Camera access !!!");
+        //}
+        return res;
+    }
+
 }

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

@@ -450,22 +450,29 @@ public class CameraObject extends CameraBase implements ICameraObject {
         getPropertiesMap().put("useRealBitmapResize", "true");
         getPropertiesMap().put("useRotationBitmapByEXIF", "true");
         getPropertiesMap().put("saveToDeviceGallery", "false");
-        openCamera();
-        Camera.Parameters params = getCamera().getParameters();
-        closeCamera();
+        if (hasPermission()) {
+            openCamera();
+            Camera.Parameters params = getCamera().getParameters();
+            closeCamera();
 
-        getPropertiesMap().put("maxWidth", String.valueOf(params.getPictureSize().width));
-        getPropertiesMap().put("maxHeight", String.valueOf(params.getPictureSize().height));
+            getPropertiesMap().put("maxWidth", String.valueOf(params.getPictureSize().width));
+            getPropertiesMap().put("maxHeight", String.valueOf(params.getPictureSize().height));
 
-        // default desired size not specified in documentation and XML !!!
-        //getPropertiesMap().put("desiredWidth", "640");
-        //getPropertiesMap().put("desiredHeight", "480");
+            // default desired size not specified in documentation and XML !!!
+            //getPropertiesMap().put("desiredWidth", "640");
+            //getPropertiesMap().put("desiredHeight", "480");
+        }
+        else {
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+            getPropertiesMap().put("maxWidth", String.valueOf(0));
+            getPropertiesMap().put("maxHeight", String.valueOf(0));
+        }
         getPropertiesMap().put("desiredWidth", "0");
         getPropertiesMap().put("desiredHeight", "0");
 
         storageDir = new File(Environment.getExternalStorageDirectory(), "RhoImages");
         createRhoCacheFolder();
-        
+
     }
 
     public void createRhoCacheFolder(){
@@ -637,6 +644,14 @@ public class CameraObject extends CameraBase implements ICameraObject {
 
     @Override
     public void takePicture(Map<String, String> propertyMap, IMethodResult result) {
+        if (!hasPermission()) {
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+            HashMap<String, Object> inResultMap = new HashMap<String,Object>();
+            inResultMap.put("message", "No CAMERA permission !");
+            inResultMap.put("status", "error");
+            result.set(inResultMap);
+            return;
+        }
 
         CURRENT_SCREEN_AUTO_ROTATE_MODE = RhodesActivity.safeGetInstance().getScreenAutoRotateMode();
         CURRENT_FULL_SCREEN_MODE = RhodesActivity.safeGetInstance().getFullScreenMode();
@@ -822,6 +837,10 @@ public class CameraObject extends CameraBase implements ICameraObject {
     }
 
     private boolean hasAutoFocus() {
+        if (!hasPermission()) {
+            Logger.E(TAG, "Application has no permission to Camera access !!!");
+            return false;
+        }
         String focusMode = getCamera().getParameters().getFocusMode();
         boolean supported = false;
         if (focusMode != null) {
@@ -831,4 +850,10 @@ public class CameraObject extends CameraBase implements ICameraObject {
 
     }
 
+    public boolean hasPermission() {
+        //Logger.E(TAG, "Application has permission to Camera access DAFAULT !!!");
+        return true;
+    }
+
+
 }

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

@@ -16,4 +16,5 @@ public interface ICameraObject extends ICamera {
     void doTakePicture(Activity previewActivity, int rotation);
     void setFocus(Activity mPreview);
 
+    boolean hasPermission();
 }

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

@@ -33,20 +33,24 @@ ARGS = ["-I\"#{$curdir}/generated/jni\"",
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
 SRC = get_sources File.join($curdir, 'ext_native.files')
 
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,TARGETLIB)
 TARGETLIB_x86 = File.join(TARGETDIR_x86,TARGETLIB)
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,TARGETLIB)
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,TARGETLIB)
 
 
 PRINTINGJAR = "print_jar"
@@ -65,6 +69,10 @@ namespace 'config' do
   task :mips do
       setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'],'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ENV['ANDROID_NDK'],ENV['ANDROID_API_LEVEL'],'aarch64')
+  end
 end
 
 puts "UGU #{TARGETDIR_x86.inspect}"
@@ -72,9 +80,11 @@ puts "UGU #{TARGETDIR_x86.inspect}"
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
@@ -86,6 +96,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -111,6 +122,12 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
 end
 multitask TARGETLIB_MIPS => OBJ_MIPS
 
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
+end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
+
 
 task :print_jar do
 puts "START FILE LOOPING"
@@ -127,6 +144,7 @@ namespace 'arch' do
   task :arm => [TARGETLIB_ARM, PRINTINGJAR]
   task :x86 => [TARGETLIB_x86, PRINTINGJAR]
   task :mips => [TARGETLIB_MIPS, PRINTINGJAR]
+  task :aarch64 => [TARGETLIB_AARCH64, PRINTINGJAR]
   end
 
 task :default => ["arch:arm", "arch:x86"]

data/lib/commonAPI/sensor/ext/platform/android/src/com/rho/sensor/Sensor.java

@@ -212,10 +212,7 @@ public class Sensor extends SensorBase implements ISensor {
 	 */
 	private void sensorChanged(SensorEvent event) {
 
-		Map<String, Object> props = new HashMap<String, Object>();
-		double accel_x = event.values[0];
-		double accel_y = event.values[1];
-		double accel_z = event.values[2];	
+		Map<String, Object> props = new HashMap<String, Object>();			
 
 		int sensorType = event.sensor.getType();
 		long currentTimeMillis = System.currentTimeMillis();
@@ -224,6 +221,9 @@ public class Sensor extends SensorBase implements ISensor {
 		switch (sensorType)
 		{
 			case android.hardware.Sensor.TYPE_ACCELEROMETER:
+				double accel_x = event.values[0];
+				double accel_y = event.values[1];
+				double accel_z = event.values[2];
 
 				//Logger.D(TAG,  ISensorSingleton.SENSOR_TYPE_ACCELEROMETER + ">>>" + mType + " [" + accel_x + ", " + accel_y + ", " + accel_z + "]");
 	

data/lib/extensions/decrypt/ext/platform/android/Rakefile

@@ -58,21 +58,24 @@ end
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
-
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
 SRC = get_sources File.join(SOURCELIST)
 
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,TARGETLIB)
 TARGETLIB_x86 = File.join(TARGETDIR_x86,TARGETLIB)
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,TARGETLIB)
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,TARGETLIB)
 
 cd '../../..'
 
@@ -88,14 +91,20 @@ namespace 'config' do
   task :mips do
       setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'aarch64')
+  end
 end
 
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
   abi = File.basename(File.dirname(t.name))
@@ -106,6 +115,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -131,17 +141,25 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
 end
 multitask TARGETLIB_MIPS => OBJ_MIPS
 
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
+end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
+
 
 namespace 'build' do
   task :arm => OBJ_ARM
   task :x86 => OBJ_x86
   task :mips => OBJ_MIPS
+  task :aarch64 => OBJ_AARCH64
 end
 
 namespace 'arch' do
   task :arm => TARGETLIB_ARM
   task :x86 => TARGETLIB_x86
   task :mips => TARGETLIB_MIPS
+  task :aarch64 => TARGETLIB_AARCH64
 end
 
 task :default => ["arch:arm"]

data/lib/extensions/decryptstub/ext/platform/android/Rakefile

@@ -52,6 +52,7 @@ ARGS = ['-Iext/platform/android/generated/jni',
 OBJDIR_ARM = File.join(OBJDIR,'arm')
 OBJDIR_x86 = File.join(OBJDIR,'x86')
 OBJDIR_MIPS = File.join(OBJDIR,'mips')
+OBJDIR_AARCH64 = File.join(OBJDIR,'aarch64')
 
     
 SRC = get_sources File.join(SOURCELIST)
@@ -59,14 +60,17 @@ SRC = get_sources File.join(SOURCELIST)
 OBJ_ARM = FileList.new(get_objects(SRC, OBJDIR_ARM))
 OBJ_x86 = FileList.new(get_objects(SRC, OBJDIR_x86))
 OBJ_MIPS = FileList.new(get_objects(SRC, OBJDIR_MIPS))
+OBJ_AARCH64 = FileList.new(get_objects(SRC, OBJDIR_AARCH64))
 
 TARGETDIR_ARM = File.join(TARGETDIR,'armeabi')
 TARGETDIR_x86 = File.join(TARGETDIR,'x86')
 TARGETDIR_MIPS = File.join(TARGETDIR,'mips')
+TARGETDIR_AARCH64 = File.join(TARGETDIR,'aarch64')
 
 TARGETLIB_ARM = File.join(TARGETDIR_ARM,TARGETLIB)
 TARGETLIB_x86 = File.join(TARGETDIR_x86,TARGETLIB)
 TARGETLIB_MIPS = File.join(TARGETDIR_MIPS,TARGETLIB)
+TARGETLIB_AARCH64 = File.join(TARGETDIR_AARCH64,TARGETLIB)
 
 cd '../../..'
 
@@ -82,14 +86,20 @@ namespace 'config' do
   task :mips do
       setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'mips')
   end
+
+  task :aarch64 do
+    setup_ndk(ANDROID_NDK, ANDROID_API_LEVEL,'aarch64')
+  end
 end
 
 directory TARGETDIR_ARM
 directory TARGETDIR_x86
 directory TARGETDIR_MIPS
+directory TARGETDIR_AARCH64
 directory OBJDIR_ARM
 directory OBJDIR_x86
 directory OBJDIR_MIPS
+directory OBJDIR_AARCH64
 
 rule '.o' => lambda {|obj| find_source(obj) } do |t|
   abi = File.basename(File.dirname(t.name))
@@ -100,6 +110,7 @@ end
 task OBJ_ARM => OBJDIR_ARM
 task OBJ_x86 => OBJDIR_x86
 task OBJ_MIPS => OBJDIR_MIPS
+task OBJ_AARCH64 => OBJDIR_AARCH64
 
 def find_source(objfile)
   base = File.basename(objfile, '.o')
@@ -125,17 +136,25 @@ file TARGETLIB_MIPS => TARGETDIR_MIPS do |t|
 end
 multitask TARGETLIB_MIPS => OBJ_MIPS
 
+file TARGETLIB_AARCH64 => TARGETDIR_AARCH64 do |t|
+    Rake::Task["config:aarch64"].invoke
+    cc_ar t.name, OBJ_AARCH64 or raise "\e[31mCreating library failed: #{t.name}\e[0m"
+end
+multitask TARGETLIB_AARCH64 => OBJ_AARCH64
+
 
 namespace 'build' do
   task :arm => OBJ_ARM
   task :x86 => OBJ_x86
   task :mips => OBJ_MIPS
+  task :aarch64 => OBJ_AARCH64
 end
 
 namespace 'arch' do
   task :arm => TARGETLIB_ARM
   task :x86 => TARGETLIB_x86
   task :mips => TARGETLIB_MIPS
+  task :aarch64 => TARGETLIB_AARCH64
 end
 
 task :default => ["arch:arm"]