From f9ceacdfa7a6231ff03516641fc1bae700a71a28 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 26 Aug 2020 21:28:00 -0700
Subject: [PATCH] remove warning about setting room name

---
 .../android/xw4/GameConfigDelegate.java       | 11 ---------
 .../app/src/main/res/values/common_rsrc.xml   |  1 -
 .../app/src/main/res/values/strings.xml       | 23 +++----------------
 3 files changed, 3 insertions(+), 32 deletions(-)

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 a720b1223..058c8a624 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
@@ -111,7 +111,6 @@ public class GameConfigDelegate extends DelegateBase
     private CommonPrefs m_cp;
     private boolean m_gameStarted = false;
     private String[] m_connStrings;
-    private boolean m_nameWarningShown = false;
     private HashMap<CommsConnType, boolean[]> m_disabMap;
     private static final int[] s_disabledWhenLocked
         = { R.id.juggle_players,
@@ -521,8 +520,6 @@ public class GameConfigDelegate extends DelegateBase
             .getSpinner();
 
         m_connLabel = (TextView)findViewById( R.id.conns_label );
-
-        findViewById( R.id.room_edit ).setOnClickListener(this);
     } // init
 
     @Override
@@ -862,14 +859,6 @@ public class GameConfigDelegate extends DelegateBase
                     saveAndClose( false );
                 }
                 break;
-            case R.id.room_edit:
-                if ( ! m_nameWarningShown ) {
-                    m_nameWarningShown = true;
-                    makeNotAgainBuilder( R.string.not_again_warnRoomName,
-                                         R.string.key_na_warnRoomName )
-                        .show();
-                }
-                break;
             default:
                 Log.w( TAG, "unknown v: " + view.toString() );
                 Assert.failDbg();
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 4be3efe0d..334022848 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -159,7 +159,6 @@
 
   <string name="key_na_dupstatus_host">key_na_dupstatus_host</string>
   <string name="key_na_dupstatus_guest">key_na_dupstatus_guest</string>
-  <string name="key_na_warnRoomName">key_na_warnRoomName</string>
 
   <!-- Nor is my email address -->
   <string name="email_author_email">xwords@eehouse.org</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index c4e9578c9..7620bc9b0 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1392,26 +1392,9 @@
     <!-- Shown in the Game configure screen when the game_locked
          checkbox is checked and you uncheck it.  -->
     <string name="not_again_unlock">This game is in play. Some
-      settings, e.g. the number of players, cannot be changed without
-      restarting it.  When you leave this page you will have a chance
-    to discard changes to avoid a restart.</string>
-    <!-- shown in the game configure screen the first time user taps
-         on the room name edit field. -->
-    <string name="not_again_warnRoomName">
-      Changing the room name? If you’re doing that to connect to an
-      existing game you should know that there’s a better way: have
-      the person who created the game send you an invitation. (She
-      will be prompted to send an invitation whenever she opens a game
-      that’s missing any players.)
-
-      \n\nIf you just want to have a cool room name, no problem!
-
-      \n\nAnd, if you still want to connect by setting room names
-      manually, try to keep the games open on both devices until you
-      see tiles appear.
-
-      \n\n(I am working on fixing this...)
-    </string>
+    settings, e.g. the number of players, cannot be changed without
+    restarting it.  When you leave this page you will have a chance to
+    discard changes to avoid a restart.</string>
 
     <!-- This is shown in the Board screen when you successfully
          connect a game to the relay and are the first device in the