From 3c9626c5ba7b770a9241a3ab31d36fc4a771ae7a Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 23 Aug 2022 15:20:21 -0700 Subject: [PATCH] always include ISO, even if including old langCode --- .../main/java/org/eehouse/android/xw4/NetLaunchInfo.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java index c37f1cbbc..e0d6afec3 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java @@ -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() );