rhodes 3.0.2 → 3.1.0.beta.1

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothManagerOld.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.bluetooth;
 
 import android.content.Intent;
@@ -6,10 +32,9 @@ import android.util.Log;
 public class RhoBluetoothManagerOld implements IRhoBluetoothManager {
 
     private static final String TAG = "RhoBluetoothManagerOld";
-    private static final boolean D = true;
 
 	public RhoBluetoothManagerOld () {
-		if(D) Log.d(TAG, "RhoBluetoothManagerOld()");
+		RhoBluetoothManager.logi(TAG, "RhoBluetoothManagerOld()");
 	}
 	
 	public void init() {}
@@ -90,4 +115,18 @@ public class RhoBluetoothManagerOld implements IRhoBluetoothManager {
 	public void session_write_data(String connected_device_name, byte[] buf, int length) {
 	}
 
+	public void create_custom_server_session(String client_name, String callback_url) {
+		fireCreateSessionCallback(RhoBluetoothManager.BTC_ERROR, "");
+		return;
+	}
+
+	public void create_custom_client_session(String server_name, String callback_url) {
+		fireCreateSessionCallback(RhoBluetoothManager.BTC_ERROR, "");
+		return;
+	}
+	
+	public void stop_current_connection_process() {
+		return;
+	}
+	
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/RhoBluetoothSession.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.bluetooth;
 
 import java.io.IOException;
@@ -18,12 +44,13 @@ public class RhoBluetoothSession {
 	// events for listener
 	public static String BT_SESSION_INPUT_DATA_RECEIVED = "SESSION_INPUT_DATA_RECEIVED";
 	public static String BT_SESSION_DISCONNECT = "SESSION_DISCONNECT";
+	public static String BT_SESSION_ERROR = "ERROR";
+	
 	
 	
     // Debugging
     private static final String TAG = "RhoBluetoothSession";
-    private static final boolean D = true;
-
+ 
     // Name for the SDP record when creating server socket
     private static final String NAME = "btspp";
 
@@ -69,21 +96,25 @@ public class RhoBluetoothSession {
      * @param state  An integer defining the current connection state
      */
     private synchronized void setState(int state) {
-        if (D) Log.d(TAG, "setState() " + mState + " -> " + state);
+    	RhoBluetoothManager.logi(TAG, "setState() " + mState + " -> " + state);
         mState = state;
 
         // Give the new state to the Handler so the UI Activity can update
         //mHandler.obtainMessage(RhoBluetoothManager.MESSAGE_STATE_CHANGE, state, -1).sendToTarget();
         switch (mState) {
         case RhoBluetoothSession.STATE_CONNECTED:
+        	RhoBluetoothManager.logi(TAG, "     STATE_CONNECTED");
             //fireCreateSessionCallback(BTC_OK, mConnectedDeviceName);
         	mCallbackUrl = null;
         	RhoBluetoothManager.sharedInstance().onSessionConnectedOK();
             break;
         case RhoBluetoothSession.STATE_LISTEN:
+        	RhoBluetoothManager.logi(TAG, "     STATE_LISTEN");
+        	break;
         case RhoBluetoothSession.STATE_NONE:
         	//fireSessionCallback(mConnectedDeviceName, mSession.BT_SESSION_DISCONNECT);
         	mCallbackUrl = null;
+        	RhoBluetoothManager.logi(TAG, "     STATE_NONE");
         	RhoBluetoothManager.sharedInstance().onSessionDisconnected();
             break;
         }
@@ -99,7 +130,7 @@ public class RhoBluetoothSession {
      * Start the chat service. Specifically start AcceptThread to begin a
      * session in listening (server) mode. Called by the Activity onResume() */
     public synchronized void start() {
-        if (D) Log.d(TAG, "start");
+    	RhoBluetoothManager.logi(TAG, "start()");
 
         // Cancel any thread attempting to make a connection
         if (mConnectThread != null) {mConnectThread.cancel(); mConnectThread = null;}
@@ -120,7 +151,7 @@ public class RhoBluetoothSession {
      * @param device  The BluetoothDevice to connect
      */
     public synchronized void connect(BluetoothDevice device) {
-        if (D) Log.d(TAG, "connect to: " + device);
+    	RhoBluetoothManager.logi(TAG, "connect() to: " + device.getName());
 
         // Cancel any thread attempting to make a connection
         if (mState == STATE_CONNECTING) {
@@ -142,7 +173,7 @@ public class RhoBluetoothSession {
      * @param device  The BluetoothDevice that has been connected
      */
     public synchronized void connected(BluetoothSocket socket, BluetoothDevice device) {
-        if (D) Log.d(TAG, "connected");
+    	RhoBluetoothManager.logi(TAG, "connected()");
 
         // Cancel the thread that completed the connection
         if (mConnectThread != null) {mConnectThread.cancel(); mConnectThread = null;}
@@ -173,7 +204,7 @@ public class RhoBluetoothSession {
      * Stop all threads
      */
     public synchronized void stop() {
-        if (D) Log.d(TAG, "stop");
+    	RhoBluetoothManager.logi(TAG, "stop()");
         if (mConnectThread != null) {mConnectThread.cancel(); mConnectThread = null;}
         if (mConnectedThread != null) {mConnectedThread.cancel(); mConnectedThread = null;}
         if (mAcceptThread != null) {mAcceptThread.cancel(); mAcceptThread = null;}
@@ -186,6 +217,7 @@ public class RhoBluetoothSession {
      * @see ConnectedThread#write(byte[])
      */
     public void write(byte[] out) {
+    	RhoBluetoothManager.logi(TAG, "write()");
         // Create temporary object
         ConnectedThread r;
         // Synchronize a copy of the ConnectedThread
@@ -201,8 +233,8 @@ public class RhoBluetoothSession {
      * Indicate that the connection attempt failed and notify the UI Activity.
      */
     private void connectionFailed() {
-        if (D) Log.d(TAG, "connectionFailed()");
-        setState(STATE_LISTEN);
+    	RhoBluetoothManager.logi(TAG, "connectionFailed()");
+        setState(STATE_NONE);
 
         // Send a failure message back to the Activity
         //Message msg = mHandler.obtainMessage(RhoBluetoothManager.MESSAGE_TOAST);
@@ -217,8 +249,8 @@ public class RhoBluetoothSession {
      * Indicate that the connection was lost and notify the UI Activity.
      */
     public void connectionLost() {
-        if (D) Log.d(TAG, "connectionLost()");
-        setState(STATE_LISTEN);
+    	RhoBluetoothManager.logi(TAG, "connectionLost()");
+        setState(STATE_NONE);
 
         // Send a failure message back to the Activity
         //Message msg = mHandler.obtainMessage(RhoBluetoothManager.MESSAGE_TOAST);
@@ -251,7 +283,7 @@ public class RhoBluetoothSession {
         }
 
         public void run() {
-            if (D) Log.d(TAG, "BEGIN mAcceptThread" + this);
+        	RhoBluetoothManager.logi(TAG, "BEGIN mAcceptThread" + this);
             setName("AcceptThread");
             BluetoothSocket socket = null;
 
@@ -288,11 +320,11 @@ public class RhoBluetoothSession {
                     }
                 }
             }
-            if (D) Log.i(TAG, "END mAcceptThread");
+            RhoBluetoothManager.logi(TAG, "END mAcceptThread");
         }
 
         public void cancel() {
-            if (D) Log.d(TAG, "cancel " + this);
+        	RhoBluetoothManager.logi(TAG, "CANCEL mAcceptThread");
             try {
                 mmServerSocket.close();
             } catch (IOException e) {
@@ -326,7 +358,7 @@ public class RhoBluetoothSession {
         }
 
         public void run() {
-            Log.i(TAG, "BEGIN mConnectThread");
+        	RhoBluetoothManager.logi(TAG, "BEGIN mConnectThread");
             setName("ConnectThread");
 
             // Always cancel discovery because it will slow down a connection
@@ -343,10 +375,11 @@ public class RhoBluetoothSession {
                 try {
                     mmSocket.close();
                 } catch (IOException e2) {
-                    Log.e(TAG, "unable to close() socket during connection failure", e2);
+                	RhoBluetoothManager.loge(TAG, "unable to close() socket during connection failure");
                 }
                 // Start the service over to restart listening mode
                 RhoBluetoothSession.this.start();
+                RhoBluetoothManager.logi(TAG, "END mConnectThread");
                 return;
             }
 
@@ -357,13 +390,15 @@ public class RhoBluetoothSession {
 
             // Start the connected thread
             connected(mmSocket, mmDevice);
+            RhoBluetoothManager.logi(TAG, "END mConnectThread");
         }
 
         public void cancel() {
+        	RhoBluetoothManager.logi(TAG, "CAMCEL mConnectThread");
             try {
                 mmSocket.close();
             } catch (IOException e) {
-                Log.e(TAG, "close() of connect socket failed", e);
+            	RhoBluetoothManager.loge(TAG, "close() of connect socket failed");
             }
         }
     }
@@ -378,7 +413,7 @@ public class RhoBluetoothSession {
         private final OutputStream mmOutStream;
 
         public ConnectedThread(BluetoothSocket socket) {
-            Log.d(TAG, "create ConnectedThread");
+        	RhoBluetoothManager.logi(TAG, "create mConnectedThread");
             mmSocket = socket;
             InputStream tmpIn = null;
             OutputStream tmpOut = null;
@@ -388,7 +423,7 @@ public class RhoBluetoothSession {
                 tmpIn = socket.getInputStream();
                 tmpOut = socket.getOutputStream();
             } catch (IOException e) {
-                Log.e(TAG, "temp sockets not created", e);
+            	RhoBluetoothManager.loge(TAG, "temp sockets not created");
             }
 
             mmInStream = tmpIn;
@@ -396,7 +431,7 @@ public class RhoBluetoothSession {
         }
 
         public void run() {
-            Log.i(TAG, "BEGIN mConnectedThread");
+        	RhoBluetoothManager.logi(TAG, "BEGIN mConnectedThread");
             byte[] buffer = new byte[1024];
             int bytes;
 
@@ -412,11 +447,12 @@ public class RhoBluetoothSession {
                     byte[] buf_for_send = buffer.clone();
                     RhoBluetoothManager.sharedInstance().onSessionReadMessage(buf_for_send, bytes);
                 } catch (IOException e) {
-                    Log.e(TAG, "disconnected", e);
+                	RhoBluetoothManager.loge(TAG, "disconnected");
                     connectionLost();
                     break;
                 }
             }
+        	RhoBluetoothManager.logi(TAG, "END mConnectedThread");
         }
 
         /**
@@ -431,15 +467,16 @@ public class RhoBluetoothSession {
                 //mHandler.obtainMessage(RhoBluetoothManager.MESSAGE_WRITE, -1, -1, buffer)
                 //        .sendToTarget();
             } catch (IOException e) {
-                Log.e(TAG, "Exception during write", e);
+            	RhoBluetoothManager.loge(TAG, "Exception during write");
             }
         }
 
         public void cancel() {
+        	RhoBluetoothManager.logi(TAG, "CANCEL mConnectedThread");
             try {
                 mmSocket.close();
             } catch (IOException e) {
-                Log.e(TAG, "close() of connect socket failed", e);
+            	RhoBluetoothManager.loge(TAG, "close() of connect socket failed");
             }
         }
     }	

data/platform/android/Rhodes/src/com/rhomobile/rhodes/bluetooth/UUIDHelper.java

@@ -1,3 +1,29 @@
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
+
 package com.rhomobile.rhodes.bluetooth;
 
 

data/platform/android/Rhodes/src/com/rhomobile/rhodes/camera/Camera.java

@@ -1,28 +1,38 @@
-/*
- ============================================================================
- Author	    : Dmitry Moskalchuk
- Version	: 1.5
- Copyright  : Copyright (C) 2008 Rhomobile. All rights reserved.
+/*------------------------------------------------------------------------
+* (The MIT License)
+* 
+* Copyright (c) 2008-2011 Rhomobile, Inc.
+* 
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+* 
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+* 
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+* 
+* http://rhomobile.com
+*------------------------------------------------------------------------*/
 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- ============================================================================
- */
 package com.rhomobile.rhodes.camera;
 
 import java.io.File;
+import java.util.Iterator;
+import java.util.List;
 
 import android.content.Intent;
+import android.hardware.Camera.Size;
+import android.os.Build;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
@@ -37,10 +47,49 @@ public class Camera {
 	
 	public static final String INTENT_EXTRA_PREFIX = RhodesService.INTENT_EXTRA_PREFIX + "camera.";
 	
+	private static int mMainCamera_max_Width = 0;
+	private static int mMainCamera_max_Height = 0;
+	private static int mFrontCamera_max_Width = 0;
+	private static int mFrontCamera_max_Height = 0;
+	
+	private static CameraService ourCameraService = null;
+	
+	public static CameraService getCameraService() {
+		if (ourCameraService == null) {
+			if (Capabilities.CAMERA_ENABLED) {
+				int sdkVersion = Integer.parseInt(Build.VERSION.SDK);
+				if (sdkVersion >= Build.VERSION_CODES.GINGERBREAD) {
+					ourCameraService = new CameraNewService();
+				}
+				else {
+					if (sdkVersion >= Build.VERSION_CODES.ECLAIR) {
+						ourCameraService = new CameraSemiService();
+					}
+					else {
+						ourCameraService = new CameraOldService();
+					}
+				}
+			}
+			else {
+				Logger.I(TAG, "Camera capability is not enabled !");
+			}
+		}
+		return ourCameraService;
+	}
+	
 	private static void reportFail(String name, Exception e) {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 	
+	public static void init_from_UI_Thread() {
+		int[] s_m = getCameraResolution("main");
+		mMainCamera_max_Width = s_m[0];
+		mMainCamera_max_Height = s_m[1];
+		int[] s_f = getCameraResolution("front");
+		mFrontCamera_max_Width = s_f[0];
+		mFrontCamera_max_Height = s_f[1];
+	}
+	
 	private static void init() {
 		File f = new File(RhodesAppOptions.getBlobPath());
 		if (!f.exists())
@@ -56,7 +105,7 @@ public class Camera {
 		}
 		
 		public void run() {
-			callback(url, "", "Camera disabled", false);
+			execute_callback(url, "", "Camera disabled", false, 0, 0, "");
 		}
 		
 	};
@@ -64,10 +113,12 @@ public class Camera {
 	private static class Picture implements Runnable {
 		private String url;
 		private Class<?> klass;
+		private CameraSettings settings;
 		
-		public Picture(String u, Class<?> c) {
+		public Picture(String u, Class<?> c, Object settingsObj) {
 			url = u;
 			klass = c;
+			settings = new CameraSettings(settingsObj);
 		}
 		
 		public void run() {
@@ -75,13 +126,14 @@ public class Camera {
 			RhodesActivity ra = RhodesActivity.getInstance();
 			Intent intent = new Intent(ra, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "settings", settings);
 			ra.startActivity(intent);
 		}
 	};
 	
-	public static void takePicture(String url) {
+	public static void takePicture(String url, Object params_obj) {
 		try {
-			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Picture(url, ImageCapture.class) :
+			Runnable runnable = Capabilities.CAMERA_ENABLED ? new Picture(url, ImageCapture.class, params_obj) :
 				new CameraDisabled(url);
 			PerformOnUiThread.exec(runnable, false);
 		}
@@ -92,21 +144,104 @@ public class Camera {
 
 	public static void choosePicture(String url) {
 		try {
-			PerformOnUiThread.exec(new Picture(url, FileList.class), false);
+			PerformOnUiThread.exec(new Picture(url, FileList.class, null), false);
 		}
 		catch (Exception e) {
 			reportFail("choosePicture", e);
 		}
 	}
 	
-	public static void doCallback(String callbackUrl, String filePath) {
+	public static void doCallback(String callbackUrl, String filePath, int w, int h, String format) {
 		String fp = filePath == null ? "" : filePath;
 		int idx = fp.lastIndexOf('/');
 		if (idx != -1)
 			fp = fp.substring(idx + 1);
-		callback(callbackUrl, fp, "", fp.length() == 0);
+		execute_callback(callbackUrl, fp, "", fp.length() == 0, w, h, format);
+		
+	}
+	
+	public static void execute_callback(String callbackUrl, String filePath, String error, boolean cancelled, int w, int h, String format) {
+		StringBuffer body = new StringBuffer();
+		body.append("&rho_callback=1");
+		if (cancelled || ((error != null) && (error.length() > 0))) {
+			if (cancelled) {
+				body.append("&status=cancel&message=User canceled operation.");
+			}
+			else {
+				body.append("&status=error&message=" + error);
+			}
+		}
+		else {
+			body.append("&status=ok&image_uri=db%2Fdb-files%2F" + filePath);
+			if ((w > 0) && (h > 0)) {
+				body.append("&image_width="+String.valueOf(w));
+				body.append("&image_height="+String.valueOf(h));
+			}
+			if ((format != null) && (format.length() > 0)) {
+				body.append("&image_format="+format);
+			}
+		}
+		callback(callbackUrl, body.toString());
 	}
 
-	public static native void callback(String callbackUrl, String filePath, String error, boolean cancelled);
+	//public static native void callback(String callbackUrl, String filePath, String error, boolean cancelled);
+	public static native void callback(String callbackUrl, String body);
 
+	public static int[] getCameraResolution(String camera_type) {
+		android.hardware.Camera camera = null;
+		try {
+			if (getCameraService() != null) {
+				if ("front".equals(camera_type)) {
+					camera = getCameraService().getFrontCamera();
+				}
+				else {
+					if ("default".equals(camera_type) || "main".equals(camera_type)) {
+						camera = getCameraService().getMainCamera();
+					}
+				}
+			}
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e.getMessage());
+		}
+
+		if (camera == null) {
+			
+			int[] res = {0,0};
+			return res;
+		}
+
+		int maxW = 10000;
+		int maxH = 10000;
+		
+		CameraService.Size s = getCameraService().getClosestPictureSize(camera, maxW, maxH);
+		if (s == null) {
+			int[] ress = {0, 0};
+			return ress;
+		}
+		camera.release();
+		int[] res = {s.width, s.height};
+		return res;
+	}
+	
+	public static int getMaxCameraWidth(String camera_type) {
+		if ("default".equals(camera_type) || "main".equals(camera_type)) {
+			return mMainCamera_max_Width;
+		}
+		if ("front".equals(camera_type)) {
+			return mFrontCamera_max_Width;
+		}
+		return 0;
+	}
+
+	public static int getMaxCameraHeight(String camera_type) {
+		if ("default".equals(camera_type) || "main".equals(camera_type)) {
+			return mMainCamera_max_Height;
+		}
+		if ("front".equals(camera_type)) {
+			return mFrontCamera_max_Height;
+		}
+		return 0;
+	}
+	
 }