diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java index 89655e480..5d0e31166 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java @@ -92,7 +92,6 @@ public class DlgDelegate { // Game configs LOCKED_CHANGE_ACTION, DELETE_AND_EXIT, - SET_ENABLE_PUBLIC, // New Game NEW_GAME_ACTION, 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 70064b5b7..1950c4b24 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 @@ -323,7 +323,7 @@ public class GameConfigDelegate extends DelegateBase m_car.populate( m_activity, m_conTypes ); setConnLabel(); - setupRelayStuffIf( false ); + setupRelayStuffIf(); showHideRelayStuff(); } }; @@ -475,19 +475,6 @@ public class GameConfigDelegate extends DelegateBase m_smartnessSpinner = (Spinner)findViewById( R.id.smart_robot ); m_connLabel = (TextView)findViewById( R.id.conns_label ); - - // This should only be in for one ship! Remove it and all associated - // strings immediately after shipping it. - if ( !Utils.onFirstVersion( m_activity ) - && !XWPrefs.getPublicRoomsEnabled( m_activity ) ) { - ActionPair pair = new ActionPair( Action.SET_ENABLE_PUBLIC, - R.string.enable_pubroom_title ); - makeNotAgainBuilder( R.string.not_again_enablepublic, - R.string.key_notagain_enablepublic, - Action.SKIP_CALLBACK ) - .setActionPair(pair) - .show(); - } } // init @Override @@ -604,7 +591,7 @@ public class GameConfigDelegate extends DelegateBase } setConnLabel(); - setupRelayStuffIf( false ); + setupRelayStuffIf(); loadPlayersList(); configLangSpinner(); @@ -680,12 +667,6 @@ public class GameConfigDelegate extends DelegateBase } closeNoSave(); break; - case SET_ENABLE_PUBLIC: - XWPrefs.setPrefsBoolean( m_activity, R.string.key_enable_pubroom, - true ); - setupRelayStuffIf( true ); - break; - case ASKED_PHONE_STATE: showDialogFragment( DlgID.CHANGE_CONN, m_conTypes ); break; @@ -1276,12 +1257,12 @@ public class GameConfigDelegate extends DelegateBase } } - private void setupRelayStuffIf( boolean reset ) + private void setupRelayStuffIf() { if ( m_conTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) { boolean publicEnabled = XWPrefs.getPublicRoomsEnabled( m_activity ); int vis = publicEnabled ? View.VISIBLE : View.GONE; - if ( reset || null == m_joinPublicCheck ) { + if ( null == m_joinPublicCheck ) { m_joinPublicCheck = (CheckBox)findViewById(R.id.join_public_room_check); m_joinPublicCheck.setVisibility( vis ); 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 4ea1d6a19..2ef326001 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -129,7 +129,6 @@ key_xlations_locale key_xlations_enabled key_invite_multi - key_notagain_enablepublic key_notagain_rematch_two_only key_notagain_dfltname diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 6b0cf490a..c35e5bddd 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2447,11 +2447,6 @@ sent an invitation. You will see this message until it has been accepted. - Public rooms have been made - an \"advanced\" feature in this release. If you were using them - and want them back, enable them now. You can turn them off again - in Settings. - Turn reminders Disable network game reminders Do not notify me no matter diff --git a/xwords4/android/res_src/values-ba_CK/strings.xml b/xwords4/android/res_src/values-ba_CK/strings.xml index b138897f0..0f3430d77 100644 --- a/xwords4/android/res_src/values-ba_CK/strings.xml +++ b/xwords4/android/res_src/values-ba_CK/strings.xml @@ -2168,10 +2168,6 @@ Siht emag si gnitsoh a ,hctamer dna sah tnes na noitativni. Uoy lliw ees siht egassem litnu ti sah neeb detpecca. - Cilbup smoor evah neeb edam - na \"decnavda\" erutaef ni siht esaeler. Fi uoy erew gnisu meht - dna tnaw meht ,kcab elbane meht won. Uoy nac nrut meht ffo niaga - ni Sgnittes. Nrut srednimer Elbasid krowten emag srednimer Od ton yfiton em on rettam diff --git a/xwords4/android/res_src/values-ca/strings.xml b/xwords4/android/res_src/values-ca/strings.xml index 000514c65..14b1e794b 100644 --- a/xwords4/android/res_src/values-ca/strings.xml +++ b/xwords4/android/res_src/values-ca/strings.xml @@ -1035,8 +1035,6 @@ També podeu tocar les icones a l\'esquerra per a seleccionar o treure partides, (Aquest diàleg es mostrarà fins que tots els jugadors remots hagin connectat. Podeu tancar la partida si penseu que pot trigar una mica. Podran connectar-hi igualment.) - Les sales públiques són una funcionalitat avançada d\'aquesta versió. Si les usàveu i voleu seguir-ho fent, habiliteu l\'opció ara. Podeu inhabilitar-les altra vegada a la configuració. - URL de comprovació d\'actualitzacions Gestió de les invitacions per a tornar a jugar la partida. Us mostrarem aquest missatge mentre no l\'accepteu.\n\nNo heu de tenir aquesta partida oberta mentre espereu. Rebreu una notificació quan la partida estigui preparada per a jugar. diff --git a/xwords4/android/res_src/values-ca_PS/strings.xml b/xwords4/android/res_src/values-ca_PS/strings.xml index 050296365..5254af79c 100644 --- a/xwords4/android/res_src/values-ca_PS/strings.xml +++ b/xwords4/android/res_src/values-ca_PS/strings.xml @@ -2168,10 +2168,6 @@ THIS GAME IS HOSTING A REMATCH, AND HAS SENT AN INVITATION. YOU WILL SEE THIS MESSAGE UNTIL IT HAS BEEN ACCEPTED. - PUBLIC ROOMS HAVE BEEN MADE - AN \"ADVANCED\" FEATURE IN THIS RELEASE. IF YOU WERE USING THEM - AND WANT THEM BACK, ENABLE THEM NOW. YOU CAN TURN THEM OFF AGAIN - IN SETTINGS. TURN REMINDERS DISABLE NETWORK GAME REMINDERS DO NOT NOTIFY ME NO MATTER diff --git a/xwords4/android/res_src/values-fr/strings.xml b/xwords4/android/res_src/values-fr/strings.xml index 691d10d7d..27525888b 100644 --- a/xwords4/android/res_src/values-fr/strings.xml +++ b/xwords4/android/res_src/values-fr/strings.xml @@ -3177,15 +3177,6 @@ changement, ou l\'éditer pour lui attribuer une façon de se connecter ?--> Cette partie héberge une revanche, et a envoyé une invitation. Vous verrez ce message jusqu\'à ce qu\'elle ait été acceptée. - - - Les salons ont été transformés en -fonctionnalité \"avancée\" dans cette version. Si vous les utilisiez et les -revoulez, activez-les maintenant. Vous pouvez les désactiver de nouveau dans -les paramètres. Désactiver les rappels de parties en réseau diff --git a/xwords4/android/res_src/values-ja/strings.xml b/xwords4/android/res_src/values-ja/strings.xml index b4f76fddf..8147631b4 100644 --- a/xwords4/android/res_src/values-ja/strings.xml +++ b/xwords4/android/res_src/values-ja/strings.xml @@ -451,7 +451,6 @@ 高度なゲームの設定 高度 - このリリースで、公開ルームは \"高度\" な機能として用意しました。これを使っていて元に戻したい場合、今すぐこれ有効にしてください。設定で再びオフにすることができます。 このゲームはルーム名を指定しないと 接続できません。 diff --git a/xwords4/android/res_src/values-nl/strings.xml b/xwords4/android/res_src/values-nl/strings.xml index cee03ad7a..fafbc0148 100644 --- a/xwords4/android/res_src/values-nl/strings.xml +++ b/xwords4/android/res_src/values-nl/strings.xml @@ -703,7 +703,6 @@ Bewerk Verwijder veranderingen Nieuwe uitnodiging verstuurd. Je zult dit bericht zien tot het geaccepteerd is.\n\nJe hoeft het spel niet open te houden terwijl je wacht. Je krijgt een bericht als het spel klaar is om te spelen. - Publieke kamers zijn in deze versie een \"geavanceerde\" optie geworden. Als je ze gebruikte en terug wilt hebben, schakel ze dan nu in. Je kan ze later weer uitschakelen in Instellingen. Schakel beurtherinneringen uit Stuur me geen bericht, ook al is het al heel lang mijn beurt Jouw apparaat is ingesteld voor %1$s. Wil je een woordenlijst downloaden zodat je CrossWords in het %1$s kan spelen?