From fb1088b9a89a892762beb30e70cf6c86a348e01f Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sat, 24 Jul 2021 12:27:04 -0700
Subject: [PATCH] 'show network' option takes priority over 'reset'

These are debug-build-only, but useful for my debugging!
---
 .../org/eehouse/android/xw4/DelegateBase.java | 34 +++++++++++--------
 .../app/src/main/res/values/strings.xml       |  1 +
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index d6e2ca002..15f3f8041 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -450,12 +450,23 @@ public abstract class DelegateBase implements DlgClickNotify,
                 .setPositiveButton( android.R.string.ok, null );
 
             if ( BuildConfig.NON_RELEASE && null != conTypes ) {
-                if ( conTypes.contains( CommsConnType.COMMS_CONN_RELAY )
-                     || conTypes.contains( CommsConnType.COMMS_CONN_P2P ) ) {
-                    OnClickListener lstnr = new OnClickListener() {
+                OnClickListener lstnr = null;
+                int buttonTxt = 0;
+                if ( conTypes.contains( CommsConnType.COMMS_CONN_MQTT ) ) {
+                    buttonTxt = R.string.list_item_relaypage;
+                    final int gameID = summary.gameID;
+                    lstnr = new OnClickListener() {
                             @Override
-                            public void onClick( DialogInterface dlg,
-                                                 int whichButton ) {
+                            public void onClick( DialogInterface dlg, int whichButton ) {
+                                NetUtils.showGamePage( m_activity, gameID );
+                            }
+                        };
+                } else if ( conTypes.contains( CommsConnType.COMMS_CONN_RELAY )
+                            || conTypes.contains( CommsConnType.COMMS_CONN_P2P ) ) {
+                    buttonTxt = R.string.button_reconnect;
+                    lstnr = new OnClickListener() {
+                            @Override
+                            public void onClick( DialogInterface dlg, int buttn ) {
                                 NetStateCache.reset( m_activity );
                                 if ( conTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) {
                                     RelayService.reset( getActivity() );
@@ -465,16 +476,9 @@ public abstract class DelegateBase implements DlgClickNotify,
                                 }
                             }
                         };
-                    ab.setNegativeButton( R.string.button_reconnect, lstnr );
-                } else if ( conTypes.contains( CommsConnType.COMMS_CONN_MQTT ) ) {
-                    final int gameID = summary.gameID;
-                    OnClickListener lstnr = new OnClickListener() {
-                            @Override
-                            public void onClick( DialogInterface dlg, int whichButton ) {
-                                NetUtils.showGamePage( m_activity, gameID );
-                            }
-                        };
-                    ab.setNegativeButton( R.string.list_item_relaypage, lstnr );
+                }
+                if ( null != lstnr ) {
+                    ab.setNegativeButton( buttonTxt, lstnr );
                 }
             }
             dialog = ab.create();
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index c4e33b3b7..c8863266e 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2043,6 +2043,7 @@
     <string name="confirm_delete">Are you sure you want to delete the
     current game? \n\n(This action cannot be undone.)</string>
     <string name="duplicate_group_name_fmt">The group “%1$s” already exists.</string>
+    <!-- only for debug builds: button to force game to reconnect to legacy relay -->
     <string name="button_reconnect">Reconnect</string>
     <string name="square_tiles">Square rack tiles</string>
     <string name="square_tiles_summary">Even if they can be taller</string>