Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-31 19:57:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

move prefix into resources two since it's repeated.

Browse source
This commit is contained in:
Eric House 2012-11-28 06:30:35 -08:00
parent baa790a8c3
commit 6f620ebc44
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -102,10 +102,9 @@
<!-- other --> <!-- other -->
<string name="default_host">eehouse.org</string> <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="invite_host">eehouse.org</string>
<string name="invite_prefix">/and/</string>
<string name="dict_url">http://eehouse.org/and_wordlists</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> <string name="expl_update_url">Update checks URL</string>
<string name="default_update_url">http://eehouse.org/xw4/info.py</string> <string name="default_update_url">http://eehouse.org/xw4/info.py</string>

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

@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.Uri.Builder;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -99,14 +98,15 @@ public class NetLaunchInfo {
String inviteID, int lang, String inviteID, int lang,
String dict, int nPlayersT ) String dict, int nPlayersT )
{ {
String host = context.getString( R.string.invite_host ); Uri.Builder ub = new Uri.Builder()
Builder ub = new Builder(); .scheme( "http" )
ub.scheme( "http" ); .path( String.format( "//%s%s",
ub.path( context.getString( R.string.game_url_pathf, host ) ); context.getString(R.string.invite_host),
ub.appendQueryParameter( "lang", String.format("%d", lang ) ); context.getString(R.string.invite_prefix) ) )
ub.appendQueryParameter( "np", String.format( "%d", nPlayersT ) ); .appendQueryParameter( "lang", String.format("%d", lang ) )
ub.appendQueryParameter( "room", room ); .appendQueryParameter( "np", String.format( "%d", nPlayersT ) )
ub.appendQueryParameter( "id", inviteID ); .appendQueryParameter( "room", room )
.appendQueryParameter( "id", inviteID );
if ( null != dict ) { if ( null != dict ) {
ub.appendQueryParameter( "wl", dict ); ub.appendQueryParameter( "wl", dict );
} }