diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml index 717ef8300..9f6ae2a55 100644 --- a/xwords4/android/XWords4/res/values/common_rsrc.xml +++ b/xwords4/android/XWords4/res/values/common_rsrc.xml @@ -28,6 +28,7 @@ key_clr_crosshairs key_relay_host + key_redir_host key_relay_port2 key_proxy_port key_sms_port @@ -70,11 +71,22 @@ eehouse.org + http://eehouse.org/and_dicts_hh 4.4 beta 28 //%1$s/redir.php + + For debugging + You should never need these... + Relay host + Invite redirect host + Dictionary download URL + Enable logging + Relay game port + Relay device port + diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/XWords4/res/values/strings.xml index 7a241aeb5..19631177b 100644 --- a/xwords4/android/XWords4/res/values/strings.xml +++ b/xwords4/android/XWords4/res/values/strings.xml @@ -328,14 +328,6 @@ Crosshairs color Board background - For debugging - You should never need these... - Relay address - Dictionary download URL - Enable logging - Relay game port - Relay device port - key_player Internet/Relay SMS (broken) diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/XWords4/res/xml/xwprefs.xml index d0bf412f2..702711be1 100644 --- a/xwords4/android/XWords4/res/xml/xwprefs.xml +++ b/xwords4/android/XWords4/res/xml/xwprefs.xml @@ -247,6 +247,11 @@ android:defaultValue="10998" android:numeric="decimal" /> + + 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 09b5a01dd..68f68b5a8 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java @@ -42,7 +42,7 @@ public class NetLaunchInfo { ub.scheme( "http" ); String format = context.getString( R.string.game_url_pathf ); ub.path( String.format( format, - CommonPrefs.getDefaultRelayHost( context ) ) ); + CommonPrefs.getDefaultRedirHost( context ) ) ); ub.appendQueryParameter( "lang", String.format("%d", lang ) ); ub.appendQueryParameter( "np", String.format( "%d", nPlayers ) ); diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java index 198f2425e..93f147cf4 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/PrefsActivity.java @@ -115,6 +115,7 @@ public class PrefsActivity extends PreferenceActivity addPreferencesFromResource( R.xml.xwprefs ); int[] textKeyIds = { R.string.key_relay_host, + R.string.key_redir_host, R.string.key_relay_port, R.string.key_proxy_port, R.string.key_dict_host, diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java index 6b75edd49..9ab71b910 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/CommonPrefs.java @@ -138,6 +138,11 @@ public class CommonPrefs { return getString( context, R.string.key_relay_host ); } + public static String getDefaultRedirHost( Context context ) + { + return getString( context, R.string.key_redir_host ); + } + public static int getDefaultRelayPort( Context context ) { String val = getString( context, R.string.key_relay_port );