rhodes 3.0.2 → 3.1.0.beta.1

data/platform/bb/rhodes/src/rhomobile/mapview/MapViewScreen.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 rhomobile.mapview;
 
 import java.util.Enumeration;

data/platform/bb/rhodes/src/rhomobile/mapview/RhoMapField.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 rhomobile.mapview;
 
 import net.rim.device.api.ui.Field;

data/platform/iphone/Classes/AppManager/AppLoader.h

@@ -1,10 +1,28 @@
-//
-//  AppLoader.h
-//  rhorunner
-//
-//  Created by vlad on 9/24/08.
-//  Copyright 2008 __MyCompanyName__. 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
+*------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>
 

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

@@ -1,10 +1,29 @@
-//
-//  AppLoader.m
-//  rhorunner
-//
-//  Created by vlad on 9/24/08.
-//  Copyright 2008 __MyCompanyName__. 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
+*------------------------------------------------------------------------*/
+
 #include "common/RhoPort.h"
 #import "AppManager.h"
 #import "AppLoader.h"

data/platform/iphone/Classes/AppManager/AppManager.h

@@ -1,10 +1,28 @@
-//
-//  AppManager.h
-//  rhorunner
-//
-//  Created by vlad on 9/24/08.
-//  Copyright 2008 __MyCompanyName__. 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
+*------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>
 

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

@@ -1,10 +1,28 @@
-//
-//  AppManager.m
-//  rhorunner
-//
-//  Created by vlad on 9/24/08.
-//  Copyright 2008 __MyCompanyName__. 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
+*------------------------------------------------------------------------*/
 
 #import <SystemConfiguration/SystemConfiguration.h>
 #import <Foundation/Foundation.h>
@@ -302,7 +320,7 @@ BOOL isPathIsSymLink(NSFileManager *fileManager, NSString* path) {
 #endif
 	}
     
-	rho_logconf_Init(rho_native_rhopath());
+	rho_logconf_Init(rho_native_rhopath(), "");
 	rho_rhodesapp_create(rho_native_rhopath());
 	RAWLOG_INFO("Rhodes started");
 }

data/platform/iphone/Classes/AppManager/AppManagerI.h

@@ -1,11 +1,28 @@
-/*
- *  AppManagerI.h
- *  rhorunner
- *
- *  Created by vlad on 9/24/08.
- *  Copyright 2008 __MyCompanyName__. 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
+*------------------------------------------------------------------------*/
 	
 const char* GetApplicationsRootPath();
 //int ExecuteAppManager(HttpContextRef context, RouteRef route);

data/platform/iphone/Classes/Bluetooth/Bluetooth.h

@@ -1,20 +1,41 @@
-//
-//  Bluetooth.h
-//  rhorunner
-//
-//  Created by Soldatenkov Dmitry on 27/07/10.
-//  Copyright 2010 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
+*------------------------------------------------------------------------*/
 
 #import <UIKit/UIKit.h>
 #import <Foundation/Foundation.h>
 #import <GameKit/GameKit.h>
 
 
-
+#define PEER_MODE 1
+#define SERVER_MODE 2
+#define CLIENT_MODE 3
+#define CONNECTED_MODE 5
 
 @interface RhoBluetoothManager : NSObject <GKPeerPickerControllerDelegate, GKSessionDelegate> {
-	GKSession		*session;
+	GKSession		*mysession;
 
 	NSString* connectionCallbackURL; 
 	NSString* sessionCallbackURL; 
@@ -24,15 +45,23 @@
 	NSString* connectedDeviceID;
 
 	NSMutableArray* packets;
+    
+    int mode;
+    NSString* custom_connect_client_name;
+    NSString* custom_connect_server_name;
+    
 }
 
-@property(nonatomic, retain) GKSession	 *session;
+@property(nonatomic, retain) GKSession	 *mysession;
 @property(nonatomic, copy)	 NSString	 *deviceName;
 @property(nonatomic, copy)	 NSString	 *connectedDeviceName;
 @property(nonatomic, copy)	 NSString	 *connectedDeviceID;
 @property (readwrite, copy) NSString *connectionCallbackURL;
 @property (readwrite, copy) NSString *sessionCallbackURL;
 @property(nonatomic, retain) NSMutableArray	 *packets;
