diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java index 97132b2a0..b5b40d883 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java @@ -718,7 +718,7 @@ public class ConnStatusHandler { .format( context, RelayService.getLastFCMMillis() ); result = String.format( "DevID: %d; host: %s; latest FCM: %s", DevID.getRelayDevIDInt(context), - XWPrefs.getDefaultRelayHost(context), + XWPrefs.getHostName( context ), fcmMsg ); break; case COMMS_CONN_MQTT: diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java index df7660419..6d5788b91 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java @@ -606,7 +606,7 @@ public class GameConfigDelegate extends DelegateBase m_carOrig = XwJNI.comms_getAddr( gamePtr ); m_remoteAddrs = XwJNI.comms_getAddrs( gamePtr ); } else if ( !localOnlyGame() ) { - String relayName = XWPrefs.getDefaultRelayHost( m_activity ); + String relayName = XWPrefs.getHostName( m_activity ); int relayPort = XWPrefs.getDefaultRelayPort( m_activity ); m_carOrig = XwJNI.comms_getInitialAddr( relayName, relayPort ); } else { 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 be1e0d912..1e56b306d 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 @@ -484,7 +484,7 @@ public class NetLaunchInfo implements Serializable { result.conTypes.add( typ ); switch( typ ) { case COMMS_CONN_RELAY: - String relayName = XWPrefs.getDefaultRelayHost( context ); + String relayName = XWPrefs.getHostName( context ); int relayPort = XWPrefs.getDefaultRelayPort( context ); result.setRelayParams( relayName, relayPort, room ); break; diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java index b2605ceab..69b08baac 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java @@ -66,7 +66,7 @@ public class NetUtils { Socket socket = null; try { int port = XWPrefs.getDefaultProxyPort( context ); - String host = XWPrefs.getDefaultRelayHost( context ); + String host = XWPrefs.getHostName( context ); SocketFactory factory = SocketFactory.getDefault(); InetAddress addr = InetAddress.getByName( host ); @@ -128,8 +128,9 @@ public class NetUtils { static void showGamePage( Context context, int gameID ) { // Requires a login, so only of use to me right now.... - String url = String.format( "https://eehouse.org/xw4/ui/games?gameid=%d", - gameID ); + String host = XWPrefs.getPrefsString( context, R.string.key_mqtt_host ); + String url = String.format( "https://%s/xw4/ui/games?gameid=%d", + host, gameID ); Intent intent = new Intent( Intent.ACTION_VIEW, Uri.parse( url ) ); if ( null != intent.resolveActivity( context.getPackageManager() ) ) { context.startActivity( intent ); diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java index 7afae498e..81df3ba30 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java @@ -140,7 +140,6 @@ public class RelayService extends XWJIService private int m_maxIntervalSeconds = 0; private long m_lastGamePacketReceived; private static AtomicInteger sNativeFailScore = new AtomicInteger();; - private static boolean sSkipUPDSet; private RelayServiceHelper mHelper; private static DevIDType s_curType = DevIDType.ID_TYPE_NONE; private static long s_regStartTime = 0; @@ -401,7 +400,6 @@ public class RelayService extends XWJIService if ( null == mReadThread ) { stopSelf(); } - sSkipUPDSet = XWPrefs.getSkipToWebAPI( this ); } @Override @@ -551,7 +549,7 @@ public class RelayService extends XWJIService if ( null == s_UDPSocket ) { final RelayService service = this; int port = XWPrefs.getDefaultRelayPort( service ); - String host = XWPrefs.getDefaultRelayHost( service ); + String host = XWPrefs.getHostName( service ); try { DatagramSocket udpSocket = new DatagramSocket(); @@ -864,7 +862,7 @@ public class RelayService extends XWJIService private static boolean skipNativeSend() { - boolean skip = sNativeFailScore.get() > UDP_FAIL_LIMIT || sSkipUPDSet; + boolean skip = sNativeFailScore.get() > UDP_FAIL_LIMIT; // Log.d( TAG, "skipNativeSend(score=%d)) => %b", sNativeFailScore.get(), skip ); return skip; } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java index 892a29c2a..79903a182 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java @@ -103,12 +103,6 @@ public class XWPrefs { setPrefsBoolean( context, R.string.key_hide_newgames, set ); } - public static String getDefaultRelayHost( Context context ) - { - String host = getPrefsString( context, R.string.key_relay_host ); - return NetUtils.forceHost( host ); - } - public static int getDefaultRelayPort( Context context ) { String val = getPrefsString( context, R.string.key_relay_port ); @@ -122,27 +116,30 @@ public class XWPrefs { public static String getDefaultUpdateUrl( Context context ) { - return getPrefsString( context, R.string.key_update_url ); + String result = getWithHost( context, R.string.key_update_url_path ); + Log.d( TAG, "getDefaultUpdateUrl() => %s", result ); + return result; } public static String getDefaultRelayUrl( Context context ) { - String result = getPrefsString( context, R.string.key_relay_url ); - if ( result == null || 0 == result.length() ) { - result = context.getString( R.string.default_relay_url ); - } + String result = getWithHost( context, R.string.key_relay_url_path ); + Log.d( TAG, "getDefaultRelayUrl() => %s", result ); return result; } public static String getDefaultMQTTUrl( Context context ) { - String result = getPrefsString( context, R.string.key_mqtt_url2 ); - if ( result == null || 0 == result.length() ) { - result = context.getString( R.string.default_mqtt_url2 ); - } + String result = getWithHost( context, R.string.key_mqtt_url_path ); return result; } + public static String getHostName( Context context ) + { + String host = getPrefsString( context, R.string.key_mqtt_host ); + return NetUtils.forceHost( host ); + } + public static boolean getRelayEnabled( Context context ) { boolean enabled = ! getPrefsBoolean( context, R.string.key_disable_relay, @@ -163,11 +160,6 @@ public class XWPrefs { setPrefsBoolean( context, R.string.key_disable_bt, disabled ); } - public static boolean getSkipToWebAPI( Context context ) - { - return getPrefsBoolean( context, R.string.key_relay_via_http_first, false ); - } - public static int getDefaultProxyPort( Context context ) { String val = getPrefsString( context, R.string.key_proxy_port ); @@ -182,7 +174,8 @@ public class XWPrefs { public static String getDefaultDictURL( Context context ) { - return getPrefsString( context, R.string.key_dict_host4 ); + String result = getWithHost( context, R.string.key_dict_host_path ); + return result; } public static boolean getSquareTiles( Context context ) @@ -554,4 +547,12 @@ public class XWPrefs { } return s_isTablet; } + + private static String getWithHost( Context context, int pathKey ) + { + String host = getHostName( context ); + String path = getPrefsString( context, pathKey ); + String result = String.format( "https://%s/%s", host, path ); + return result; + } } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java index a0054e77a..4ca8cb778 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java @@ -429,7 +429,7 @@ public class CommsAddrRec implements Serializable { switch ( typ ) { case COMMS_CONN_RELAY: String room = GameUtils.makeRandomID(); - String host = XWPrefs.getDefaultRelayHost( context ); + String host = XWPrefs.getHostName( context ); int port = XWPrefs.getDefaultRelayPort( context ); setRelayParams( host, port, room ); break; diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml index 73166bf62..c0b5ba648 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -52,19 +52,17 @@ key_clr_bonushint_dark key_board_line_width_dark - key_relay_host key_relay_port2 - key_relay_via_http_first - key_update_url2 - key_relay_url2 - key_mqtt_url2 + key_update_url_path + key_relay_url_path + key_mqtt_url_path key_mqtt_host key_mqtt_port key_mqtt_qos key_update_prerel key_proxy_port key_sms_port - key_dict_host4 + key_dict_host_path key_logging_on key_show_sms key_init_hintsallowed @@ -185,19 +183,20 @@ xwords@eehouse.org - - eehouse.org - + eehouse.org + + eehouse.org application/x-xwordsinvite - https://eehouse.org/and_wordlists - https://eehouse.org/sms.html - https://eehouse.org/xw4/info.py - https://eehouse.org/xw4/relay.py - https://eehouse.org/xw4/api/v1 + + and_wordlists + xw4/info + xw4/relay + xw4/api/v1 + https://eehouse.org/sms.html https://eehouse.org/xw4/faq.html#%1$s diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 42f7c441f..ed94de6df 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2262,10 +2262,7 @@ care. --> For debugging You should never need these… - Relay host - MQTT host - Use Web APIs first - (instead of as fallback for custom protocol) + Internet/MQTT host Wordlist download URL Enable logging Enable debug features @@ -2302,7 +2299,7 @@ Don’t try a second time Data SMS Stuff Prefs related to play-via-sms - Relay Stuff + Internet Stuff Prefs related to play via internet/relay Localization Stuff Prefs related to in-app localization diff --git a/xwords4/android/app/src/main/res/xml/prefs_dbg.xml b/xwords4/android/app/src/main/res/xml/prefs_dbg.xml index 385e4020f..2f8e2cf12 100644 --- a/xwords4/android/app/src/main/res/xml/prefs_dbg.xml +++ b/xwords4/android/app/src/main/res/xml/prefs_dbg.xml @@ -53,15 +53,15 @@ /> - - + + + - - - - - diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml index 9661a4b9c..e82a3a9ed 100644 --- a/xwords4/android/res_src/values-ca/strings.xml +++ b/xwords4/android/res_src/values-ca/strings.xml @@ -572,7 +572,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu No m\'avisis, tant se val quan faci del meu torn Per a depuració No hauríeu de necessitar això... - Amfitrió de repetició Habilita les característiques de depuració Elements del menú, etc. (només construccions de depuració) %1$s/%2$s @@ -762,7 +761,6 @@ Introduïu el vostre nom aquí. S\'usarà en crear partides noves. (Podreu Arxiva Arxiva El grup «%1$s» ja existeix. - Usa primer les API Web "L\'aparell %1$d s\'ha connectat al repetidor en la sala «%2$s». Està esperant un jugador." "L\'aparell %1$d s\'ha connectat al repetidor en la sala «%2$s». Està esperant %3$d jugadors." diff --git a/xwords4/android/res_src/values-de/strings.xml b/xwords4/android/res_src/values-de/strings.xml index 5c4429a4d..09058ac5e 100644 --- a/xwords4/android/res_src/values-de/strings.xml +++ b/xwords4/android/res_src/values-de/strings.xml @@ -770,9 +770,6 @@ Erinnerungen für Solitair-Partien deaktivieren Ihr Gerät ist für %1$s eingerichtet. Wollen Sie eine Wortliste herunterladen, um CrossWords in %1$s zu spielen? Dies sollten Sie nie brauchen … - Zwischenstation-Server - Zuerst Web-API verwenden - (statt einer Ausweichlösung für ein spezielles Protokoll) Wortlisten-Download-URL Menüeinträge usw. (nur Release-Builds) Einladungen zeigen diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml index dfcbfa261..03b300e56 100644 --- a/xwords4/android/res_src/values-fr/strings.xml +++ b/xwords4/android/res_src/values-fr/strings.xml @@ -2687,7 +2687,6 @@ changement, ou l\'éditer pour lui attribuer une façon de se connecter ?Vous ne devriez jamais en avoir besoin… - Hôte relai @@ -2943,7 +2942,6 @@ pour la langue Jouer cette revanche par MMS uniquement n\'est pas possible sans cette permission. Sans cette permission, la revanche continuera mais créera une partie qui ne peut pas être jouée par MMS. Enregistrer une liste de mots dans l\'espace de Téléchargements nécessite la permission Stockage. - Utiliser les API web en premier URL pour l\'API de relai web Connexions… @@ -3083,7 +3081,6 @@ pour la langue Adresse de la nouvelle API de relai basée sur MQTT QOS MQTT Port MQTT - (plutôt que comme solution de repli pour le protocole personnalisé) Hôte MQTT Dans ce cas, la partie n\'attendant pas seulement que cet appareil se connecte, cela peut aussi signifier qu\'elle n\'a encore invité personne. Cette partie attend que l\'appareil hôte commence la partie. Cela signifie habituellement que l\'hôte ne communique pas (il est temporairement hors ligne \?) diff --git a/xwords4/android/res_src/values-it/strings.xml b/xwords4/android/res_src/values-it/strings.xml index 76489c666..949ef10e9 100644 --- a/xwords4/android/res_src/values-it/strings.xml +++ b/xwords4/android/res_src/values-it/strings.xml @@ -206,10 +206,7 @@ Attiva impostazioni debug Attiva collegamento URL per scaricare lista parole - (al posto di tornare su un protocollo personalizzato) - Usa prima le Web API MQTT ospite - Server Ospite Questo non dovrebbe servirti… Per debugging Il tuo dispositivo è impostato in %1$s. Vorresti scaricare una lista parole così da giocare CrossWords in %1$s\? diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml index 53e680db7..7fc562d5b 100644 --- a/xwords4/android/res_src/values-ja/strings.xml +++ b/xwords4/android/res_src/values-ja/strings.xml @@ -615,7 +615,6 @@ お使いのデバイスで %1$s が設定されました。%1$s でクロスワードがプレイできるように、単語リストをダウンロードしますか? デバッグ用 これは必要ありません… - リレーホスト 単語リストのダウンロード URL ログを有効にする デバッグ機能を有効にする @@ -779,8 +778,6 @@ WiFi ダイレクト経由で接続可能なデバイスはありません。アーカイブ グループ \"%1$s\" は既に存在します。 Git の情報をクリップボードにコピー - Web API から使用する - (カスタムプロトコルからのフォールバックとして) Web API をリレーする URL SMS 送信、受信を表示する 接続… diff --git a/xwords4/android/res_src/values-nb-rNO/strings.xml b/xwords4/android/res_src/values-nb-rNO/strings.xml index 5d612800a..2ec051ec2 100644 --- a/xwords4/android/res_src/values-nb-rNO/strings.xml +++ b/xwords4/android/res_src/values-nb-rNO/strings.xml @@ -606,8 +606,6 @@ Duplikatinvitasjon avslått: Enheten \"%1$s\" har allerede godtatt en invitasjon til dette spillet. Inviter mer enn én spiller per enhet annensteds fra Omkampsinvitasjoner sendt - Relé-vert - Bruk vev-API-er først Ordlistenedlastingsnettadresse Menyelementer osv. (kun utgivelsesbygg) Spillnettverksstatistikk @@ -689,7 +687,6 @@ Tving telefonvisning Endre kommunikasjon via Skru av nettverksspillpåminnelser - (istedenfor tilbakefall for egendefinert protokoll) Vis SMS-forsendelser, -mottak Omkamp etter dette spillet kun på SMS er ikke mulig uten denne tilgangen. Uten tilgangen vil omkampen fortsette, men i et spill som ikke kan utspilles via SMS. diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml index 13629f627..31df86f24 100644 --- a/xwords4/android/res_src/values-nl/strings.xml +++ b/xwords4/android/res_src/values-nl/strings.xml @@ -604,7 +604,6 @@ Jouw apparaat is ingesteld voor %1$s. Wil je een woordenlijst downloaden zodat je CrossWords in het %1$s kan spelen? Voor debuggen Je zal deze opties nooit nodig hoeven te hebben... - Relay host Woordenlijst download URL Schakel logs in Schakel debug functies in diff --git a/xwords4/android/res_src/values-pl/strings.xml b/xwords4/android/res_src/values-pl/strings.xml index 2a430ea4d..162389edd 100644 --- a/xwords4/android/res_src/values-pl/strings.xml +++ b/xwords4/android/res_src/values-pl/strings.xml @@ -695,9 +695,6 @@ Twoje urządzenie jest skonfigurowane na język %1$s. Chcesz pobrać listę słów, aby móc grać w CrossWords w %1$s\? Dla debugowania Nigdy nie powinieneś ich potrzebować... - Host przekazywania - Najpierw użyj interfejsów API sieci Web - (zamiast jako powrót do niestandardowego protokołu) Adres URL pobierania listy słów kluczowych Włącz rejestrowanie Włącz funkcje debugowania diff --git a/xwords4/android/res_src/values-pt-rBR/strings.xml b/xwords4/android/res_src/values-pt-rBR/strings.xml index 393a5ffab..9990b1647 100644 --- a/xwords4/android/res_src/values-pt-rBR/strings.xml +++ b/xwords4/android/res_src/values-pt-rBR/strings.xml @@ -640,7 +640,6 @@ Padrão: mesclar polling e FCM Convite do relay Host MQTT - Host do relay Mensagem do relay Você deveria nunca precisar destes… Para debug @@ -675,8 +674,6 @@ A opção “%1$s” copia uma URL de convite para a área de transferência. Cole-a no app de sua escolha e compartilhe-a com um amigo. %1$s (total de palavras de %2$d) Tipos de endereço desativados - (ao invés de como fallback para um protocolo customizado) - Usar APIs da Web primeiro Checar movimentos como\? Um grupo selecionado diff --git a/xwords4/android/res_src/values-pt/strings.xml b/xwords4/android/res_src/values-pt/strings.xml index 3057e31d9..bbe6df34c 100644 --- a/xwords4/android/res_src/values-pt/strings.xml +++ b/xwords4/android/res_src/values-pt/strings.xml @@ -1824,10 +1824,7 @@ Ativar ferramentas de debug Ativar logs URL de descarrega da lista de palavras - (ao invés de como fallback para um protocolo customizado) - Usar APIs da Web primeiro Host MQTT - Host do relay Deveria nunca precisar destes… Para debug O seu aparelho está configurado para %1$s. Gostaria de descarregar uma lista de palavras para jogar CrossWords em %1$s\?