tauplatform 1.0.2 → 1.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NlY2RhODViNzllNWZjOWY4MmQxYWNmNTI5YmI3NmUxYWFlMTVlNA==
+    YTRhN2M1OWFjNjU1MmU2ZWQ5OGVlMjRlNGExZTgzYTQ5YTUyNzEyZg==
   data.tar.gz: !binary |-
-    NmNjMTFmNTY3NjI3ZTIyNzUxZmViNWE1MzM1N2MxODQwZWE4ZGRmZQ==
+    OGMzZTA4ZTRhZGU2ODRjY2I2MjdhMDA0OWQyODI5MTdhZTA5Y2Q4Zg==
 SHA512:
   metadata.gz: !binary |-
-    YzAxNTE2ZDY4MjUxNTFmZjFmZjhmNWZjMGEwNjA4ZjE0ZThlYWRjMWQ5NWE5
-    Mjg5MWQ2N2EyZjZlYTUyM2Q2MDQ0ZGNmYjdhZTI5YmFiMTFlMzI3YTRmYjI2
-    ZGQ2NDE4ODA5M2UwNGMwMzRjMzczMzM1OTg4MjA3YWUzY2Y4MmE=
+    ZjY5YTcxMTc5MjgxMzg3NmQ1YzVjNTRlMzcxMTY3ZjNlMGZlODRmOTUyNTcz
+    OTdkZDQ5ZDA4ODhlNGMwYzI5YTNiMTZkNTFmMTk0OGJiZTMwYjE5MGU2OTk5
+    ZTlhNGNhNjBkOWYxMTNlMmIzMTYwYjc1NTBiMzM5MjIzZGY5Mzk=
   data.tar.gz: !binary |-
-    ODJhMDYzOTYzZjhkMjQ0YTRkMGVmZGNhY2ZhZDk2MTFmNmFkYWIyNWM1ZDFm
-    YmMyYjdiM2VkZDRiMjdjYTY3NTE3ZDI0YjU4MTRhMWM2NWJjYzMxYTdlYzBi
-    NWI3MjhhMjJjNjkwYjQ0NjEzMzlhYjFkNjc2ZmY2N2NkZmY3ZWE=
+    NmI1OWVjYTVjYzA1M2U1ZWQxNzU3NTBlYzk4NDY1ODE1MTQ4OTdkZTczYzYz
+    MThmZDQ1YTM1MjdhYzRlYjEyMjg4ZDdiNTExNGEwNmJkZGQ4MjYzOTkwM2M1
+    MDU1ZTI3YTc4ZjBhYmFmZDk0OGI3NTU5NjUyYThhMDhiMjNlZDY=

data/CHANGELOG

@@ -1,3 +1,13 @@
+## 1.0.3
+* fix some network issues
+* improve Android Camera
+
+
+## 1.0.2
+* restore barcode and nfc extensions
+
+
+
 ## 1.0.0
 * rebranding from Rhodes to TAU
 * fully support of iOS 9.0 and latest XCode

data/lib/build/development/platform.rb

@@ -8,10 +8,14 @@ module RhoDevelopment
       return /darwin/i === RbConfig::CONFIG['host_os']
     end
 
+    def self.linux?
+      return /linux/i === RbConfig::CONFIG['host_os']
+    end
+
     def self.terminate_process(pid)
       if self.windows?
         system "taskkill /F /PID #{pid}"
-      elsif self.osx?
+      elsif self.osx? or self.linux?
         Process.kill('SIGTERM', pid)
       else
         raise "Unknown platform #{RbConfig::CONFIG['host_os']}"

data/lib/build/development/web_server.rb

@@ -22,6 +22,8 @@ module RhoDevelopment
             cmd = "start \"development webserver\" /d \"#{Configuration::application_root}\" rake dev:webserver:privateStart"
           when /darwin/i
             cmd = "osascript -e 'tell app \"Terminal\" \n do script \" cd #{Configuration::application_root}; rake dev:webserver:privateStart\" \n end tell'"
+          when /linux/i
+            cmd = "cd #{Configuration::application_root} && rake dev:webserver:privateStart &"
         end
         system cmd
         until self.alive? do

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

@@ -9,6 +9,9 @@
 #include "logging/RhoLog.h"
 #include <stdlib.h>
 
+
+extern "C" void rho_ios_log_console_output(const char* message);
+
 namespace rho 
 {    
 	class CTimerFactory;
@@ -53,7 +56,13 @@ namespace rho
 
 			virtual void run()
 			{
-				m_oResult.set("");
+
+               while ( !RHODESAPP().isApplicationActive() ) {
+                    wait(10);
+                }
+
+                
+                m_oResult.set("");
 			}
 		};
 

data/lib/commonAPI/eventsource/ext/platform/android/ext_native.files

@@ -1,8 +1,8 @@
-ext/shared/generated/cpp/Eventsource_js_wrap.cpp
-ext/shared/generated/cpp/Eventsource_ruby_wrap.cpp
-ext/shared/generated/cpp/EventsourceBase.cpp
+ext/shared/generated/cpp/EventSource_js_wrap.cpp
+ext/shared/generated/cpp/EventSource_ruby_wrap.cpp
+ext/shared/generated/cpp/EventSourceBase.cpp
 ext/shared/generated/eventsource_api_init.cpp
 ext/shared/generated/eventsource_js_api.cpp
 ext/shared/generated/eventsource_ruby_api.c
 ext/shared/EventSource.cpp
