Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-29 08:34:37 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove debug preference for setting host in invite emails, replacing

Browse source 
it with a string resource.  The value passed in invites must match the
string hard-coded in the AndroidManifest so there's no point in making
it runtime-configurable.
This commit is contained in:
Eric House 2012-11-27 07:04:47 -08:00
parent f3ecfa569a
commit 441cc53740
5 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
xwords4/android/XWords4/AndroidManifest.xml
View file

@ -129,7 +129,7 @@
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http"
android:host="eehouse.org" android:pathPrefix="/and/" />
android:host="@string/invite_host" android:pathPrefix="/and/" />
</intent-filter>
</activity>

2
xwords4/android/XWords4/res/values/common_rsrc.xml
View file

@ -30,7 +30,6 @@
<string name="key_clr_bonushint">key_clr_bonushint</string>
<string name="key_relay_host">key_relay_host</string>
<string name="key_redir_host">key_redir_host</string>
<string name="key_relay_port">key_relay_port2</string>
<string name="key_update_url">key_update_url</string>
<string name="key_update_prerel">key_update_prerel</string>
@ -104,6 +103,7 @@
<string name="default_host">eehouse.org</string>
<!-- <string name="default_host">10.0.2.2</string> -->
<string name="invite_host">eehouse.org</string>
<string name="dict_url">http://eehouse.org/and_wordlists</string>
<string name="game_url_pathf">//%1$s/and</string>
<string name="expl_update_url">Update checks URL</string>

5
xwords4/android/XWords4/res/xml/xwprefs.xml
View file

@ -324,11 +324,6 @@
android:defaultValue="10998"
android:numeric="decimal"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_redir_host"
android:title="@string/redir_host"
android:defaultValue="@string/default_host"
/>
<org.eehouse.android.xw4.XWEditTextPreference
android:key="@string/key_dict_host"

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/NetLaunchInfo.java
View file

@ -99,11 +99,10 @@ public class NetLaunchInfo {
String inviteID, int lang,
String dict, int nPlayersT )
{
String host = context.getString( R.string.invite_host );
Builder ub = new Builder();
ub.scheme( "http" );
ub.path( context.getString( R.string.game_url_pathf,
XWPrefs.getDefaultRedirHost( context ) ) );
ub.path( context.getString( R.string.game_url_pathf, host ) );
ub.appendQueryParameter( "lang", String.format("%d", lang ) );
ub.appendQueryParameter( "np", String.format( "%d", nPlayersT ) );
ub.appendQueryParameter( "room", room );

5
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWPrefs.java
View file

@ -45,11 +45,6 @@ public class XWPrefs {
return getPrefsString( context, R.string.key_relay_host );
}
public static String getDefaultRedirHost( Context context )
{
return getPrefsString( context, R.string.key_redir_host );
}
public static int getDefaultRelayPort( Context context )
{
String val = getPrefsString( context, R.string.key_relay_port );