remove not-again explanation for public rooms

When those became an advanced feature I added a warning for upgrading players who'd miss them. That was long ago, and the warning was only supposed to last a release or two.
2025-01-22 07:28:16 +01:00 · 2017-05-06 21:05:42 -07:00 · 2017-05-06 21:05:42 -07:00 · c637fd1eee
commit c637fd1eee
parent 579a7ae5cb
10 changed files with 4 additions and 51 deletions
--- 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,
--- 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 );
--- 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 @@
  <string name="key_xlations_locale">key_xlations_locale</string>
  <string name="key_xlations_enabled">key_xlations_enabled</string>
  <string name="key_invite_multi">key_invite_multi</string>
-  <string name="key_notagain_enablepublic">key_notagain_enablepublic</string>
  <string name="key_na_rematch_two_only">key_notagain_rematch_two_only</string>
  <string name="key_notagain_dfltname">key_notagain_dfltname</string>

--- 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.</string>

-    <string name="not_again_enablepublic">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.</string>
-
    <string name="disable_nags_title">Turn reminders</string>
    <string name="disable_nag_title">Disable network game reminders</string>
    <string name="disable_nag_summary">Do not notify me no matter
--- a/xwords4/android/res_src/values-ba_CK/strings.xml
+++ b/xwords4/android/res_src/values-ba_CK/strings.xml
@ -2168,10 +2168,6 @@
  <string name="rematch_msg">Siht emag si gnitsoh a ,hctamer dna sah
    tnes na noitativni. Uoy lliw ees siht egassem litnu ti sah neeb
    detpecca.</string>
-  <string name="not_again_enablepublic">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.</string>
  <string name="disable_nags_title">Nrut srednimer</string>
  <string name="disable_nag_title">Elbasid krowten emag srednimer</string>
  <string name="disable_nag_summary">Od ton yfiton em on rettam
--- 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,

    <string name="invite_stays">(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.)</string>

-    <string name="not_again_enablepublic">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ó.</string>
-
    <string name="expl_update_url">URL de comprovació d\'actualitzacions</string>

  <string name="rematch_msg">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.</string>
--- a/xwords4/android/res_src/values-ca_PS/strings.xml
+++ b/xwords4/android/res_src/values-ca_PS/strings.xml
@ -2168,10 +2168,6 @@
  <string name="rematch_msg">THIS GAME IS HOSTING A REMATCH, AND HAS
    SENT AN INVITATION. YOU WILL SEE THIS MESSAGE UNTIL IT HAS BEEN
    ACCEPTED.</string>
-  <string name="not_again_enablepublic">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.</string>
  <string name="disable_nags_title">TURN REMINDERS</string>
  <string name="disable_nag_title">DISABLE NETWORK GAME REMINDERS</string>
  <string name="disable_nag_summary">DO NOT NOTIFY ME NO MATTER
--- 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 ?</stri
    keep this game open while waiting. You will be notified when the
    game is ready to play.</string>-->
    <string name="rematch_msg">Cette partie héberge une revanche, et a envoyé une invitation. Vous verrez ce message jusqu\'à ce qu\'elle ait été acceptée.</string>
-    <!--XLATE-ME-->
-    <!--<string name="not_again_enablepublic">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.</string>-->
-    <string name="not_again_enablepublic">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.</string>

    <!--<string name="disable_nag_title">Disable turn reminders</string>-->
    <string name="disable_nag_title">Désactiver les rappels de parties en réseau</string>
--- a/xwords4/android/res_src/values-ja/strings.xml
+++ b/xwords4/android/res_src/values-ja/strings.xml
@ -451,7 +451,6 @@
    <string name="advanced_config">高度なゲームの設定</string>

    <string name="network_advanced_title">高度</string>
-    <string name="not_again_enablepublic">このリリースで、公開ルームは \"高度\" な機能として用意しました。これを使っていて元に戻したい場合、今すぐこれ有効にしてください。設定で再びオフにすることができます。</string>

    <string name="no_empty_rooms">このゲームはルーム名を指定しないと
 接続できません。</string>
--- a/xwords4/android/res_src/values-nl/strings.xml
+++ b/xwords4/android/res_src/values-nl/strings.xml
@ -703,7 +703,6 @@
  <string name="button_edit">Bewerk</string>
  <string name="button_discard_changes">Verwijder veranderingen</string>
  <string name="rematch_msg">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.</string>
-  <string name="not_again_enablepublic">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.</string>
  <string name="disable_nag_title">Schakel beurtherinneringen uit</string>
  <string name="disable_nag_summary">Stuur me geen bericht, ook al is het al heel lang mijn beurt</string>
  <string name="confirm_get_locdict_fmt">Jouw apparaat is ingesteld voor %1$s. Wil je een woordenlijst downloaden zodat je CrossWords in het %1$s kan spelen?</string>