-ext/shared/eventsource_impl.cpp
+ext/shared/eventsource_impl.cpp

data/lib/commonAPI/eventsource/ext/shared/EventSource.h

@@ -1,7 +1,7 @@
 
 #pragma once
 #include <vector>
-#include "common/rhoStd.h"
+#include "common/RhoStd.h"
 #include "common/RhoThread.h"
 #include "common/RhoTime.h"
 #include "common/RhoMutexLock.h"
@@ -80,4 +80,4 @@ private:
     String m_eventStreamOrigin;
 };
 
-}
+}

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

@@ -56,9 +56,9 @@ The ebapi.js file is necessary for all single API inclusions.
             <PROPERTY_BAG/> <!-- object has properties, produce getProps(), setProps() methods -->
         </TEMPLATES>
 		<CONSTANTS>
-		
+
 		  <!-- Camera Types -->
-    
+
 			<CONSTANT name="CAMERA_TYPE_BACK" value="back" type="STRING">
 				<DESC>Back camera. This is not supported in WM/CE devices.</DESC>
 			</CONSTANT>
@@ -92,7 +92,7 @@ The ebapi.js file is necessary for all single API inclusions.
 			<CONSTANT name="COLOR_MODEL_GRAYSCALE" value="grayscale" type="STRING">
 				<DESC>A grayscale image is captured.</DESC>
 			</CONSTANT>
-			
+
 			<CONSTANT name="FLASH_ON" value="on" type="STRING">
 				<DESC>Flash will be used.</DESC>
 			</CONSTANT>
@@ -139,7 +139,7 @@ The ebapi.js file is necessary for all single API inclusions.
 				</DESC>
                 <DESC_EB>This property is device specific. The value for this property can be either 'back' or 'front' in the case of Android devices.In the case of windows it could be either 'imager' or 'color'. WM/CE devices will use 'color'as default and if color camera not available the default value will be 'imager'. Android devices will use 'back'as default and if back camera not available the default value will be 'front'.
 				This Property shall return one among the values mentioned in constant section which starts with CAMERA_TYPE_...</DESC_EB>
-               
+
             </PROPERTY>
             <PROPERTY name="maxWidth" type="INTEGER" generateAccessors="true" readOnly="true">
                 <PLATFORM>Android, iOS, WP8, WM, CE</PLATFORM>
@@ -192,7 +192,7 @@ The ebapi.js file is necessary for all single API inclusions.
                 <DESC_EB>The format of the captured image in subsequent calls to takePicture(). On windows devices the format will be always .jpg type.
 				This Property shall accept/return one among the values mentioned in constant section which starts with COMPRESSION_FORMAT_...
 				</DESC_EB>
-                
+
             </PROPERTY>
             <PROPERTY name="outputFormat" type="STRING" default="image">
                 <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
@@ -203,7 +203,7 @@ The ebapi.js file is necessary for all single API inclusions.
 				<DESC_EB>Specifies the way to return the captured image to the application.
 				This Property shall accept/return one among the values mentioned in constant section which starts with OUTPUT_FORMAT_...
 				</DESC_EB>
-                
+
             </PROPERTY>
             <PROPERTY name="colorModel" type="STRING" default="rgb">
                 <VER_INTRODUCED>2.0.0</VER_INTRODUCED>
@@ -214,7 +214,7 @@ The ebapi.js file is necessary for all single API inclusions.
 				<DESC_EB>Where supported by the hardware this property can be used to select whether to capture a color or a grayscale image.
 				This Property shall accept/return one among the values mentioned in constant section which starts with COLOR_MODEL_...
 				</DESC_EB>
-                
+
             </PROPERTY>
             <PROPERTY name="enableEditing" type="BOOLEAN" default="true" productException="eb">
                 <VER_INTRODUCED>2.0.0</VER_INTRODUCED>
@@ -229,7 +229,7 @@ The ebapi.js file is necessary for all single API inclusions.
 				This Property shall accept/return one among the values mentioned in constant section which starts with FLASH_...</DESC>
 				<DESC_EB>Specifies the flash behavior when taking a picture.
 				This Property shall accept/return one among the values mentioned in constant section which starts with FLASH_...</DESC_EB>
-               
+
             </PROPERTY>
             <PROPERTY name="saveToDeviceGallery" type="BOOLEAN" default="false">
                 <VER_INTRODUCED>2.0.0</VER_INTRODUCED>
@@ -266,15 +266,20 @@ The ebapi.js file is necessary for all single API inclusions.
             <PROPERTY name="useSystemViewfinder" type="BOOLEAN" default="false">
                 <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. None of the Rho camera properties shall be applicable.</DESC>
+                <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="false">
+                <VER_INTRODUCED>4.0.0</VER_INTRODUCED>
+                <PLATFORM>Android</PLATFORM>
+                <DESC>Setting the value of this property to "true", shall use real resize captured or selected Image and scale image exactly to desired size (with keep aspect ratio). For example 3000x2000 with desired 1500x1500 will be resized to 1500x1000.</DESC>
             </PROPERTY>
