rhodes 2.2.6 → 2.3.0.beta.1

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

@@ -1,30 +1,15 @@
 package com.rhomobile.rhodes.bluetooth;
 
 
-import java.security.BasicPermission;
-import java.security.Permission;
-
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.content.pm.FeatureInfo;
 import android.content.pm.PackageManager;
-import android.os.Build;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
+import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.phonebook.ContactAccessor;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
 public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
@@ -49,7 +34,9 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
     private String mDeviceName = null;
     
     private String mConnectedDeviceName = null;
-    StringBuffer mInput;
+    //StringBuffer mInput;
+    byte[] mInputBuffer;
+    int    mInputBufferSize;
  	
     // Local Bluetooth adapter
     private BluetoothAdapter mBluetoothAdapter = null;
@@ -59,8 +46,7 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
     
     private String mCreateSessionCallback;
     
-    private String mRole;
-	
+    //private String mRole;
 	
 	private Activity mActivity;
 	
@@ -70,13 +56,16 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 	
 	public void init() {
 		// constructor
-		mActivity = RhodesService.getInstance().getMainActivity();
+		mActivity = RhodesActivity.getInstance();
 		mDeviceName = "NONAME";
 		
+		mInputBuffer = new byte[1024];
+		mInputBufferSize = 0;
+		
 		
 		mBluetoothIsEnabled = false;
 		// check feature
-		PackageManager pm = RhodesService.getInstance().getContext().getPackageManager();
+		PackageManager pm = RhodesService.getInstance().getPackageManager();
 		FeatureInfo[] fs = pm.getSystemAvailableFeatures();
 		int i;
 		for (i = 0; i < fs.length; i++) {
@@ -105,7 +94,7 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 		}
 		
 		
-		mInput = new StringBuffer("");
+		//mInput = new StringBuffer("");
 		
 		
         // Get local Bluetooth adapter
@@ -152,7 +141,28 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
          }
     }
 	
-	
+    /**
+     * Sends a message.
+     * @param message  A string of text to send.
+     */
+    private void sendData(byte data[]) {
+        if(D) Log.i(TAG, "sendMessage");
+        // Check that we're actually connected before trying anything
+        if (mSession.getState() != RhoBluetoothSession.STATE_CONNECTED) {
+            //Toast.makeText(this, R.string.not_connected, Toast.LENGTH_SHORT).show();
+            if(D) Log.i(TAG, "NOT CONNECTED");
+            return;
+        }
+
+        // Check that there's actually something to send
+        if (data.length > 0) {
+            // Get the message bytes and tell the BluetoothChatService to write
+            mSession.write(data);
+         }
+    }
+
+    
+    
    private void setupSession() {
         Log.d(TAG, "setupSession()");
 
@@ -162,7 +172,8 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 
 
    public void onSessionConnectedOK() {
-       mInput.setLength(0);
+       //mInput.setLength(0);
+	   mInputBufferSize = 0;
        PerformOnUiThread.exec( new Runnable() {
 			public void run() {
 				fireCreateSessionCallback(RhoBluetoothManager.BTC_OK, mConnectedDeviceName);
@@ -177,18 +188,38 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 					fireCreateSessionCallback(RhoBluetoothManager.BTC_ERROR, "");
 				}
 				else {
-					fireSessionCallback(mConnectedDeviceName, mSession.BT_SESSION_DISCONNECT);
+					fireSessionCallback(mConnectedDeviceName, RhoBluetoothSession.BT_SESSION_DISCONNECT);
 				}
 			}
 	   },false);
    }
 
    public void onSessionReadMessage(byte[] buf, int bytes) {
-	   final String message = new String(buf, 0, bytes);
+	   //final String message = new String(buf, 0, bytes);
+	   final byte[] tmpbuf = buf.clone();
+	   final int tmpbuf_length = bytes;
 	   PerformOnUiThread.exec( new Runnable() {
+		    private byte[] buf = tmpbuf;
+		    private int buf_length = tmpbuf_length;
 			public void run() {
-		       mInput.append(message);
-		       fireSessionCallback(mConnectedDeviceName, mSession.BT_SESSION_INPUT_DATA_RECEIVED);
+		       //mInput.append(message);
+			   int i;
+			   synchronized (mInputBuffer) {
+				   if (mInputBuffer.length < (mInputBufferSize + buf_length)) {
+					   // need alloc new larger buffer
+					   byte[] new_buf = new byte[mInputBufferSize + buf_length + 1024];
+					   // copy old to new
+					   for (i = 0; i < mInputBufferSize; i++) {
+						   new_buf[i] = mInputBuffer[i];
+					   }
+					   mInputBuffer = new_buf;
+				   }
+				   for (i = mInputBufferSize; i < (mInputBufferSize + buf_length); i++) {
+					   mInputBuffer[i] = buf[i-mInputBufferSize];
+				   }
+				   mInputBufferSize = mInputBufferSize + buf_length;
+			   }
+		       fireSessionCallback(mConnectedDeviceName, RhoBluetoothSession.BT_SESSION_INPUT_DATA_RECEIVED);
 			}
 	   },false);
    }
