From 3a1e0918524a9078ec7b8276041ac16fe3ac38dc Mon Sep 17 00:00:00 2001 From: Eric House Date: Sat, 24 Jan 2015 11:26:48 -0800 Subject: [PATCH] fix crash on receiving end: inviteID is optional --- .../android/XWords4/src/org/eehouse/android/xw4/BTService.java | 2 +- .../XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java index 86f173afb..a1a2c3016 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BTService.java @@ -1096,7 +1096,7 @@ public class BTService extends XWService { private DataOutputStream connect( BluetoothSocket socket, BTCmd cmd ) { String name = socket.getRemoteDevice().getName(); - DbgUtils.logf( "connecting to %s to send %s", name, cmd.toString() ); + DbgUtils.logf( "connecting to %s to send cmd %s", name, cmd.toString() ); // Docs say always call cancelDiscovery before trying to connect m_adapter.cancelDiscovery(); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java index 9adca1699..59f268c32 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java @@ -104,7 +104,7 @@ public class NetLaunchInfo { break; case COMMS_CONN_RELAY: room = json.getString( MultiService.ROOM ); - m_inviteID = json.getString( MultiService.INVITEID ); + m_inviteID = json.optString( MultiService.INVITEID ); break; case COMMS_CONN_SMS: phone = json.getString( PHONE_KEY );