-			<PROPERTY name="aimMode" type="STRING">
+            <PROPERTY name="aimMode" type="STRING">
                 <PLATFORM>WM, CE</PLATFORM>
                 <DESC>Specifies the aim behaviour when taking a picture. Applicable only for imager module.
 				This Property shall accept/return one among the values mentioned in constant section which starts with AIM_...</DESC>
 				<DESC_EB>Specifies the aim behaviour when taking a picture. Applicable only for imager module.
 				This Property shall accept/return one among the values mentioned in constant section which starts with AIM_...</DESC_EB>
-                
+
             </PROPERTY>
         </PROPERTIES>
 

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

@@ -14,11 +14,11 @@ import com.rhomobile.rhodes.api.IMethodResult;
 
 public class CameraEclair extends CameraObject implements ICameraObject {
     private static final String TAG = CameraEclair.class.getSimpleName();
-    
+
     private List<Camera.Size> mSupportedPictureSizes;
 
-    CameraEclair(String id) { 
-        super(id); 
+    CameraEclair(String id) {
+        super(id);
 
         getPropertiesMap().put("cameraType", "back");
         getPropertiesMap().put("compressionFormat", "jpg");
@@ -99,7 +99,7 @@ public class CameraEclair extends CameraObject implements ICameraObject {
                     closeCamera();
                 }
             });
-            
+
         } else {
             getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
         }
