remove two relay-related prefs

xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java

@@ -609,9 +609,7 @@ public class GameConfigDelegate extends DelegateBase
                 m_carOrig = XwJNI.comms_getAddr( gamePtr );
                 m_remoteAddrs = XwJNI.comms_getAddrs( gamePtr );
             } else if ( !localOnlyGame() ) {
-                String relayName = XWPrefs.getHostName( m_activity );
+                m_carOrig = XwJNI.comms_getInitialAddr();
-                int relayPort = XWPrefs.getDefaultRelayPort( m_activity );
-                m_carOrig = XwJNI.comms_getInitialAddr( relayName, relayPort );
             } else {
                 // Leaving this null breaks stuff: an empty set, rather than a
                 // null one, represents a standalone game

xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java

@@ -484,9 +484,7 @@ public class NetLaunchInfo implements Serializable {
             result.conTypes.add( typ );
             switch( typ ) {
             case COMMS_CONN_RELAY:
-                String relayName = XWPrefs.getHostName( context );
+                Assert.failDbg();
-                int relayPort = XWPrefs.getDefaultRelayPort( context );
-                result.setRelayParams( relayName, relayPort, room );
                 break;
             case COMMS_CONN_BT:
                 result.setBTParams( btAddress, btName );

xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java

@@ -103,17 +103,6 @@ public class XWPrefs {
         setPrefsBoolean( context, R.string.key_hide_newgames, set );
     }
 
-    public static int getDefaultRelayPort( Context context )
-    {
-        String val = getPrefsString( context, R.string.key_relay_port );
-        int result = 0;
-        try {
-            result = Integer.parseInt( val );
-        } catch ( Exception ex ) {
-        }
-        return result;
-    }
-
     public static String getDefaultUpdateUrl( Context context )
     {
         String result = getWithHost( context, R.string.key_update_url_path );

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java

@@ -428,10 +428,7 @@ public class CommsAddrRec implements Serializable {
     {
         switch ( typ ) {
         case COMMS_CONN_RELAY:
-            String room = GameUtils.makeRandomID();
+            Assert.failDbg();
-            String host = XWPrefs.getHostName( context );
-            int port = XWPrefs.getDefaultRelayPort( context );
-            setRelayParams( host, port, room );
             break;
         case COMMS_CONN_BT:
             String[] strs = BTUtils.getBTNameAndAddress();

xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java

@@ -274,8 +274,7 @@ public class XwJNI {
         return nli_from_stream( getJNI().m_ptrGlobals, stream );
     }
 
-    public static native CommsAddrRec comms_getInitialAddr( String relayHost,
+    public static native CommsAddrRec comms_getInitialAddr();
-                                                            int relayPort );
     public static native String comms_getUUID();
 
     // Game methods

xwords4/android/app/src/main/res/values/common_rsrc.xml

@@ -57,7 +57,6 @@
   <string name="key_clr_bonushint_dark">key_clr_bonushint_dark</string>
   <string name="key_board_line_width_dark">key_board_line_width_dark</string>
 
-  <string name="key_relay_port">key_relay_port2</string>
   <string name="key_update_url_path">key_update_url_path</string>
   <string name="key_relay_url_path">key_relay_url_path</string>
   <string name="key_mqtt_url_path">key_mqtt_url_path</string>

xwords4/android/app/src/main/res/values/strings.xml

@@ -2284,10 +2284,8 @@
     <string name="board_menu_game_netstats">Network stats</string>
     <string name="board_menu_game_showInvites">Show invites</string>
     <string name="netstats_title">Game network stats</string>
-    <string name="relay_port">Relay game port</string>
     <string name="mqtt_port">MQTT port</string>
     <string name="mqtt_qos">MQTT QOS</string>
-    <string name="proxy_port">Relay device port</string>
     <string name="name_dict_fmt">%1$s/%2$s</string>
     <string name="gamel_menu_storedb">Write games to SD card</string>
     <string name="gamel_menu_loaddb">Load games from SD card</string>

xwords4/android/app/src/main/res/xml/prefs_dbg_net.xml

@@ -44,19 +44,6 @@
         android:defaultValue="@string/default_relay_url_path"
         />
 
-    <org.eehouse.android.xw4.XWEditTextPreference
-        android:key="@string/key_relay_port"
-        android:title="@string/relay_port"
-        android:defaultValue="10997"
-        android:numeric="decimal"
-        />
-    <org.eehouse.android.xw4.XWEditTextPreference
-        android:key="@string/key_proxy_port"
-        android:title="@string/proxy_port"
-        android:defaultValue="10998"
-        android:numeric="decimal"
-        />
-
     <CheckBoxPreference android:key="@string/key_skip_mqtt_add"
                         android:title="@string/skip_mqtt_add_title"
                         android:summary="@string/skip_mqtt_add_summary"

xwords4/android/jni/xwjni.c

@@ -964,7 +964,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_nli_1from_1stream
 
 JNIEXPORT jobject JNICALL
 Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getInitialAddr
-( JNIEnv* env, jclass C, jstring jname, jint port )
+( JNIEnv* env, jclass C )
 {
     CommsAddrRec addr;
 #ifdef XWFEATURE_RELAY