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 553689407..6be1a70de 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
@@ -262,10 +262,19 @@ public class NetLaunchInfo {
         CommsAddrRec result = new CommsAddrRec();
         for ( CommsConnType typ : m_addrs.getTypes() ) {
             result.conTypes.add( typ );
-            if ( CommsConnType.COMMS_CONN_RELAY == typ ) {
+            switch( typ ) {
+            case COMMS_CONN_RELAY:
                 String relayName = XWPrefs.getDefaultRelayHost( context );
                 int relayPort = XWPrefs.getDefaultRelayPort( context );
                 result.setRelayParams( relayName, relayPort, room );
+                break;
+            case COMMS_CONN_BT:
+                result.setBTParams( btAddress, btName );
+                break;
+            case COMMS_CONN_SMS:
+            default:
+                Assert.fail();
+                break;
             }
         }
 
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java
index 0c8487c03..5bacdb422 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommsAddrRec.java
@@ -137,11 +137,10 @@ public class CommsAddrRec {
         setRelayParams( host, port );
     }
 
-    public CommsAddrRec( String btHost, String btAddr ) 
+    public CommsAddrRec( String btName, String btAddr ) 
     {
         this( CommsConnType.COMMS_CONN_BT );
-        bt_hostName = btHost;
-        bt_btAddr = btAddr;
+        setBTParams( btAddr, btName );
     }
 
     public CommsAddrRec( String phone ) 
@@ -174,6 +173,12 @@ public class CommsAddrRec {
         ip_relay_advertiseRoom = false;
     }
 
+    public void setBTParams( String btAddr, String btName )
+    {
+        bt_hostName = btName;
+        bt_btAddr = btAddr;
+    }
+
     public void populate( Context context )
     {
         for ( CommsConnType typ : conTypes.getTypes() ) {