rhodes 2.1.0 → 2.2.0.beta.1

data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothPort.java

@@ -0,0 +1,281 @@
+package rhomobile.bluetooth;
+
+import java.io.IOException;
+
+import net.rim.device.api.bluetooth.BluetoothSerialPort;
+import net.rim.device.api.bluetooth.BluetoothSerialPortInfo;
+import net.rim.device.api.bluetooth.BluetoothSerialPortListener;
+import net.rim.device.api.ui.component.Status;
+import net.rim.device.api.util.DataBuffer;
+
+public class BluetoothPort implements BluetoothSerialPortListener {
+
+	public interface BluetoothPortListener {
+		public void onBluetoothPortDisconnect();
+		public void onBluetoothPortError();
+		public void onBluetoothPortDataReceived();
+		public void onBluetoothPortConnected(boolean success);
+	}
+	
+    private BluetoothSerialPort mPort;
+    private static boolean mIsDataSent = true;
+    private DataBuffer mWritedData;
+    private DataBuffer mReadedData;
+	private BluetoothPortListener mListener = null;
+    private byte[] _receiveBuffer = new byte[1024];
+	private String mConnectedDeviceName = "";
+	
+	private ConnectionListenThread mListenThread = null;
+	
+	private class ConnectionListenThread extends Thread {
+		private BluetoothPort Port;
+		private byte[] data;
+		public ConnectionListenThread(BluetoothPort port) {
+			Port = port;
+			data = new byte[1];
+		}
+		
+		public void run() {
+			while (true) {
+				try {
+					sleep(50);
+				}
+				catch (Exception e) {
+					
+				}
+				try {
+					if (Port.mPort != null) {
+						int readed = Port.mPort.read(data, 0, 1);
+						if (readed > 0) {
+							mReadedData.writeByteArray(data, 0, 1);
+						}
+						// ok
+						Port.deviceConnected(true);
+						Port.mListenThread = null;
+						BluetoothManager.getInstance().closeBluetoothScreenSilent();
+						interrupt();
+					}
+				}
+				catch (Exception e) {
+					// port not ready
+				}
+				
+			}
+		}
+	}
+	
+	
+	
+	public void disconnect() {
+		BluetoothManager.rhoLogInfo("BluetoothPort.disconnect()");
+		if (mPort != null) {
+			mPort.disconnect();
+			mPort.close();
+			//mListener.onBluetoothPortDisconnect();
+		}
+		else {
+			mListener.onBluetoothPortError();
+		}
+		if (mListenThread != null) {
+			mListenThread.interrupt();
+			mListenThread = null;
+		}
+	}
+	
+	public int getStatus() {
+		return mReadedData.getArrayLength();
+	}
+	
+	public byte[] readData() {
+		byte[] data = null;
+		synchronized(mReadedData) {
+			data = mReadedData.toArray();
+			mReadedData.reset();
+		}
+		return data;
+	}
+	
+	public void writeData(byte[] data) {
+        synchronized(mWritedData)
+        {
+            mWritedData.write(data, 0, data.length);
+        }
+        // Call sendData to send the data.
+        sendData();
+	}
+	
+	public String getConnectedDeviceName() {
+		return mConnectedDeviceName;
+	}
+
+	
+	public void startListenThread() {
+		//mListenThread = new ConnectionListenThread(this);
+		//mListenThread.start();
+		//deviceConnected(true);
+	}
+	
+    public BluetoothPort(BluetoothSerialPortInfo info, BluetoothPortListener listener)
+    {
+        // Fill a 1k array with the a character.
+        //Arrays.fill(_receiveBuffer, (byte)'a');
+
+        // Initialize the buffers.
+        //_data = new StringBuffer();
+        
+    	mReadedData = new DataBuffer();
+    	mWritedData = new DataBuffer();
+        
+        mListener = listener;
+
+        try
+        {
+            if(info == null)
+            {
+        		BluetoothManager.rhoLogInfo("BluetoothPort.BluetoothPort() server init");
+                // Open a port to listen for incoming connections.
+                mPort = new BluetoothSerialPort(BluetoothSerialPort.DEFAULT_UUID, "btspp", BluetoothSerialPort.BAUD_9600, BluetoothSerialPort.DATA_FORMAT_PARITY_NONE | BluetoothSerialPort.DATA_FORMAT_STOP_BITS_1 | BluetoothSerialPort.DATA_FORMAT_DATA_BITS_8, BluetoothSerialPort.FLOW_CONTROL_NONE, 1024, 1024, this);
+        		mConnectedDeviceName = "unknown";//mPort.toString();
+            }
+            else
+            {
+                // Connect to the selected device.
+        		BluetoothManager.rhoLogInfo("BluetoothPort.BluetoothPort() client init");
+                mPort = new BluetoothSerialPort(info, BluetoothSerialPort.BAUD_9600, BluetoothSerialPort.DATA_FORMAT_PARITY_NONE | BluetoothSerialPort.DATA_FORMAT_STOP_BITS_1 | BluetoothSerialPort.DATA_FORMAT_DATA_BITS_8, BluetoothSerialPort.FLOW_CONTROL_NONE, 1024, 1024, this);
+                mConnectedDeviceName = info.getDeviceName();
+            }
+        }
+        catch(IOException ex)
+        {
+    		BluetoothManager.rhoLogInfo("BluetoothPort.BluetoothPort() ERROR!");
+    		mListener.onBluetoothPortError();
+            //Status.show("Error: " + ex.getMessage());
+        }
+
+    }
+
+    // Invoked when a connection is established.
+    public void deviceConnected(boolean success)
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.deviceConnected("+String.valueOf(success)+")");
+    	if (success) {
+    	}
+    	mListener.onBluetoothPortConnected(success);
+    }
+
+    // Invoked when a connection is closed.
+    public void deviceDisconnected()
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.deviceDisconnected()");
+    	mListener.onBluetoothPortDisconnect();
+    }
+
+    // Invoked when the drt state changes.
+    public void dtrStateChange(boolean high)
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.dtrStateChange("+String.valueOf(high)+")");
+        //Status.show("DTR: " + high);
+    }
+
+    // Invoked when data has been received.
+    public void dataReceived(int length)
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.dataReceived("+String.valueOf(length)+")");
+        int len;
+        try
+        {
+            // Read the data that arrived.
+            if((len = mPort.read(_receiveBuffer, 0, length == -1 ? _receiveBuffer.length : length)) != 0)
+            {
+                // If loopback is enabled write the data back.
+                if(len == 1 && _receiveBuffer[0] == '\r')
+                {
+                    _receiveBuffer[1] = '\n';
+                    ++len;
+                }
+
+                // Update the screen with the new data that arrived.
+                synchronized (mReadedData) {
+                	mReadedData.writeByteArray(_receiveBuffer, 0, len);
+                }
+                mListener.onBluetoothPortDataReceived();
+            }
+        } catch(IOException ioex)
+        {
+            // Catch and re-throw the exception.
+            // throw new RuntimeException(ioex.toString());
+        	mListener.onBluetoothPortError();
+        }
+    }
+
+    // Invoked after all data in the buffer has been sent.
+    public void dataSent()
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.dataSent()");
+        // Set the _dataSent flag to true to allow more data to be written.
+        mIsDataSent = true;
+
+        // Call sendData in case there is data waiting to be sent.
+        sendData();
+    }
+
+
+    // Sends the data currently in the DataBuffer.
+    private void sendData()
+    {
+		BluetoothManager.rhoLogInfo("BluetoothPort.sendData()");
+        // Ensure we have data to send.
+    	synchronized (mWritedData) {
+	        if (mWritedData.getArrayLength() > 0)
+	        {
+	            // Ensure the last write call has resulted in the sending of the data
+	            // prior to calling write again.  Calling write in sequence without waiting
+	            // for the data to be sent can overwrite existing requests and result in
+	            // data loss.
+	            if (mIsDataSent)
+	            {
+	                try
+	                {
+	                    // Set the _dataSent flag to false so we don't send any more
+	                    // data until it has been verified that this data was sent.
+	                    mIsDataSent = false;
+	
+                        // Write out the data in the DataBuffer and reset the DataBuffer.
+                        mPort.write(mWritedData.getArray(), 0, mWritedData.getArrayLength());
+                        mWritedData.reset();
+                		BluetoothManager.rhoLogInfo("BluetoothPort.sendData() data was sended");
+	                }
+	                catch (IOException ioex)
+	                {
+	                    // Reset _dataSent to true so we can attempt another data write.
+	                    mIsDataSent = true;
+	                    //System.out.println("Failed to write data. Exception: " + ioex.toString());
+                		BluetoothManager.rhoLogError("BluetoothPort.sendData() ERROR during send data");
+	                    mListener.onBluetoothPortError();
+	                }
+	            }
+	            else
+	            {
+            		BluetoothManager.rhoLogInfo("BluetoothPort.sendData() data can not send now - wait");
+	                //System.out.println("Can't send data right now, data will be sent after dataSent notify call.");
+	            }
+	        }
+    	}
+    }
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+}

