From 4b730cf0b58460ce37850c093d38e43eed090dc8 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 28 Aug 2024 20:14:01 -0700 Subject: [PATCH] remove useless debug-only menuitem --- .../org/eehouse/android/xw4/BoardDelegate.kt | 6 ---- .../eehouse/android/xw4/GamesListDelegate.kt | 20 ------------- .../eehouse/android/xw4/XWExpListAdapter.kt | 29 ++++++++++--------- .../src/main/res/menu-small/board_menu.xml | 2 -- .../app/src/main/res/menu/board_menu.xml | 2 -- .../main/res/menu/games_list_game_menu.xml | 3 -- .../app/src/main/res/values/strings.xml | 5 +--- xwords4/common/comms.c | 6 ++-- xwords4/common/comms.h | 2 +- xwords4/common/server.c | 4 +-- 10 files changed, 22 insertions(+), 57 deletions(-) diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.kt b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.kt index d96a8e8f4..eaf29c316 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.kt +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.kt @@ -813,7 +813,6 @@ class BoardDelegate(delegator: Delegator) : enable = netGame && (BuildConfig.DEBUG || XWPrefs.getDebugEnabled(mActivity)) Utils.setItemVisible(menu, R.id.board_menu_game_netstats, enable) - Utils.setItemVisible(menu, R.id.board_menu_game_invites, enable) enable = XWPrefs.getStudyEnabled(mActivity) && null != mGi && !DBUtils.studyListWords(mActivity, mGi!!.isoCode()!!).isEmpty() Utils.setItemVisible(menu, R.id.board_menu_study, enable) @@ -867,11 +866,6 @@ class BoardDelegate(delegator: Delegator) : R.string.netstats_title ) - R.id.board_menu_game_invites -> { - val sentInfo = DBUtils.getInvitesFor(mActivity, mRowid) - makeOkOnlyBuilder(sentInfo.getAsText(mActivity)).show() - } - R.id.board_menu_undo_current -> cmd = JNICmd.CMD_UNDO_CUR R.id.board_menu_undo_last -> makeConfirmThenBuilder( Action.UNDO_LAST_ACTION, diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.kt b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.kt index cb955870f..861283ff5 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.kt +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.kt @@ -1843,7 +1843,6 @@ class GamesListDelegate(delegator: Delegator) : enable = (isMultiGame && (BuildConfig.DEBUG || XWPrefs.getDebugEnabled(mActivity))) } - Utils.setItemVisible(menu, R.id.games_game_invites, enable) Utils.setItemVisible(menu, R.id.games_game_netstats, isMultiGame) enable = (isMultiGame && BuildConfig.NON_RELEASE && summary!!.conTypes!!.contains(CommsConnType.COMMS_CONN_MQTT)) @@ -2036,25 +2035,6 @@ class GamesListDelegate(delegator: Delegator) : NetUtils.copyAndLaunchGamePage(mActivity, summary.gameID) } - R.id.games_game_invites -> { - val summary = GameUtils.getSummary(mActivity, selRowIDs[0])!! - var msg = summary.conTypes!!.toString(mActivity, true) - msg = getString(R.string.invites_net_fmt, msg) - - val info = DBUtils.getInvitesFor( - mActivity, - selRowIDs[0] - ) - if (null != info) { - msg += """ - - - ${info.getAsText(mActivity)} - """.trimIndent() - } - makeOkOnlyBuilder(msg).show() - } - R.id.games_game_markbad -> Quarantine.markBad(selRowIDs[0]) else -> handled = false } diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.kt b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.kt index 9843b53cf..726c311fb 100644 --- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.kt +++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.kt @@ -104,21 +104,22 @@ internal abstract class XWExpListAdapter(childClasses: Array>) : } protected fun removeChildrenOf(groupIndex: Int) { - Assert.assertTrueNR(0 <= groupIndex) - Assert.assertTrue(m_groupClass == m_listObjs!![groupIndex]!!.javaClass) - val end = findGroupEnd(groupIndex) - val nChildren = end - groupIndex - 1 // 1: don't remove parent - val newArray = arrayOfNulls(m_listObjs!!.size - nChildren) - System.arraycopy(m_listObjs, 0, newArray, 0, groupIndex + 1) // 1: include parent - val nAbove = m_listObjs!!.size - (groupIndex + nChildren + 1) - if (end < m_listObjs!!.size) { - System.arraycopy( - m_listObjs, end, newArray, groupIndex + 1, - m_listObjs!!.size - end - ) + if (0 <= groupIndex) { + Assert.assertTrue(m_groupClass == m_listObjs!![groupIndex]!!.javaClass) + val end = findGroupEnd(groupIndex) + val nChildren = end - groupIndex - 1 // 1: don't remove parent + val newArray = arrayOfNulls(m_listObjs!!.size - nChildren) + System.arraycopy(m_listObjs, 0, newArray, 0, groupIndex + 1) // 1: include parent + val nAbove = m_listObjs!!.size - (groupIndex + nChildren + 1) + if (end < m_listObjs!!.size) { + System.arraycopy( + m_listObjs, end, newArray, groupIndex + 1, + m_listObjs!!.size - end + ) + } + m_listObjs = newArray as Array + notifyDataSetChanged() } - m_listObjs = newArray as Array - notifyDataSetChanged() } protected fun addChildrenOf(groupIndex: Int, children: List) { diff --git a/xwords4/android/app/src/main/res/menu-small/board_menu.xml b/xwords4/android/app/src/main/res/menu-small/board_menu.xml index 7544fe79c..f06e1e03d 100644 --- a/xwords4/android/app/src/main/res/menu-small/board_menu.xml +++ b/xwords4/android/app/src/main/res/menu-small/board_menu.xml @@ -92,7 +92,5 @@ /> - diff --git a/xwords4/android/app/src/main/res/menu/board_menu.xml b/xwords4/android/app/src/main/res/menu/board_menu.xml index e4b4e6e45..001e7a0a8 100644 --- a/xwords4/android/app/src/main/res/menu/board_menu.xml +++ b/xwords4/android/app/src/main/res/menu/board_menu.xml @@ -75,8 +75,6 @@ - diff --git a/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml b/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml index faa2c91a4..1db94cdad 100644 --- a/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml +++ b/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml @@ -39,9 +39,6 @@ android:title="@string/list_item_deselect" /> - diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index de21fa9c5..959a97dcb 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -1780,8 +1780,6 @@ Refresh - Invitations sent for game connected via - %1$s: successful @@ -2235,7 +2233,6 @@ Enable debug features Menuitems etc. Network stats - Show invites Game network stats MQTT port MQTT QOS @@ -2331,7 +2328,7 @@ You are using the default player name “%1$s”. Would you like to personalize with your own name before you create this game? - This game has sent no invitations + This game has no invitations pending. This change will take effect after you restart CrossWords. This game is configured to communicate diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c index 52c975c8d..b20388820 100644 --- a/xwords4/common/comms.c +++ b/xwords4/common/comms.c @@ -1821,11 +1821,11 @@ getNamesProc( MsgQueueElem* elem, void* closure ) kplr_nameForAddress( gndp->comms->dutil, gndp->xwe, addr ); InviteeNames* names = gndp->names; if ( !!name ) { - XP_STRCAT( names->name[names->count], name ); + XP_STRCAT( names->name[names->nNames], name ); XP_LOGFF( "copied name %s to pos %d (pos %d)", name, - channelNo, names->count ); + channelNo, names->nNames ); } - ++names->count; + ++names->nNames; } return FEA_OK; } diff --git a/xwords4/common/comms.h b/xwords4/common/comms.h index bad6ededa..79b614459 100644 --- a/xwords4/common/comms.h +++ b/xwords4/common/comms.h @@ -209,7 +209,7 @@ void comms_invite( CommsCtxt* comms, XWEnv xwe, const NetLaunchInfo* nli, void comms_getInvited( RELCONST CommsCtxt* comms, XP_U16* nInvites ); typedef struct _InviteeNames { XP_UCHAR name[4][32]; - XP_U16 count; + XP_U16 nNames; } InviteeNames; void comms_inviteeNames( CommsCtxt* comms, XWEnv xwe, InviteeNames* names ); diff --git a/xwords4/common/server.c b/xwords4/common/server.c index c11c49eb9..27a276ff1 100644 --- a/xwords4/common/server.c +++ b/xwords4/common/server.c @@ -4755,13 +4755,13 @@ server_inviteeName( const ServerCtxt* server, InviteeNames names = {}; comms_inviteeNames( comms, xwe, &names ); - if ( nameIndx < names.count ) { + if ( nameIndx < names.nNames ) { XP_LOGFF( "got a match: player %d for channel %d; name: \"%s\"", playerPosn, nameIndx, names.name[nameIndx] ); *bufLen = XP_SNPRINTF( buf, *bufLen, names.name[nameIndx], playerPosn ); } else { XP_LOGFF( "expected %dth name but found only %d", - nameIndx, names.count ); + nameIndx, names.nNames ); } break; }