@@ -315,7 +346,7 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
     	if(D) Log.i(TAG, "create_session("+role+", "+callback_url+");");
 
 		sharedInstance().mCreateSessionCallback = callback_url;
-		sharedInstance().mRole = role;
+		//sharedInstance().mRole = role;
 		if (role.equalsIgnoreCase(RhoBluetoothManager.BT_ROLE_SERVER)) {
 			sharedInstance().startServer();
 		}
@@ -370,14 +401,19 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 		if (!mBluetoothIsEnabled) return -1;
 		if(D) Log.i(TAG, "session_get_status");
 		//if (sharedInstance().mInputStringsArrayAdapter.isEmpty()) {
-		return sharedInstance().mInput.length();
+		return sharedInstance().mInputBufferSize;//mInput.length();
 	}
 
 	public String session_read_string(String connected_device_name) {
 		if (!mBluetoothIsEnabled) return RhoBluetoothManager.BTC_ERROR;
 		if(D) Log.i(TAG, "session_read_string");
-    	String t = sharedInstance().mInput.toString();
-    	sharedInstance().mInput.setLength(0);
+    	//String t = sharedInstance().mInput.toString();
+    	//sharedInstance().mInput.setLength(0);
+		String t = null;
+	    synchronized (mInputBuffer) {
+	    	t = new String(mInputBuffer, 0, mInputBufferSize);
+	    	mInputBufferSize = 0;
+	    }
 		return t;
 	}
 
@@ -387,13 +423,47 @@ public class RhoBluetoothManagerNew implements IRhoBluetoothManager {
 		sharedInstance().sendMessage(str);
 	}
 	