data/platform/bb/rhodes/src/rhomobile/bluetooth/BluetoothScreen.java

@@ -0,0 +1,119 @@
+package rhomobile.bluetooth;
+
+import net.rim.device.api.ui.DrawStyle;
+import net.rim.device.api.ui.Field;
+import net.rim.device.api.ui.component.LabelField;
+import net.rim.device.api.ui.component.SeparatorField;
+import net.rim.device.api.ui.container.MainScreen;
+
+public class BluetoothScreen extends MainScreen {
+	
+	public static int BLUETOOTH_SCREEN_TYPE_CLIENT = 1;
+	public static int BLUETOOTH_SCREEN_TYPE_SERVER = 2;
+	public static int BLUETOOTH_SCREEN_TYPE_UNSUPPORTED = 3;
+
+	public interface BluetoothScreenCallback {
+		void onBluetoothScreenCancel();
+		void onBluetoothScreenSelect(int index);
+	}
+	
+	private static String TITLE = "Bluetooth";
+	private static String SELECT_DEVICE = "Please select device to connect :";
+	private static String WAIT_FOR_CONNECT = "Waiting for a connection ...";
+	private static String NO_DEVICES = "There are no paired devices for connect !";
+	private static String UNSUPPORTED = "Bluetooth is not supported on this BlackBerry or simulator.";
+		
+
+	private BluetoothScreenCallback mCallback;
+	private LabelField[] mFields;
+	private boolean mIsClosedBySelect = false;
+	
+	
+	public BluetoothScreen(int type, String[] devices, BluetoothScreenCallback callback) {
+		BluetoothManager.rhoLogInfo("BluetoothScreen()");
+		mCallback = callback;
+		mFields = new LabelField[0];
+		setTitle(TITLE);
+		if (type == BLUETOOTH_SCREEN_TYPE_UNSUPPORTED) {
+			BluetoothManager.rhoLogInfo("  TYPE_UNSUPPORTED");
+			add(new LabelField(UNSUPPORTED));
+			return;
+		}
+		if (type == BLUETOOTH_SCREEN_TYPE_SERVER) {
+			BluetoothManager.rhoLogInfo("  TYPE_SERVER");
+			add(new LabelField(WAIT_FOR_CONNECT));
+			return;
+		}
+		if (type == BLUETOOTH_SCREEN_TYPE_CLIENT) {
+			BluetoothManager.rhoLogInfo("  TYPE_CLIENT");
+			if (devices.length <= 0) {
+				add(new LabelField(NO_DEVICES));
+				BluetoothManager.rhoLogInfo("  NO_DEVICES");
+				return;
+			}
+
+			add(new LabelField(SELECT_DEVICE));
+			add(new SeparatorField());
+			int i;
+			mFields = new LabelField[devices.length];
+			for (i = 0; i < devices.length; i++) {
+				LabelField lg = new LabelField(devices[i], Field.FOCUSABLE | Field.USE_ALL_WIDTH);
+				BluetoothManager.rhoLogInfo("    DEVICE["+String.valueOf(i)+"]="+devices[i]);
+				mFields[i] = lg;
+				add(lg);
+			}
+			add(new SeparatorField());
+		}
+	}
+	
+    /**
+     * Overrides Screen.invokeAction().  Handles a trackball click and provides 
+     * identical behavior to an ENTER keypress event.
+     * 
+     * @see net.rim.device.api.ui#invokeAction(int)
+     */
+    public boolean invokeAction(int action)
+    {        
+        switch(action)
+        {
+            case ACTION_INVOKE: // Trackball click.
+            	int i;
+            	for (i = 0; i < mFields.length; i++) {
+            		if (mFields[i].isFocus()) {
+            			if (mCallback != null) {
+            				mCallback.onBluetoothScreenSelect(i);
+            				mIsClosedBySelect = true;
+            				BluetoothManager.rhoPopScreen(this);
+            			}
+            			return true; // We've consumed the event.
+            		}
+            	}
+        }   
+        return  super.invokeAction(action);
+    }
+	
+    /**
+     * Called when the main screen (and thus, the application) closes.  Removes
+     * this screen as a low memory listener, and commits the order list to the
+     * persistent store.
+     * 
+     * @see net.rim.device.api.ui.Screen#onClose()
+     */
+    public boolean onClose() 
+    {
+		if (mCallback != null) {
+			if (!mIsClosedBySelect) {
+				mCallback.onBluetoothScreenCancel();
+			}
+		}
+		mIsClosedBySelect = false;
+        return super.onClose();
+    }
+    
+    public void closeSilent() {
+		mIsClosedBySelect = true;
+		BluetoothManager.rhoPopScreen(this);
+    }
+	
+
+}