@@ -109,7 +109,18 @@ public class CameraEclair extends CameraObject implements ICameraObject {
     protected ISize getDesiredSize() {
         String strDesiredWidth = getActualPropertyMap().get("desiredWidth");
         String strDesiredHeight = getActualPropertyMap().get("desiredHeight");
-        
+
+        if (Boolean.parseBoolean(getActualPropertyMap().get("useRealBitmapResize"))) {
+            return null;
+        }
+
+        if (Integer.valueOf(strDesiredWidth) <= 0) {
+            strDesiredWidth = null;
+        }
+        if (Integer.valueOf(strDesiredHeight) <= 0) {
+            strDesiredHeight = null;
+        }
+
         int minDiff = Integer.MAX_VALUE;
         ISize selectedSize = null;
 
@@ -157,7 +168,7 @@ public class CameraEclair extends CameraObject implements ICameraObject {
             supported = (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
         }
         return supported;
-        
+
     }
 
     protected String getFlashMode() {

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

@@ -43,56 +43,56 @@ public class CameraObject extends CameraBase implements ICameraObject {
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_hhmmss");
     void setActualPropertyMap(Map<String, String> props) { mActualPropertyMap = props; }
     Map<String, String> getActualPropertyMap() { return mActualPropertyMap; }
-    
-    
+
+
     private Camera mCamera;
     private int mCameraUsers;
     private Uri fileUri;
     String mCurrentPhotoPath = null;
     public static String userFilePath = null;
     private ContentValues values = null;
-    
+
     int getCameraIndex() {
         return CameraSingletonObject.getCameraIndex(getId());
     }
     @Override
     public void setProperties(Map<String, String> propertyMap, IMethodResult result) {
-		// TODO Auto-generated method stub
-		Map<String, String> temp=getPropertiesMap();
-		temp.putAll(propertyMap);
-		result.set(true);
+        // TODO Auto-generated method stub
+        Map<String, String> temp=getPropertiesMap();
+        temp.putAll(propertyMap);
+        result.set(true);
     }
     @Override
-public void getProperties(List<String> arrayofNames, IMethodResult result) {
-	
-	//super.getProperties(arrayofNames, result);
-	Map<String, Object> props = new HashMap<String, Object>();
-       for (String name: arrayofNames)
-       {
-    	  props.put(name, cameraPropGet(name));
-       }
-       result.set(props);
-       
-}
-    
+    public void getProperties(List<String> arrayofNames, IMethodResult result) {
+
+        //super.getProperties(arrayofNames, result);
+        Map<String, Object> props = new HashMap<String, Object>();
+        for (String name: arrayofNames)
+        {
+            props.put(name, cameraPropGet(name));
+        }
+        result.set(props);
+
+    }
+
     private String cameraPropGet(String name)
     {
-    	String propValue="";
-    	Map<String, String> temp=getPropertiesMap();
-    	if(temp.containsKey(name))
-    	{
-    		
-    		 try{
-    		 	propValue=String.valueOf(temp.get(name));
-    		}
-    		 catch(Exception ex)
-    		 {
-    			
-    		 }
-    	}
-    	return propValue;
+        String propValue="";
+        Map<String, String> temp=getPropertiesMap();
+        if(temp.containsKey(name))
+        {
+
+            try{
+                propValue=String.valueOf(temp.get(name));
+            }
+            catch(Exception ex)
+            {
+
+            }
+        }
+        return propValue;
     }
-    
+
     static class CameraSize implements ICameraObject.ISize {
         private Camera.Size mSize;
         CameraSize(Camera.Size size) { mSize = size; }
@@ -101,7 +101,7 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
         @Override public int D2() { return mSize.width * mSize.width + mSize.height * mSize.height; }
         @Override public String toString() { return "" + mSize.width + "X" + mSize.height; }
     }
-    
+
     static class RawSize implements ICameraObject.ISize {
         private int width;
         private int height;
@@ -119,106 +119,106 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
             mPreviewActivity = previewActivity;
         }
         @Override
-        public void onPictureTaken(byte[] data, Camera camera) {        	
+        public void onPictureTaken(byte[] data, Camera camera) {
             Intent intent = new Intent();
             OutputStream stream = null;
             Bitmap bitmap = null;
             try {
-            	
+
                 final Map<String, String> propertyMap = getActualPropertyMap();
                 if (propertyMap == null) {
                     throw new RuntimeException("Camera property map is undefined");
                 }
-             
+
                 String outputFormat = propertyMap.get("outputFormat");
-                if(propertyMap.get("deprecated") == null || propertyMap.get("deprecated").equalsIgnoreCase("false")){   
-    		  propertyMap.put("deprecated", "false");
-    		  deprecated_take_pic = false;    	
-    	        }
-    	        else
-    		   deprecated_take_pic = true;
+                if(propertyMap.get("deprecated") == null || propertyMap.get("deprecated").equalsIgnoreCase("false")){
+                    propertyMap.put("deprecated", "false");
+                    deprecated_take_pic = false;
+                }
+                else
+                deprecated_take_pic = true;
                 if(propertyMap.containsKey("captureSound")){
                     Runnable music= new Runnable(){
-                		public void run() {
-                			playMusic(propertyMap.get("captureSound"));
-                		}
-                	};
+                        public void run() {
+                            playMusic(propertyMap.get("captureSound"));
+                        }
+                    };
                     ExecutorService exec = Executors.newSingleThreadExecutor();
                     exec.submit(music);
                 }
-                
+
                 String filePath = null;
-                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_hhmmss");                
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_hhmmss");
                 if(!propertyMap.containsKey("fileName")){
-                   filePath = "/sdcard/DCIM/Camera/IMG_"+ dateFormat.format(new Date(System.currentTimeMillis()));
-                   userFilePath = filePath;
-         	}
-         	else{
-                   filePath = propertyMap.get("fileName");
-                   userFilePath = filePath;
-				   if(filePath.contains("\\")){
-						intent.putExtra("error", "Invalid file path");
-					}
-         	}
+                    filePath = "/sdcard/DCIM/Camera/IMG_"+ dateFormat.format(new Date(System.currentTimeMillis()));
+                    userFilePath = filePath;
+                }
+                else{
+                    filePath = propertyMap.get("fileName");
+                    userFilePath = filePath;
+                    if(filePath.contains("\\")){
+                        intent.putExtra("error", "Invalid file path");
+                    }
+                }
                 Uri resultUri = null;
                 BitmapFactory.Options options=new BitmapFactory.Options();
-		options.inPurgeable = true;
+                options.inPurgeable = true;
                 bitmap = BitmapFactory.decodeByteArray(data, 0, data.length, options);
-                 if (outputFormat.equalsIgnoreCase("dataUri")) {
-                    Logger.T(TAG, "outputFormat: " + outputFormat);   
+                if (outputFormat.equalsIgnoreCase("dataUri")) {
+                    Logger.T(TAG, "outputFormat: " + outputFormat);
                     filePath = getTemporaryPath(filePath)+ ".jpg";
-                    if (Boolean.parseBoolean(propertyMap.get("saveToDeviceGallery"))) 
-                    {                        
+                    if (Boolean.parseBoolean(propertyMap.get("saveToDeviceGallery")))
+                    {
                         ContentResolver contentResolver = ContextFactory.getContext().getContentResolver();
                         Logger.T(TAG, "Image size: " + bitmap.getWidth() + "X" + bitmap.getHeight());
                         propertyMap.put("DeviceGallery_Key", "DeviceGallery_Value");
                         String strUri = null;
-						if (!propertyMap.containsKey("fileName")) {
-							strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, "IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())), "Camera");
-						}
-							else{
-							strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, new File(propertyMap.get("fileName")).getName(), "Camera");
-						}
-						if (strUri != null) {
-                            resultUri = Uri.parse(strUri);                           
+                        if (!propertyMap.containsKey("fileName")) {
+                            strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, "IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())), "Camera");
+                        }
+                        else{
+                            strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, new File(propertyMap.get("fileName")).getName(), "Camera");
+                        }
+                        if (strUri != null) {
+                            resultUri = Uri.parse(strUri);
                         } else {
                             throw new RuntimeException("Failed to save camera image to Gallery");
-                        }                  
-                    } 
+                        }
+                    }
                     else
-                    {   
-                    	 if(userFilePath.contains("sdcard")){
-                    		 
-                    		 Boolean isSDPresent = android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED);
-                    			
-
-                    				if(isSDPresent)
-                    				{
-                    					int lastIndex = userFilePath.lastIndexOf("/");
-                    					
-                    					String subfolderName = userFilePath.replaceAll("/sdcard", "");
-                    					String folderName = subfolderName.substring(subfolderName.indexOf("/")+1,subfolderName.lastIndexOf("/"));
-                    					
-                    					String file_name= userFilePath.substring(lastIndex+1, userFilePath.length());
-                    					
-                    					
-                    					File directory = new File(Environment.getExternalStorageDirectory()+File.separator + folderName);
-                    					boolean flag = directory.mkdirs();
-                    					
-                    					stream = new FileOutputStream(directory +File.separator  + file_name+".jpg");                        
-                	                    resultUri = Uri.fromFile(new File(directory +File.separator  + file_name+".jpg"));                        
-                	                    stream.write(data);    
-                	                    stream.flush();                        
-                	                    stream.close();
-                    			}
-                      }else{
-  	                    stream = new FileOutputStream(filePath);                        
-  	                    resultUri = Uri.fromFile(new File(filePath));                         
-	                    stream.write(data);    
-	                    stream.flush();                        
-	                    stream.close();
-                      }
-	                    //CameraRhoListener.getInstance().copyImgAsUserChoice(filePath);
+                    {
+                        if(userFilePath.contains("sdcard")){
+
+                            Boolean isSDPresent = android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED);
+
+
+                            if(isSDPresent)
+                            {
+                                int lastIndex = userFilePath.lastIndexOf("/");
+
+                                String subfolderName = userFilePath.replaceAll("/sdcard", "");
+                                String folderName = subfolderName.substring(subfolderName.indexOf("/")+1,subfolderName.lastIndexOf("/"));
+
+                                String file_name= userFilePath.substring(lastIndex+1, userFilePath.length());
+
+
+                                File directory = new File(Environment.getExternalStorageDirectory()+File.separator + folderName);
+                                boolean flag = directory.mkdirs();
+
+                                stream = new FileOutputStream(directory +File.separator  + file_name+".jpg");
+                                resultUri = Uri.fromFile(new File(directory +File.separator  + file_name+".jpg"));
+                                stream.write(data);
+                                stream.flush();
+                                stream.close();
+                            }
+                        }else{
+                            stream = new FileOutputStream(filePath);
+                            resultUri = Uri.fromFile(new File(filePath));
+                            stream.write(data);
+                            stream.flush();
+                            stream.close();
+                        }
+                        //CameraRhoListener.getInstance().copyImgAsUserChoice(filePath);
                     }
                     StringBuilder dataBuilder = new StringBuilder();
                     dataBuilder.append("data:image/jpeg;base64,");
@@ -226,46 +226,46 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
                     propertyMap.put("captureUri", dataBuilder.toString());
                     propertyMap.put("dataURI", "datauri_value");
                     Logger.T(TAG, dataBuilder.toString());
-                    intent.putExtra("IMAGE_WIDTH", bitmap.getWidth());                    
-                    intent.putExtra("IMAGE_HEIGHT", bitmap.getHeight());                  
-                    mPreviewActivity.setResult(Activity.RESULT_OK, intent);                    
+                    intent.putExtra("IMAGE_WIDTH", bitmap.getWidth());
+                    intent.putExtra("IMAGE_HEIGHT", bitmap.getHeight());
+                    mPreviewActivity.setResult(Activity.RESULT_OK, intent);
                 } else
                 if (outputFormat.equalsIgnoreCase("image")) {
                     filePath = getTemporaryPath(filePath)+ ".jpg";
-                    Logger.T(TAG, "outputFormat: " + outputFormat + ", path: " + filePath);                    
-                    if (Boolean.parseBoolean(propertyMap.get("saveToDeviceGallery"))) 
-                    {                        
+                    Logger.T(TAG, "outputFormat: " + outputFormat + ", path: " + filePath);
+                    if (Boolean.parseBoolean(propertyMap.get("saveToDeviceGallery")))
+                    {
                         ContentResolver contentResolver = ContextFactory.getContext().getContentResolver();
                         Logger.T(TAG, "Image size: " + bitmap.getWidth() + "X" + bitmap.getHeight());
                         propertyMap.put("DeviceGallery_Key", "DeviceGallery_Value");
                         String strUri = null;
-			if (!propertyMap.containsKey("fileName")) 
-				strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, "IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())), "Camera");
-			else
-				strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, new File(propertyMap.get("fileName")).getName(), "Camera");
-			if (strUri != null) {
-                            resultUri = Uri.parse(strUri);                           
+                        if (!propertyMap.containsKey("fileName"))
+                        strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, "IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())), "Camera");
+                        else
+                        strUri = MediaStore.Images.Media.insertImage(contentResolver, bitmap, new File(propertyMap.get("fileName")).getName(), "Camera");
+                        if (strUri != null) {
+                            resultUri = Uri.parse(strUri);
                         } else {
                             throw new RuntimeException("Failed to save camera image to Gallery");
-                        }                  
-                    } 
+                        }
+                    }
                     else
-                    {                    	
-                        stream = new FileOutputStream(filePath);                        
-                        resultUri = Uri.fromFile(new File(filePath));                        
-                        stream.write(data);                       
-                        stream.flush();                        
-                        stream.close();                       
+                    {
+                        stream = new FileOutputStream(filePath);
+                        resultUri = Uri.fromFile(new File(filePath));
+                        stream.write(data);
+                        stream.flush();
+                        stream.close();
                     }
-                       
+
                     intent.putExtra(MediaStore.EXTRA_OUTPUT, resultUri);
-                    intent.putExtra("IMAGE_WIDTH", bitmap.getWidth());                    
-                    intent.putExtra("IMAGE_HEIGHT", bitmap.getHeight());                   
-                    mPreviewActivity.setResult(Activity.RESULT_OK, intent);        
-                }              
-             
+                    intent.putExtra("IMAGE_WIDTH", bitmap.getWidth());
+                    intent.putExtra("IMAGE_HEIGHT", bitmap.getHeight());
+                    mPreviewActivity.setResult(Activity.RESULT_OK, intent);
+                }
+
             } catch (Throwable e) {
-                Logger.E(TAG, e);                
+                Logger.E(TAG, e);
                 if (stream != null) {
                     try {
                         stream.close();
@@ -273,64 +273,64 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
                         //Do nothing
                     }
                 }
-                intent.putExtra("error", e.getMessage());              
-                mPreviewActivity.setResult(Activity.RESULT_CANCELED, intent);                
+                intent.putExtra("error", e.getMessage());
+                mPreviewActivity.setResult(Activity.RESULT_CANCELED, intent);
+            }
+            if(bitmap != null){
+                bitmap.recycle();
+                bitmap = null;
+                System.gc();
             }
-        if(bitmap != null){
-            bitmap.recycle();
-            bitmap = null;
-	    System.gc();
-	}
             mPreviewActivity.finish();
-        }	
-	private void playMusic(String musicPath) {
-			 mp = new MediaPlayer();
-			 try {
-			        mp.setDataSource(RhoFileApi.openFd(musicPath));
-			    } catch (IllegalArgumentException e) {
-			        // TODO Auto-generated catch block
-			        e.printStackTrace();
-			    } catch (IllegalStateException e) {
-			        // TODO Auto-generated catch block
-			        e.printStackTrace();
-			    } catch (IOException e) {
-			        // TODO Auto-generated catch block
-			        e.printStackTrace();
-			    }
-			    try {
-			        mp.prepare();
-			    } catch (IllegalStateException e) {
-			        // TODO Auto-generated catch block
-			        e.printStackTrace();
-			    } catch (IOException e) {
-			        // TODO Auto-generated catch block
-			        e.printStackTrace();
-			    }
-			    mp.start();
-			    try {
-					Thread.sleep(3000);
-				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			    mp.stop();
-			    clearMediaPlayerResources();
-		}
-
-	private void clearMediaPlayerResources() {
-			// TODO Auto-generated method stub
-			if(mp != null){
-				mp.release();
-				mp = null;
-	    	}
-		}		
- }
-	
-	
+        }
+        private void playMusic(String musicPath) {
+            mp = new MediaPlayer();
+            try {
+                mp.setDataSource(RhoFileApi.openFd(musicPath));
+            } catch (IllegalArgumentException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IllegalStateException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            try {
+                mp.prepare();
+            } catch (IllegalStateException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            mp.start();
+            try {
+                Thread.sleep(3000);
+            } catch (InterruptedException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+            mp.stop();
+            clearMediaPlayerResources();
+        }
+
+        private void clearMediaPlayerResources() {
+            // TODO Auto-generated method stub
+            if(mp != null){
+                mp.release();
+                mp = null;
+            }
+        }
+    }
+
+
 
     protected Camera getCamera() { return mCamera; }
     protected void setCamera(Camera camera) { mCamera = camera; }
-    
+
     synchronized protected void openCamera() {
         if (mCameraUsers == 0) {
             setCamera(android.hardware.Camera.open());
@@ -347,21 +347,26 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
     CameraObject(String id) {
         super(id);
 
-	getPropertiesMap().put("ChoosePicture_Key", "");
+        getPropertiesMap().put("ChoosePicture_Key", "");
         getPropertiesMap().put("cameraType", "back");
         getPropertiesMap().put("compressionFormat", "jpg");
         getPropertiesMap().put("outputFormat", "image");
         getPropertiesMap().put("colorModel", "rgb");
-	getPropertiesMap().put("useSystemViewfinder", "false");
-	getPropertiesMap().put("saveToDeviceGallery", "false");
+        getPropertiesMap().put("useSystemViewfinder", "false");
+        getPropertiesMap().put("useRealBitmapResize", "false");
+        getPropertiesMap().put("saveToDeviceGallery", "false");
         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("desiredWidth", "640");
-	getPropertiesMap().put("desiredHeight", "480");
+
+        // default desired size not specified in documentation and XML !!!
+        //getPropertiesMap().put("desiredWidth", "640");
+        //getPropertiesMap().put("desiredHeight", "480");
+        getPropertiesMap().put("desiredWidth", "0");
+        getPropertiesMap().put("desiredHeight", "0");
     }
 
     @Override
@@ -388,46 +393,47 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
                 Logger.E(TAG, e);
                 return;
             }
-        } 
+        }
     }
 
     @SuppressWarnings("deprecation")
     @SuppressLint("NewApi")
