Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove two relay-related prefs

Browse source
This commit is contained in:
Eric House 2022-05-09 16:15:07 -07:00
parent 5f4dd46f72
commit 5834125058
9 changed files with 5 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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 );
int relayPort = XWPrefs.getDefaultRelayPort( m_activity );
m_carOrig = XwJNI.comms_getInitialAddr( relayName, relayPort );
m_carOrig = XwJNI.comms_getInitialAddr();
} else {
// Leaving this null breaks stuff: an empty set, rather than a
// null one, represents a standalone game

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

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

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

@ -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 );

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

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

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

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

1
xwords4/android/app/src/main/res/values/common_rsrc.xml
View file

@ -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>

2
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -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>

13
xwords4/android/app/src/main/res/xml/prefs_dbg_net.xml
View file

@ -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"

2
xwords4/android/jni/xwjni.c
View file

@ -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