From 19f4ebc72755e6a5fdbe8f36a3d13576c9841ec8 Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 25 Aug 2020 19:18:26 -0700 Subject: [PATCH] add advisement not to use connect-by-room-name --- .../android/xw4/GameConfigDelegate.java | 11 ++++++++++ .../app/src/main/res/values/common_rsrc.xml | 1 + .../app/src/main/res/values/strings.xml | 20 ++++++++++++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) 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 058c8a624..a720b1223 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,6 +111,7 @@ 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 m_disabMap; private static final int[] s_disabledWhenLocked = { R.id.juggle_players, @@ -520,6 +521,8 @@ public class GameConfigDelegate extends DelegateBase .getSpinner(); m_connLabel = (TextView)findViewById( R.id.conns_label ); + + findViewById( R.id.room_edit ).setOnClickListener(this); } // init @Override @@ -859,6 +862,14 @@ 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 334022848..4be3efe0d 100644 --- a/xwords4/android/app/src/main/res/values/common_rsrc.xml +++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml @@ -159,6 +159,7 @@ key_na_dupstatus_host key_na_dupstatus_guest + key_na_warnRoomName xwords@eehouse.org diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index a90210785..c4e9578c9 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -1394,7 +1394,25 @@ 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. + to discard changes to avoid a restart. + + + 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...) + +