-	@Override
+    @Override
     public ISize setPreviewSize(int width, int height) {
-    	Camera camera = getCamera();
-        Camera.Parameters parameters = camera.getParameters();       
-        List<android.hardware.Camera.Size> sizes = camera.getParameters().getSupportedPictureSizes();        
-        android.hardware.Camera.Size maxSize=sizes.get(0);       
-        if(getActualPropertyMap().containsKey("desiredWidth") || getActualPropertyMap().containsKey("desiredHeight")){
-        	int desired_width = Integer.parseInt(getActualPropertyMap().get("desiredWidth"));
-            int desired_height = Integer.parseInt(getActualPropertyMap().get("desiredHeight"));               
-        	if(desired_width > 0 && desired_width <= maxSize.width && desired_height > 0 && desired_height <= maxSize.height){        	
-        	 Camera.Size previewSize = getOptimalPreviewSize(parameters.getSupportedPictureSizes(), desired_width, desired_height);
-        	 Logger.T(TAG, "Selected size: " + previewSize.width + "x" + previewSize.height);             
-                 parameters.setPreviewSize(previewSize.width, previewSize.height);
-        	}
-        	else if(desired_width > maxSize.width || desired_height > maxSize.height){        		
-        		parameters.setPreviewSize(maxSize.width , maxSize.height);       
-        	}
-        	else{ 
-        		parameters.setPreviewSize(320, 240);
-        	}
+        Camera camera = getCamera();
+        Camera.Parameters parameters = camera.getParameters();
+        List<android.hardware.Camera.Size> sizes = camera.getParameters().getSupportedPictureSizes();
+        android.hardware.Camera.Size maxSize=sizes.get(0);
+        if((getActualPropertyMap().containsKey("desiredWidth") || getActualPropertyMap().containsKey("desiredHeight")) &&
+        (!Boolean.parseBoolean(getActualPropertyMap().get("useRealBitmapResize")))){
+            int desired_width = Integer.parseInt(getActualPropertyMap().get("desiredWidth"));
+            int desired_height = Integer.parseInt(getActualPropertyMap().get("desiredHeight"));
+            if(desired_width > 0 && desired_width <= maxSize.width && desired_height > 0 && desired_height <= maxSize.height){
+                Camera.Size previewSize = getOptimalPreviewSize(parameters.getSupportedPictureSizes(), desired_width, desired_height);
+                Logger.T(TAG, "Selected size: " + previewSize.width + "x" + previewSize.height);
+                parameters.setPreviewSize(previewSize.width, previewSize.height);
+            }
+            else if(desired_width > maxSize.width || desired_height > maxSize.height){
+                parameters.setPreviewSize(maxSize.width , maxSize.height);
+            }
+            else{
+                parameters.setPreviewSize(320, 240);
+            }
         }
         else{
-        Camera.Size previewSize = getOptimalPreviewSize(parameters.getSupportedPictureSizes(), width, height);
-        Logger.T(TAG, "Selected size: " + previewSize.width + "x" + previewSize.height);        
-        parameters.setPreviewSize(previewSize.width, previewSize.height);
-       }
+            Camera.Size previewSize = getOptimalPreviewSize(parameters.getSupportedPictureSizes(), width, height);
+            Logger.T(TAG, "Selected size: " + previewSize.width + "x" + previewSize.height);
+            parameters.setPreviewSize(previewSize.width, previewSize.height);
+        }
         camera.stopPreview();
         try{
-           camera.setParameters(parameters);
+            camera.setParameters(parameters);
         }
-        catch(RuntimeException e){        	
-        	e.printStackTrace();
+        catch(RuntimeException e){
+            e.printStackTrace();
         }
         camera.startPreview();
-        
+
         return new CameraSize(camera.getParameters().getPreviewSize());
     }
 
@@ -448,9 +454,9 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
 
             double scale = (double) size.width / w;
             double ratio = (double) size.width / size.height;
-            
+
             Logger.T(TAG, "Target ratio: " + targetRatio + ", ratio: " + ratio + ", scale: " + scale);
-            
+
             if (size.width > w || size.height > h) continue;
             if (Math.abs(1 - scale) > SCALE_TOLERANCE) continue;
             if (Math.abs(ratio - targetRatio) > ASPECT_TOLERANCE) continue;
@@ -513,46 +519,50 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
 
     @Override
     public void takePicture(Map<String, String> propertyMap, IMethodResult result) {
+
+        CameraSingletonObject.deprecated_choose_pic = false;
+        deprecated_take_pic = false;
+
         Logger.T(TAG, "takePicture");
         try {
             Map<String, String> actualPropertyMap = new HashMap<String, String>();
             actualPropertyMap.putAll(getPropertiesMap());
             actualPropertyMap.putAll(propertyMap);
             setActualPropertyMap(actualPropertyMap);
-            
+
             String outputFormat = actualPropertyMap.get("outputFormat");
             String filePath = null;
             if(!actualPropertyMap.containsKey("fileName")){
-            	filePath = "/sdcard/DCIM/Camera/IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())) + ".jpg";
-     	   }
-     	   else{
-     		filePath = actualPropertyMap.get("fileName");
-     	   }
+                filePath = "/sdcard/DCIM/Camera/IMG_"+ dateFormat.format(new Date(System.currentTimeMillis())) + ".jpg";
+            }
+            else{
+                filePath = actualPropertyMap.get("fileName");
+            }
             if (outputFormat.equalsIgnoreCase("image")) {
-            	filePath = actualPropertyMap.get("fileName") + ".jpg";
-                Logger.T(TAG, "outputFormat: " + outputFormat + ", path: " + filePath);               
+                filePath = actualPropertyMap.get("fileName") + ".jpg";
+                Logger.T(TAG, "outputFormat: " + outputFormat + ", path: " + filePath);
             } else
             if (outputFormat.equalsIgnoreCase("dataUri")) {
-                Logger.T(TAG, "outputFormat: " + outputFormat);                
+                Logger.T(TAG, "outputFormat: " + outputFormat);
             } else {
                 throw new RuntimeException("Unknown 'outputFormat' value: " + outputFormat);
             }
-            
+
             Intent intent = null;
             if (Boolean.parseBoolean(actualPropertyMap.get("useSystemViewfinder"))) {
                 if (outputFormat.equalsIgnoreCase("image")) {
                     values = new ContentValues();
-            		fileUri = RhodesActivity.getContext().getContentResolver().insert(
-            				MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
-                	intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); 
-                	actualPropertyMap.put("captureUri", fileUri.toString());
-                	propertyMap.put("dataURI", "");
-                	// intent is null with MediaStore.EXTRA_OUTPUT so adding fileuri to map and get it with same key
-                	// if instead of MediaStore.EXTRA_OUTPUT any other key is used then the bitmap is null though the file is getting created
-            		intent.putExtra(MediaStore.EXTRA_OUTPUT, fileUri);
+                    fileUri = RhodesActivity.getContext().getContentResolver().insert(
+                    MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
+                    intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+                    actualPropertyMap.put("captureUri", fileUri.toString());
+                    propertyMap.put("dataURI", "");
+                    // intent is null with MediaStore.EXTRA_OUTPUT so adding fileuri to map and get it with same key
+                    // if instead of MediaStore.EXTRA_OUTPUT any other key is used then the bitmap is null though the file is getting created
+                    intent.putExtra(MediaStore.EXTRA_OUTPUT, fileUri);
                 } else
                 if (outputFormat.equalsIgnoreCase("dataUri")) {
-                    
+
                 }
             } else {
                 intent = new Intent(ContextFactory.getUiContext(), CameraActivity.class);
@@ -560,7 +570,7 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
             }
             ((CameraFactory)CameraFactorySingleton.getInstance()).getRhoListener().setMethodResult(result);
             ((CameraFactory)CameraFactorySingleton.getInstance()).getRhoListener().setActualPropertyMap(actualPropertyMap);
-            
+
             RhodesActivity.safeGetInstance().startActivityForResult(intent, RhoExtManager.getInstance().getActivityResultNextRequestCode(CameraRhoListener.getInstance()));
         } catch (RuntimeException e) {
             Logger.E(TAG, e);
@@ -583,13 +593,13 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
             return null;
         }
     }
-    
+
     @Override
     public void getSupportedSizeList(IMethodResult result) {
     }
 
     @SuppressLint("NewApi")
-	@Override
+    @Override
     public void doTakePicture(Activity previewActivity, int rotation) {
         Logger.T(TAG, "doTakePicture: rotation: " + rotation);
         openCamera();
@@ -599,64 +609,64 @@ public void getProperties(List<String> arrayofNames, IMethodResult result) {
         getCamera().takePicture(null, null, new TakePictureCallback(previewActivity));
         closeCamera();
     }
-    
+
     public void finalize() {
         if (getCamera() != null) {
             getCamera().release();
         }
     }
-	@Override
-	public void showPreview(Map<String, String> propertyMap,
-			IMethodResult result) {
-		// TODO Auto-generated method stub
-		
-	}
-	@Override
-	public void hidePreview(IMethodResult result) {
-		// TODO Auto-generated method stub
-		
-	}
-	@Override
-	public void capture(IMethodResult result) {
-		// TODO Auto-generated method stub
-		
-	}
-	
-	@Override
-	public void setDisplayOrientation(int rotate) {
-	    Camera camera = getCamera();
-	    camera.setDisplayOrientation(rotate);
-	}
-	
-	
-	/**
-	 * Checks the device if it has
-	 * auto focus feature and sets auto focus
-	 * @param Preview Activity
-	 * 
-	 */
-	
-	@Override
-	public void setFocus(final Activity preview) {
-		openCamera();
-		 if (hasAutoFocus()) {
-	            getCamera().autoFocus(new Camera.AutoFocusCallback() {
-	                public void onAutoFocus(boolean success, Camera camera) {
-	                }
-	            });
-	            
-	        } 
-		 closeCamera();
-	}
-	
-	private boolean hasAutoFocus() {
+    @Override
+    public void showPreview(Map<String, String> propertyMap,
+    IMethodResult result) {
+        // TODO Auto-generated method stub
+
+    }
+    @Override
+    public void hidePreview(IMethodResult result) {
+        // TODO Auto-generated method stub
+
+    }
+    @Override
+    public void capture(IMethodResult result) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void setDisplayOrientation(int rotate) {
+        Camera camera = getCamera();
+        camera.setDisplayOrientation(rotate);
+    }
+
+
+    /**
+    * Checks the device if it has
+    * auto focus feature and sets auto focus
+    * @param Preview Activity
+    *
+    */
+
+    @Override
+    public void setFocus(final Activity preview) {
+        openCamera();
+        if (hasAutoFocus()) {
+            getCamera().autoFocus(new Camera.AutoFocusCallback() {
+                public void onAutoFocus(boolean success, Camera camera) {
+                }
+            });
+
+        }
+        closeCamera();
+    }
+
+    private boolean hasAutoFocus() {
         String focusMode = getCamera().getParameters().getFocusMode();
         boolean supported = false;
         if (focusMode != null) {
             supported = (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_AUTO)) || (focusMode.equals(android.hardware.Camera.Parameters.FOCUS_MODE_MACRO));
         }
         return supported;
-        
+
     }
-	
+
 }