From f0f9235223bebfc3d23941d8125ab8657d26f3ec Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Fri, 13 Sep 2024 19:19:12 -0300
Subject: [PATCH] refactor(NodeMenu): always show remote admin menu item

---
 app/src/main/java/com/geeksville/mesh/model/UIState.kt    | 3 ---
 app/src/main/java/com/geeksville/mesh/ui/NodeMenu.kt      | 2 --
 app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt | 1 -
 3 files changed, 6 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
index 4c404bd01..6e4b79a7f 100644
--- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
@@ -550,9 +550,6 @@ class UIViewModel @Inject constructor(
         }
     }
 
-    val hasAdminChannel: Boolean
-        get() = channelSet.settingsList.any { it.name.equals("admin", ignoreCase = true) }
-
     /**
      * Write the persisted packet data out to a CSV file in the specified location.
      */
diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeMenu.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeMenu.kt
index 18afe8a47..160ece914 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/NodeMenu.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/NodeMenu.kt
@@ -12,7 +12,6 @@ internal fun View.nodeMenu(
     node: NodeInfo,
     ignoreIncomingList: List<Int>,
     isOurNode: Boolean = false,
-    showAdmin: Boolean = false,
     isManaged: Boolean = false,
     onMenuItemAction: MenuItem.() -> Unit,
 ) = PopupMenu(context, this, Gravity.NO_GRAVITY, R.attr.actionOverflowMenuStyle, 0).apply {
@@ -21,7 +20,6 @@ internal fun View.nodeMenu(
     inflate(R.menu.menu_nodes)
     menu.apply {
         setGroupVisible(R.id.group_remote, !isOurNode)
-        setGroupVisible(R.id.group_admin, showAdmin)
         setGroupEnabled(R.id.group_admin, !isManaged)
         findItem(R.id.ignore).apply {
             isEnabled = isIgnored || ignoreIncomingList.size < 3
diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index 382feeca4..1139c59b0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -45,7 +45,6 @@ class UsersFragment : ScreenFragment("Users"), Logging {
             node = node,
             ignoreIncomingList = ignoreIncomingList,
             isOurNode = isOurNode,
-            showAdmin = isOurNode || model.hasAdminChannel,
             isManaged = model.isManaged,
         ) {
             when (itemId) {