data/platform/bb/rhodes/src/rhomobile/camera/CameraFilesListener.java

@@ -26,8 +26,8 @@ public class CameraFilesListener implements FileSystemJournalListener {
 	private Hashtable _exists;
 	
 	private final String[] _folders = {
-			"file://store/home/user/pictures/",
-			"file://sdcard/blackberry/pictures/"
+			"file:///store/home/user/pictures/",
+			"file:///sdcard/blackberry/pictures/"
 	};
 	
 	public CameraFilesListener(CameraScreen screen) {

data/platform/iphone/Classes/AppManager/AppManager.m

@@ -83,8 +83,9 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
 	}
 	
 	if (!remove && dir) {
+        NSError *error;
 		if (![fileManager fileExistsAtPath:target])
-			[fileManager createDirectoryAtPath:target attributes:nil];
+			[fileManager createDirectoryAtPath:target withIntermediateDirectories:YES attributes:nil error:&error];
 		
 		NSDirectoryEnumerator *enumerator = [fileManager enumeratorAtPath:source];
 		NSString *child;
@@ -107,6 +108,8 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
 }
 
 - (BOOL)isContentsEqual:(NSFileManager*)fileManager first:(NSString*)filePath1 second:(NSString*)filePath2 {
+    NSLog(@"filePath1: %@", filePath1);
+    NSLog(@"filePath2: %@", filePath2);
     if (![fileManager fileExistsAtPath:filePath1] || ![fileManager fileExistsAtPath:filePath2])
         return NO;
     
@@ -125,6 +128,8 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
  */
 - (void) configure {
 	
+#define RHO_DONT_COPY_ON_START
+    
     NSFileManager *fileManager = [NSFileManager defaultManager];
     
 	NSString *bundleRoot = [[NSBundle mainBundle] resourcePath];
@@ -132,7 +137,9 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
 
 	NSString *filePathNew = [bundleRoot stringByAppendingPathComponent:@"name"];
 	NSString *filePathOld = [rhoRoot stringByAppendingPathComponent:@"name"];
+#ifndef RHO_DONT_COPY_ON_START
     BOOL hasOldName = [fileManager fileExistsAtPath:filePathOld];
+#endif
     BOOL nameChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
 
     BOOL contentChanged;
@@ -144,18 +151,67 @@ static bool UnzipApplication(const char* appRoot, const void* zipbuf, unsigned i
 
         contentChanged = ![self isContentsEqual:fileManager first:filePathNew second:filePathOld];
 	}
-
-	if (contentChanged) {
+	
+    if (contentChanged) {
+#ifdef RHO_DONT_COPY_ON_START
+        NSError *error;
+        // Create symlink to "lib"
+        NSString *src = [bundleRoot stringByAppendingPathComponent:@"lib"];
+        NSLog(@"src: %@", src);
+        NSString *dst = [rhoRoot stringByAppendingPathComponent:@"lib"];
+        NSLog(@"dst: %@", dst);
+        [fileManager removeItemAtPath:dst error:&error];
+        [fileManager createSymbolicLinkAtPath:dst withDestinationPath:src error:&error];
+        
+        NSString *dirs[] = {@"apps", @"db"};
+        for (int i = 0, lim = sizeof(dirs)/sizeof(dirs[0]); i < lim; ++i) {
+            // Create directory
+            src = [bundleRoot stringByAppendingPathComponent:dirs[i]];
+            NSLog(@"src: %@", src);
+            dst = [rhoRoot stringByAppendingPathComponent:dirs[i]];
+            NSLog(@"dst: %@", dst);
+            if (![fileManager fileExistsAtPath:dst])
+                [fileManager createDirectoryAtPath:dst withIntermediateDirectories:YES attributes:nil error:&error];
+            
+            // And make symlinks from its content
+            NSArray *subelements = [fileManager contentsOfDirectoryAtPath:src error:&error];
+            for (int i = 0, lim = [subelements count]; i < lim; ++i) {
+                NSString *child = [subelements objectAtIndex:i];
+                NSString *fchild = [src stringByAppendingPathComponent:child];
+                NSLog(@"src: %@", fchild);
+                NSString *target = [dst stringByAppendingPathComponent:child];
+                NSLog(@"dst: %@", target);
+                [fileManager removeItemAtPath:target error:&error];
+                if ([child isEqualToString:@"rhoconfig.txt"])
+                    [fileManager copyItemAtPath:fchild toPath:target error:&error];
+                else
+                    [fileManager createSymbolicLinkAtPath:target withDestinationPath:fchild error:&error];
+            }
+        }
+        
+        // Finally, copy "hash" and "name" files
+        NSString *items[] = {@"hash", @"name"};
+        for (int i = 0, lim = sizeof(items)/sizeof(items[0]); i < lim; ++i) {
+            NSString *src = [bundleRoot stringByAppendingPathComponent:items[i]];
+            NSLog(@"src: %@", src);
+            NSString *dst = [rhoRoot stringByAppendingPathComponent:items[i]];
+            NSLog(@"dst: %@", dst);
+            [fileManager removeItemAtPath:dst error:&error];
+            [fileManager copyItemAtPath:src toPath:dst error:&error];
+        }
+#else
         NSString *dirs[] = {@"apps", @"lib", @"db", @"hash", @"name"};
         for (int i = 0, lim = sizeof(dirs)/sizeof(dirs[0]); i < lim; ++i) {
             BOOL remove = nameChanged;
             if ([dirs[i] isEqualToString:@"db"] && !hasOldName)
                 remove = NO;
-            [self copyFromMainBundle:fileManager
-                            fromPath:[bundleRoot stringByAppendingPathComponent:dirs[i]]
-                              toPath:[rhoRoot stringByAppendingPathComponent:dirs[i]]
-                              remove:remove];
+            NSString *src = [bundleRoot stringByAppendingPathComponent:dirs[i]];
+            NSLog(@"src: %@", src);
+            NSString *dst = [rhoRoot stringByAppendingPathComponent:dirs[i]];
+            NSLog(@"dst: %@", dst);
+            [self copyFromMainBundle:fileManager fromPath:src toPath:dst remove:remove];
         }
+#endif
 	}
 
 	rho_logconf_Init(rho_native_rhopath());
@@ -200,6 +256,13 @@ int rho_sys_get_screen_height()
     return rect.size.height;
 }
 
+int rho_sys_set_sleeping(int sleeping)
+{
+	int ret = [[UIApplication sharedApplication] isIdleTimerDisabled] ? 0 : 1;
+	[[UIApplication sharedApplication] setIdleTimerDisabled: (!sleeping ? YES : NO)];
+    return ret;
+}
+
 extern VALUE rho_sys_has_network();
 
 // http://www.apple.com/iphone/specs.html