Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

always include ISO, even if including old langCode

Browse source
This commit is contained in:
Eric House 2022-08-23 15:20:21 -07:00
parent b54065d416
commit 3c9626c5ba
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -394,9 +394,8 @@ public class NetLaunchInfo implements Serializable {
int[] lang = {0};
if ( XwJNI.haveLocaleToLc( isoCodeStr, lang ) ) {
bundle.putInt( MultiService.LANG, lang[0] );
} else {
bundle.putString( MultiService.ISO, isoCodeStr );
}
bundle.putString( MultiService.ISO, isoCodeStr );
bundle.putString( MultiService.DICT, dict );
bundle.putString( MultiService.GAMENAME, gameName );
bundle.putInt( MultiService.NPLAYERST, nPlayersT );
@ -467,9 +466,8 @@ public class NetLaunchInfo implements Serializable {
int[] lang = {0};
if ( XwJNI.haveLocaleToLc( isoCodeStr, lang ) ) {
obj.put( MultiService.LANG, lang[0] );
} else {
obj.put( MultiService.ISO, isoCodeStr );
}
obj.put( MultiService.ISO, isoCodeStr );
if ( dupeMode ) {
obj.put( MultiService.DUPEMODE, dupeMode );
@ -638,9 +636,8 @@ public class NetLaunchInfo implements Serializable {
Assert.assertTrueNR( null != isoCodeStr );
if ( XwJNI.haveLocaleToLc( isoCodeStr, lang ) ) {
appendInt( ub, LANG_KEY, lang[0] );
} else {
ub.appendQueryParameter( ISO_KEY, isoCodeStr );
}
ub.appendQueryParameter( ISO_KEY, isoCodeStr );
appendInt( ub, TOTPLAYERS_KEY, nPlayersT );
appendInt( ub, HEREPLAYERS_KEY, nPlayersH );
appendInt( ub, GID_KEY, gameID() );