refactor(NodeMenu): always show remote admin menu item

pull/1244/head
andrekir 2024-09-13 19:19:12 -03:00
rodzic 9aaaea1898
commit f0f9235223
3 zmienionych plików z 0 dodań i 6 usunięć

Wyświetl plik

@ -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.
*/

Wyświetl plik

@ -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

Wyświetl plik

@ -45,7 +45,6 @@ class UsersFragment : ScreenFragment("Users"), Logging {
node = node,
ignoreIncomingList = ignoreIncomingList,
isOurNode = isOurNode,
showAdmin = isOurNode || model.hasAdminChannel,
isManaged = model.isManaged,
) {
when (itemId) {