-	public int session_read_data(String connected_device_name, Byte[] buf, int max_length) {
+	public int session_read_data(String connected_device_name, byte[] buf, int max_length) {
 		if (!mBluetoothIsEnabled) return 0;
-		return 0;
+		if ((buf == null) || (max_length == 0)) {
+			return mInputBufferSize;
+		}
+		int real_readed = 0;
+		int i;
+		synchronized (mInputBuffer) {
+			// read;
+			real_readed = mInputBufferSize;
+			if (real_readed > max_length) {
+				real_readed = max_length;
+			}
+			// copy
+			for (i = 0; i < real_readed; i++) {
+				buf[i] = mInputBuffer[i];
+			}
+			// adjust input buf
+			if (mInputBufferSize > max_length) {
+				for (i = 0; i < (mInputBufferSize - max_length); i++) {
+					mInputBuffer[i] = mInputBuffer[i + max_length];
+				}
+				mInputBufferSize = mInputBufferSize - max_length;
+			}
+			else {
+				mInputBufferSize = 0;
+			}
+		}
+		return real_readed;
 	}
 
-	public void session_write_data(String connected_device_name, Byte[] buf, int length) {
-		if (!mBluetoothIsEnabled) return;		
+	public void session_write_data(String connected_device_name, byte[] buf, int length) {
+		if (!mBluetoothIsEnabled) return;
+		if(D) Log.i(TAG, "session_write_data()");
+		if (D) {
+			int i;
+			for (i = 0; i < length; i++) {
+				Log.i(TAG, "     writed data ["+String.valueOf(i)+"] = " + String.valueOf(buf[i]));
+			}
+		}
+		sharedInstance().sendData(buf);
 	}
 
 

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

@@ -1,82 +1,41 @@
 package com.rhomobile.rhodes.bluetooth;
 
-import android.app.Activity;
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-import com.rhomobile.rhodes.RhodesService;
-import com.rhomobile.rhodes.util.PerformOnUiThread;
-
 
 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()");
-   }
-	
-   public void init(){		
-   }
-   
-	public void setDeviceName(String device_name) {
 	}
-   
-   
-   private void sendMessage(String message) {
-   }
 	
+	public void init() {}
+   
+	public void setDeviceName(String device_name) {}
 	
-   private void setupSession() {
-   }
+	public void onSessionConnectedOK() {}
 
+	public void onSessionDisconnected() {}
 
-   public void onSessionConnectedOK() {
-   }
-   
-   public void onSessionDisconnected() {
-   }
+	public void onSessionReadMessage(byte[] buf, int bytes) {}
 
-   public void onSessionReadMessage(byte[] buf, int bytes) {
-   }
-   
-   public void onSessionConnectedDeviceName(String name) {
-   }
-   
-   public void onSessionToast(String message) {
-   }
-   
-	   
-    public static void onActivityResult(int requestCode, int resultCode, Intent data) {
-	}
+	public void onSessionConnectedDeviceName(String name) {}
+
+	public void onSessionToast(String message) {}
+	
+    public static void onActivityResult(int requestCode, int resultCode, Intent data) {}
 	   
-    public void onDeviceListActivityFinished( boolean is_ok, String adress) {
-    }
+    public void onDeviceListActivityFinished( boolean is_ok, String adress) {}
     
-    public void onActivityResultPrivate(int requestCode, int resultCode, Intent data) {
-    }
+    public void onActivityResultPrivate(int requestCode, int resultCode, Intent data) {}
 	   
-
 	public RhoBluetoothSession getSession() {
 		return null;
 	}
 	
-	
-	
 	public int is_bluetooth_available() {
 		return 0;
 	}
@@ -124,13 +83,11 @@ public class RhoBluetoothManagerOld implements IRhoBluetoothManager {
 	public void session_write_string(String connected_device_name, String str) {
 	}
 	
-	public int session_read_data(String connected_device_name, Byte[] buf, int max_length) {
+	public int session_read_data(String connected_device_name, byte[] buf, int max_length) {
 		return 0;
 	}
 
-	public void session_write_data(String connected_device_name, Byte[] buf, int length) {
+	public void session_write_data(String connected_device_name, byte[] buf, int length) {
 	}
 
-
-
 }

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

@@ -5,19 +5,14 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.UUID;
 
-
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
-import android.os.Bundle;
 import android.os.Handler;
-import android.os.Message;
 import android.util.Log;
 
-
-
 public class RhoBluetoothSession {
 
 	// events for listener
@@ -37,7 +32,6 @@ public class RhoBluetoothSession {
 
     // Member fields
     private final BluetoothAdapter mAdapter;
-    private final Handler mHandler;
     private AcceptThread mAcceptThread;
     private ConnectThread mConnectThread;
     private ConnectedThread mConnectedThread;
@@ -59,7 +53,6 @@ public class RhoBluetoothSession {
     public RhoBluetoothSession(Context context, Handler handler) {
         mAdapter = BluetoothAdapter.getDefaultAdapter();
         mState = STATE_NONE;
-        mHandler = handler;
         mCallbackUrl = null;
     }
 

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

@@ -26,6 +26,8 @@ import android.content.Intent;
 
 import com.rhomobile.rhodes.Capabilities;
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
+import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 
@@ -40,7 +42,7 @@ public class Camera {
 	}
 	
 	private static void init() {
-		File f = new File(RhodesService.getBlobPath());
+		File f = new File(RhodesAppOptions.getBlobPath());
 		if (!f.exists())
 			f.mkdirs();
 	}
@@ -70,10 +72,10 @@ public class Camera {
 		
 		public void run() {
 			init();
-			RhodesService r = RhodesService.getInstance();
-			Intent intent = new Intent(r.getContext(), klass);
+			RhodesActivity ra = RhodesActivity.getInstance();
+			Intent intent = new Intent(ra, klass);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", url);
-			r.startActivity(intent);
+			ra.startActivity(intent);
 		}
 	};
 	

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

@@ -27,7 +27,8 @@ import java.util.List;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhoActivity;
+import com.rhomobile.rhodes.BaseActivity;
+import com.rhomobile.rhodes.RhodesAppOptions;
 import com.rhomobile.rhodes.RhodesService;
 import com.rhomobile.rhodes.Utils;
 
@@ -46,7 +47,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemClickListener;
 
-public class FileList extends RhoActivity implements OnClickListener{
+public class FileList extends BaseActivity implements OnClickListener{
 
 	private static final String TAG = "FileList";
 	
@@ -134,7 +135,7 @@ public class FileList extends RhoActivity implements OnClickListener{
 		try {
 			String dst = null;
 			if (file != null && file.length() > 0) {
-				dst = RhodesService.getBlobPath() + "/" + Utils.getBaseName(file);
+				dst = RhodesAppOptions.getBlobPath() + "/" + Utils.getBaseName(file);
 				Utils.copy(file, dst);
 			}
 			com.rhomobile.rhodes.camera.Camera.doCallback(callbackUrl, dst == null ? "" : dst);

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

@@ -26,8 +26,8 @@ import java.util.Date;
 
 import com.rhomobile.rhodes.AndroidR;
 import com.rhomobile.rhodes.Logger;
-import com.rhomobile.rhodes.RhoActivity;
-import com.rhomobile.rhodes.RhodesService;
+import com.rhomobile.rhodes.BaseActivity;
+import com.rhomobile.rhodes.RhodesAppOptions;
 
 import android.content.ContentValues;
 import android.graphics.PixelFormat;
@@ -44,8 +44,10 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.view.View.OnClickListener;
 import android.widget.ImageButton;
+import android.hardware.SensorManager;
+import android.view.OrientationEventListener;
 
-public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback, OnClickListener, Camera.AutoFocusCallback
+public class ImageCapture extends BaseActivity implements SurfaceHolder.Callback, OnClickListener
  {
 	
 	private static final String TAG = "ImageCapture";
@@ -58,9 +60,9 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 	private SurfaceView surfaceView;
 	private SurfaceHolder surfaceHolder;
 	private ImageButton cameraButton;
-
-	boolean mIsActive = true;
-
+    private OrientationEventListener myOrientationEventListener;
+    private int m_rotation = 0;
+    
 	// private Uri target = Media.EXTERNAL_CONTENT_URI;
 
 	@Override
@@ -82,6 +84,41 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 		
 		cameraButton = (ImageButton)findViewById(AndroidR.id.cameraButton);
 		cameraButton.setOnClickListener(this);
+		
+        myOrientationEventListener = new OrientationEventListener(this, SensorManager.SENSOR_DELAY_NORMAL)
+        {
+            @Override
+            public void onOrientationChanged(int orientation) 
+            { 
+                //Logger.D(TAG, "onOrientationChanged: " + orientation); 
+                if (orientation == ORIENTATION_UNKNOWN) 
+                    return; 
+                 
+                m_rotation = orientation;    
+             }   
+        };
+    
+        if (myOrientationEventListener.canDetectOrientation())
+        {
+           Logger.I(TAG, "myOrientationEventListener.enable()"); 
+           myOrientationEventListener.enable();
+        }
+        else
+        {
+           Logger.I(TAG, "cannot detect!"); 
+           myOrientationEventListener = null;
+        }		
+	}
+
+	@Override
+	public void finish() 
+	{
+	    Logger.D(TAG, "finish");
+	    if ( myOrientationEventListener != null )
+	        myOrientationEventListener.disable();
+	        
+        myOrientationEventListener = null;	        
+		super.finish();
 	}
 
 	@Override
@@ -92,7 +129,6 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 	PictureCallback mPictureCallbackRaw = new PictureCallback() {
 		public void onPictureTaken(byte[] data, Camera c) {
 			Logger.D(TAG, "PICTURE CALLBACK RAW");
-			camera.startPreview();
 		}
 	};
 
@@ -132,12 +168,23 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 
 	public void surfaceCreated(SurfaceHolder holder) {
 		Logger.D(TAG, "surfaceCreated");
-		camera = Camera.open();
+		try {
+			camera = Camera.open();
+		}
+		catch (Exception e) {
+			Logger.E(TAG, e.getMessage());
+			finish();
+		}
 	}
 
 	public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
 		try {
 			Logger.D(TAG, "surfaceChanged");
+			if (camera == null) {
+				Logger.E(TAG, "Camera was not opened");
+				return;
+			}
+			
 			if (isPreviewRunning) {
 				camera.stopPreview();
 			}
@@ -157,28 +204,46 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 
 	public void surfaceDestroyed(SurfaceHolder holder) {
 		Logger.D(TAG, "surfaceDestroyed");
-		camera.stopPreview();
-		isPreviewRunning = false;
-		camera.release();
+		if (camera != null) {
+			camera.stopPreview();
+			isPreviewRunning = false;
+			camera.release();
+			camera = null;
+		}
 	}
 
 	public void onClick(View v) {
 		if (v.getId() == AndroidR.id.cameraButton) {
 			takePictureWithAutofocus();
 			cameraButton.setVisibility(View.INVISIBLE);
-			
 		}
 	}
 
 	private void takePictureWithAutofocus() {
-		startAutoFocus();
+		if (camera == null) {
+			Logger.E(TAG, "Attempt of auto focus while camera was not opened");
+			return;
+		}
+		
+		//this only from API v.5 and higher
+		//String focus_mode = camera.getParameters().getFocusMode();
+		//if ((focus_mode != Camera.Parameters.FOCUS_MODE_FIXED) && (focus_mode != Camera.Parameters.FOCUS_MODE_INFINITY)) {
+		camera.autoFocus(new Camera.AutoFocusCallback() {
+			@Override
+			public void onAutoFocus(boolean success, Camera camera) {
+				takePicture();
+			}
+		});
+		//}
 	}
 
 	
 	private void takePicture() {
-		if (!mIsActive) {
+		if (camera == null) {
+			Logger.E(TAG, "Attempt of take picture while camera was not opened");
 			return;
 		}
+		
 		ImageCaptureCallback iccb = null;
 		try {
 			String filename = "Image_" + timeStampFormat.format(new Date());
@@ -191,27 +256,26 @@ public class ImageCapture extends RhoActivity implements SurfaceHolder.Callback,
 
 			Uri uri = getContentResolver().insert(Media.EXTERNAL_CONTENT_URI, values);
 			// String filename = timeStampFormat.format(new Date());
-			String dir = RhodesService.getBlobPath();
+			String dir = RhodesAppOptions.getBlobPath();
 			
 			OutputStream osCommon = getContentResolver().openOutputStream(uri);
 			iccb = new ImageCaptureCallback(this, callbackUrl, osCommon, dir + "/" + filename + ".jpg");
+			
+	        Camera.Parameters parameters = camera.getParameters();
+            //int nOrient = RhodesService.getInstance().getScreenOrientation();
+            int nCamRotate = 90;
+            if ( (m_rotation > 45 && m_rotation < 135) || (m_rotation > 225 && m_rotation < 315) )
+                nCamRotate = 0;
+                
+	        Logger.D(TAG, "Camera rotation: " + nCamRotate );
+            parameters.set("rotation", nCamRotate );
+            camera.setParameters(parameters);
+
 		} catch (Exception ex) {
 			Logger.E(TAG, ex.getMessage());
 		}
 		
 		camera.takePicture(mShutterCallback, mPictureCallbackRaw, iccb);
-		mIsActive = false;
-	}
-
-	private void startAutoFocus() {
-		//this only from API v.5 and higher
-		//String focus_mode = camera.getParameters().getFocusMode();
-		//if ((focus_mode != Camera.Parameters.FOCUS_MODE_FIXED) && (focus_mode != Camera.Parameters.FOCUS_MODE_INFINITY)) {
-		camera.autoFocus(this);
-		//}
 	}
 
-	public void onAutoFocus (boolean success, Camera camera) {
-		takePicture();
-	}
 }

data/platform/android/Rhodes/src/com/rhomobile/rhodes/datetime/DateTimePicker.java

@@ -23,6 +23,7 @@ package com.rhomobile.rhodes.datetime;
 import android.content.Intent;
 
 import com.rhomobile.rhodes.Logger;
+import com.rhomobile.rhodes.RhodesActivity;
 import com.rhomobile.rhodes.RhodesService;
 
 public class DateTimePicker {
@@ -35,15 +36,17 @@ public class DateTimePicker {
 		Logger.E(TAG, "Call of \"" + name + "\" failed: " + e.getMessage());
 	}
 
-	public static void choose(String callback, String title, long init, int v, byte[] opaque) {
+	public static void choose(String callback, String title, long init, int v, byte[] opaque, long min_time, long max_time) {
 		try {
-			RhodesService r = RhodesService.getInstance();
-			Intent intent = new Intent(r.getContext(), DateTimePickerScreen.class);
+			RhodesActivity r = RhodesActivity.getInstance();
+			Intent intent = new Intent(RhodesActivity.getContext(), DateTimePickerScreen.class);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "callback", callback);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "title", title);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "init", init);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "fmt", v);
 			intent.putExtra(INTENT_EXTRA_PREFIX + "opaque", opaque);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "min_time", min_time);
+			intent.putExtra(INTENT_EXTRA_PREFIX + "max_time", max_time);
 			
 			r.startActivity(intent);
 		}