+@property (readwrite, assign) int mode;
+@property(nonatomic, retain) NSString* custom_connect_client_name;
+@property(nonatomic, retain) NSString* custom_connect_server_name;
 
 
 + (RhoBluetoothManager*)sharedInstance;

data/platform/iphone/Classes/Bluetooth/Bluetooth.m

@@ -1,10 +1,28 @@
-//
-//  BluetoothManager.m
-//  rhorunner
-//
-//  Created by Soldatenkov Dmitry on 27/07/10.
-//  Copyright 2010 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
+*------------------------------------------------------------------------*/
 
 #import "Rhodes.h"
 #import "Bluetooth.h"
@@ -17,6 +35,7 @@
 #define BTC_OK  "OK"
 #define BTC_CANCEL  "CANCEL"
 #define BTC_ERROR  "ERROR"
+#define BTC_NOT_FOUND  "NOT_FOUND"
 
 #define BT_OK  @BTC_OK
 #define BT_CANCEL  @BTC_CANCEL
@@ -43,7 +62,10 @@ static RhoBluetoothManager *instance = NULL;
 + (RhoBluetoothManager*)sharedInstance {
 	if (instance == NULL) {
 		instance = [[RhoBluetoothManager alloc] init];
-		instance.session = nil;
+        instance.mode = PEER_MODE;
+        instance.custom_connect_client_name = nil;
+        instance.custom_connect_server_name = nil;
+		instance.mysession = nil;
 		instance.deviceName = [[UIDevice currentDevice] name];
 		instance.connectedDeviceName = nil;
 		instance.connectedDeviceID = nil;
@@ -55,8 +77,8 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 - (void)dealloc { 
-	[self invalidateSession:self.session];
-	self.session = nil;
+	[self invalidateSession:self.mysession];
+	self.mysession = nil;
 	self.deviceName = nil;
 	self.connectedDeviceName = nil;
 	
@@ -64,7 +86,7 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 
-@synthesize session, deviceName, connectedDeviceName, connectedDeviceID, connectionCallbackURL, sessionCallbackURL, packets;
+@synthesize mysession, deviceName, connectedDeviceName, connectedDeviceID, connectionCallbackURL, sessionCallbackURL, packets, mode, custom_connect_client_name, custom_connect_server_name;
 
 
 #pragma mark -
@@ -87,9 +109,9 @@ static RhoBluetoothManager *instance = NULL;
     [picker autorelease]; 
 	
 	// invalidate and release game session if one is around.
-	if(self.session != nil)	{
-		[self invalidateSession:self.session];
-		self.session = nil;
+	if(self.mysession != nil)	{
+		[self invalidateSession:self.mysession];
+		self.mysession = nil;
 	}
 	[self fireConnectionCallback:BT_CANCEL connected_device_name:@""];
 } 
@@ -108,9 +130,9 @@ static RhoBluetoothManager *instance = NULL;
 	self.connectedDeviceName = [csession displayNameForPeer:peerID];  // copy
 	
 	// Make sure we have a reference to the game session and it is set up
-	self.session = csession; // retain
-	self.session.delegate = self; 
-	[self.session setDataReceiveHandler:self withContext:NULL];
+	self.mysession = csession; // retain
+	self.mysession.delegate = self; 
+	[self.mysession setDataReceiveHandler:self withContext:NULL];
 	
 	// Done with the Peer Picker so dismiss it.
 	[picker dismiss];
@@ -163,10 +185,10 @@ static RhoBluetoothManager *instance = NULL;
 		NSData *packet = [NSData dataWithBytes: networkPacket length: (length)];
 		if(howtosend == YES) { 
 			//[self.session sendData:packet toPeers:[NSArray arrayWithObject:self.connectedDeviceID] withDataMode:GKSendDataReliable error:nil];
-			[self.session sendDataToAllPeers:packet withDataMode:GKSendDataReliable error:nil];
+			[self.mysession sendDataToAllPeers:packet withDataMode:GKSendDataReliable error:nil];
 		} else {
 			//[self.session sendData:packet toPeers:[NSArray arrayWithObject:self.connectedDeviceID] withDataMode:GKSendDataUnreliable error:nil];
-			[self.session sendDataToAllPeers:packet withDataMode:GKSendDataUnreliable error:nil];
+			[self.mysession sendDataToAllPeers:packet withDataMode:GKSendDataUnreliable error:nil];
 		}
 		size -= send_size;
 		indata += send_size;
@@ -174,7 +196,7 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 - (void)sendNSData:(NSData*)cdata {
-	[self sendData:self.session withData:[cdata bytes] ofLength:[cdata length] reliable:YES];
+	[self sendData:self.mysession withData:[cdata bytes] ofLength:[cdata length] reliable:YES];
 }
 
 #pragma mark GKSessionDelegate Methods
@@ -187,8 +209,45 @@ static RhoBluetoothManager *instance = NULL;
 		[self fireSessionCallback:connectedDeviceName event_type:BT_SESSION_DISCONNECT];
 		
 	} 
+    if ((state == GKPeerStateConnected) && ((self.mode == CLIENT_MODE) || (self.mode == SERVER_MODE))) {
+        self.connectedDeviceID = peerID;
+        self.connectedDeviceName = [session displayNameForPeer:peerID];  // copy
+        self.mode = CONNECTED_MODE;
+        //TODO: callback
+        [self fireConnectionCallback:BT_OK connected_device_name:self.connectedDeviceName];
+    }
+    
+    if ((state == GKPeerStateAvailable) && ((self.mode == CLIENT_MODE))) {
+        BOOL accept = NO;
+        NSString* device_name = [session displayNameForPeer:peerID];
+        if (self.custom_connect_server_name != nil) {
+            if ([self.custom_connect_server_name compare:device_name] == NSOrderedSame) {
+                accept = YES;
+            }
+        }
+        if (accept) {
+            [session connectToPeer:peerID withTimeout:20];
+        }
+    }
 } 
 
+- (void)session:(GKSession *)session didReceiveConnectionRequestFromPeer:(NSString *)peerID {
+    NSError* error;
+    BOOL accept = YES;
+    //NSString* device_name = [session displayNameForPeer:peerID];
+    //if (self.custom_connect_client_name != nil) {
+    //    if (!([self.custom_connect_client_name compare:device_name] == NSOrderedSame)) {
+    //        accept = NO;
+    //    }
+    //}
+    if (accept) {
+        [session acceptConnectionFromPeer:peerID error:&error];
+    }
+    else {
+        [session denyConnectionFromPeer:peerID];
+    }
+}
+
 - (void)fireConnectionCallback:(NSString*)status connected_device_name:(NSString*)connected_device_name {
 	if (connectionCallbackURL == nil) {
 		return;
@@ -215,7 +274,8 @@ static RhoBluetoothManager *instance = NULL;
 
 
 - (void)startConnect:(NSString*)callback {
-	self.session = nil;
+    self.mode = PEER_MODE;
+	self.mysession = nil;
 	self.connectedDeviceName = nil;
 	self.connectedDeviceID = nil;
 	
@@ -223,6 +283,51 @@ static RhoBluetoothManager *instance = NULL;
 	[self performSelectorOnMainThread:@selector(startPicker:) withObject:BT_ROLE_SERVER waitUntilDone:NO];
 }
 
+-(void)startClientConnection:(NSString*)role {
+    self.mode = CLIENT_MODE;
+    self.mysession = [[GKSession alloc] initWithSessionID:BT_RHOMOBILE_SESSION_ID displayName:deviceName sessionMode:GKSessionModeClient];
+    self.mysession.delegate = self;
+    [self.mysession setDataReceiveHandler:self withContext:NULL];
+    self.mysession.available = YES;
+}
+
+-(void)startServerConnection:(NSString*)role {
+    self.mode = SERVER_MODE;
+    self.mysession = [[GKSession alloc] initWithSessionID:BT_RHOMOBILE_SESSION_ID displayName:deviceName sessionMode:GKSessionModeServer];
+    self.mysession.delegate = self;
+    [self.mysession setDataReceiveHandler:self withContext:NULL];
+    self.mysession.available = YES;
+}
+
+- (void)stop_current_connection {
+    if (((self.mode == CLIENT_MODE) || (self.mode == SERVER_MODE))) {
+        if (self.mysession != nil) {
+            [self invalidateSession:self.mysession]; 
+            self.mysession = nil;
+        }
+        self.mode = PEER_MODE;
+        [self fireConnectionCallback:BT_CANCEL connected_device_name:@""];
+    }
+}
+
+- (void)startServerConnect:(NSString*)client_name callback:(NSString*)callback {
+	self.mysession = nil;
+	self.connectedDeviceName = nil;
+	self.connectedDeviceID = nil;
+    self.custom_connect_client_name = client_name;
+	self.connectionCallbackURL = callback;
+	[self performSelectorOnMainThread:@selector(startServerConnection:) withObject:BT_ROLE_CLIENT waitUntilDone:NO];
+}
+
+- (void)startClientConnect:(NSString*)server_name callback:(NSString*)callback {
+	self.mysession = nil;
+	self.connectedDeviceName = nil;
+	self.connectedDeviceID = nil;
+	self.connectionCallbackURL = callback;
+    self.custom_connect_server_name = server_name;
+	[self performSelectorOnMainThread:@selector(startClientConnection:) withObject:BT_ROLE_SERVER waitUntilDone:NO];
+}
+
 
 - (int)readFromPackets:(void*)buf length:(int)length {
 	unsigned char *dst = (unsigned char *)buf;
@@ -284,7 +389,7 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 - (void)sendString:(NSString*)string {
-	if (self.session == nil) {
+	if (self.mysession == nil) {
 		return;
 	}
 	const char* sbuf = [string UTF8String];
@@ -303,7 +408,7 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 - (void)sendData:(void*)buf length:(int)length {
-	if (self.session == nil) {
+	if (self.mysession == nil) {
 		return;
 	}
 	//[self sendData:self.session withData:buf ofLength:length reliable:YES];
@@ -312,11 +417,11 @@ static RhoBluetoothManager *instance = NULL;
 }
 
 - (void)doDisconnectCommand:(NSString*)object {
-	if (self.session == nil) {
+	if (self.mysession == nil) {
 		return;
 	}
-	[self invalidateSession:self.session];
-	self.session = nil;
+	[self invalidateSession:self.mysession];
+	self.mysession = nil;
 	[self fireSessionCallback:connectedDeviceName event_type:BT_SESSION_DISCONNECT];
 	self.sessionCallbackURL = nil;
 }
@@ -366,6 +471,31 @@ const char* rho_bluetooth_create_session(const char* role, const char* callback_
 	return BTC_OK;
 }
 
+
+const char* rho_bluetooth_create_custom_server_session(const char* client_name, const char* callback_url, int accept_any_device) {
+	NSString* ns_callback = [NSString stringWithUTF8String:callback_url];
+	NSString* ns_client_name = nil;
+    if (!accept_any_device) {
+        ns_client_name = [NSString stringWithUTF8String:client_name];
+    }
+	[[RhoBluetoothManager sharedInstance] startServerConnect:ns_client_name callback:ns_callback];
+	return BTC_OK;
+}
+
+const char* rho_bluetooth_create_custom_client_session(const char* server_name, const char* callback_url) {
+	NSString* ns_callback = [NSString stringWithUTF8String:callback_url];
+	NSString* ns_server_name = [NSString stringWithUTF8String:server_name];
+	[[RhoBluetoothManager sharedInstance] startClientConnect:ns_server_name callback:ns_callback];
+	return BTC_OK;
+}
+
+const char* rho_bluetooth_stop_current_connection_process() {
+    [[RhoBluetoothManager sharedInstance] stop_current_connection];
+	return BTC_OK;
+}
+
+
+
 void rho_bluetooth_session_set_callback(const char* connected_device_name, const char* callback_url) {
 	NSString* callback = [NSString stringWithUTF8String:callback_url];
 	[RhoBluetoothManager sharedInstance].sessionCallbackURL = callback;
@@ -379,9 +509,9 @@ int rho_bluetooth_session_get_status(const char* connected_device_name) {
 	return [[RhoBluetoothManager sharedInstance] getPacketsSize]; 
 }
 
-const char* rho_bluetooth_session_read_string(const char* connected_device_name) {
+VALUE rho_bluetooth_session_read_string(const char* connected_device_name) {
 	NSString* s = [[RhoBluetoothManager sharedInstance] readString];
-	return [s UTF8String];
+	return rho_ruby_create_string([s UTF8String]);
 }
 
 void rho_bluetooth_session_write_string(const char* connected_device_name, const char* str) {