Add local per-member radio mute controls on desktop and Android

2026-10-07 13:35:25 +02:00
1 parent a069d11ef9
commit 7e19cbaf3a
@@ -74,6 +74,7 @@ data class ChatMember(val nodeId: Long, val name: String, val online: Boolean =
                      val isAdmin: Boolean = false, val isSuper: Boolean = false,
                      val isModer: Boolean = false, val isStorage: Boolean = false,
                      val radioActive: Boolean = false,
+                      val radioMuted: Boolean = false,
                      val isVerified: Boolean = false, val isDeleted: Boolean = false,
                      val nodeType: Int = 0,
                      val rtt: Int = 0, val isSelf: Boolean = false,
@@ -196,7 +197,7 @@ fun MemberWire.toChatMember(previous: ChatMember = ChatMember(nodeId, name)): Ch
    name = name, online = online != 0,
    isAdmin = (flags and 2) != 0, isSuper = (flags and 1) != 0,
    isModer = (flags and 4) != 0, isStorage = storage,
-    isDeleted = (flags and 8) != 0, radioActive = (flags and 0x10) != 0,
+    isDeleted = (flags and 8) != 0, radioActive = (flags and 0x10) != 0, radioMuted = (flags and 0x20) != 0,
    rtt = if (rtt == 0xFFFF) 0 else rtt, isSelf = isSelf,
    avatarServer = avatarServer, avatarFile = avatarFile, storageRole = storageRole
 )
@@ -442,6 +443,7 @@ class ChatRepository {
                    isSuper = obj.optInt("sp", 0) != 0,
                    isModer = obj.optInt("md", 0) != 0,
                    isStorage = obj.optInt("st", 0) != 0,
+                    radioMuted = obj.optInt("rm", 0) != 0,
                    isVerified = obj.optInt("vd", 0) != 0,
                    isDeleted = obj.optInt("dl", 0) != 0,
                    nodeType = obj.optInt("tp", 0),
@@ -137,6 +137,7 @@ object NativeLib {
    fun cancelAvatar(id: Long): Boolean = nativeAvatarOperation(7, id, 0, 0, 0, null, null, null)
    fun getMemberDetail(channelId: String, nodeId: Long): String = nativeGetMemberDetail(channelId, nodeId) ?: "{}"
    fun setMemberNick(channelId: String, nodeId: Long, nick: String) { nativeSetMemberNick(channelId, nodeId, nick) }
+    fun toggleMemberRadioMute(channelId: String, nodeId: Long): Boolean = nativeToggleMemberRadioMute(channelId, nodeId)
    fun isChannelOwner(channelId: String): Boolean = nativeIsChannelOwner(channelId)
    fun setMemberFlags(channelId: String, nodeId: Long, admin: Boolean, supernode: Boolean, moder: Boolean, storage: Boolean,
                       verified: Boolean, deleted: Boolean) {
@@ -266,6 +267,7 @@ object NativeLib {
                                               remote: String?, local: String?, data: ByteArray?): Boolean
    private external fun nativeGetMemberDetail(channelId: String, nodeId: Long): String?
    private external fun nativeSetMemberNick(channelId: String, nodeId: Long, nick: String)
+    private external fun nativeToggleMemberRadioMute(channelId: String, nodeId: Long): Boolean
    private external fun nativeIsChannelOwner(channelId: String): Boolean
    private external fun nativeSetMemberFlags(channelId: String, nodeId: Long, admin: Boolean, supernode: Boolean, moder: Boolean, storage: Boolean,
                                              verified: Boolean, deleted: Boolean)
@@ -27,6 +27,7 @@ import androidx.compose.material.icons.filled.Storage
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.Shield
 import androidx.compose.material.icons.filled.Star
+import androidx.compose.material.icons.automirrored.filled.VolumeUp
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -68,6 +69,7 @@ fun MemberListScreen(
    val memberLinks by viewModel.memberLinks.collectAsState()
    val localSockets by viewModel.localSockets.collectAsState()
    val channelOwner by viewModel.channelOwner.collectAsState()
+    val radioMuteFailed by viewModel.radioMuteFailed.collectAsState()

    LaunchedEffect(selectedMember?.nodeId) {
        val nodeId = selectedMember?.nodeId
@@ -97,7 +99,8 @@ fun MemberListScreen(
                    onClick = { viewModel.showMemberDetail(channel.id, m.nodeId) },
                    onCall = { viewModel.startCall(channel.id, m.nodeId, m.name) },
                    onMessage = { viewModel.startDm(channel.id, m.nodeId, m.name) },
-                    onInvite = { viewModel.showPmInvite(m.nodeId, m.name, channel.id) }
+                    onInvite = { viewModel.showPmInvite(m.nodeId, m.name, channel.id) },
+                    onRadioMute = { viewModel.toggleMemberRadioMute(channel.id, m.nodeId) }
                )
            }
        }
@@ -131,6 +134,14 @@ fun MemberListScreen(
        }
    }

+    if (radioMuteFailed) {
+        AlertDialog(
+            onDismissRequest = viewModel::dismissRadioMuteError,
+            text = { Text(stringResource(R.string.radio_member_mute_failed)) },
+            confirmButton = { TextButton(onClick = viewModel::dismissRadioMuteError) { Text(stringResource(android.R.string.ok)) } }
+        )
+    }
+
    if (showEditDialog && editMember != null) {
        MemberEditDialog(
            member = editMember!!,
@@ -159,7 +170,8 @@ private fun MemberListItem(
    onClick: () -> Unit,
    onCall: () -> Unit,
    onMessage: () -> Unit,
-    onInvite: () -> Unit
+    onInvite: () -> Unit,
+    onRadioMute: () -> Unit
 ) {
    val onlineColor = when {
        member.connecting -> Color(0xFFFFEB3B)  // yellow: connecting
@@ -239,6 +251,11 @@ private fun MemberListItem(
            }

            if (!member.isSelf) {
+                IconToggleButton(checked = member.radioMuted, onCheckedChange = { onRadioMute() }) {
+                    Icon(Icons.AutoMirrored.Filled.VolumeUp,
+                        stringResource(if (member.radioMuted) R.string.radio_member_listen else R.string.radio_member_mute),
+                        tint = if (member.radioMuted) Color(0xFFEF5350) else Color(0xFF4CAF50))
+                }
                IconButton(onClick = onInvite) { Icon(Icons.Filled.Add, stringResource(R.string.invite_to_group)) }
                IconButton(onClick = onCall, enabled = member.online) { Icon(Icons.Filled.Call, stringResource(R.string.call)) }
                IconButton(onClick = onMessage) { Icon(Icons.AutoMirrored.Filled.Message, stringResource(R.string.message)) }
@@ -118,6 +118,8 @@ class ChatViewModel : ViewModel() {
    val reactionCatalog: StateFlow<List<ReactionState>> = _reactionCatalog
    private val _interactionFailed = MutableStateFlow(false)
    val interactionFailed: StateFlow<Boolean> = _interactionFailed
+    private val _radioMuteFailed = MutableStateFlow(false)
+    val radioMuteFailed: StateFlow<Boolean> = _radioMuteFailed
    private var nextInteractionId = 0L

    private val _currentChannel = MutableStateFlow<Channel?>(null)
@@ -136,6 +138,7 @@ class ChatViewModel : ViewModel() {
    val members: StateFlow<List<ChatMember>> = _members
    /* Live-подписки по каналам: JSON-refresh не должен стирать более свежие BGP-события. Только UI-поток. */
    private val memberRadios = mutableMapOf<String, Map<Long, Boolean>>()
+    private val memberRadioMutes = mutableMapOf<String, Map<Long, Boolean>>()

    private val _channelOwner = MutableStateFlow(false)
    val channelOwner: StateFlow<Boolean> = _channelOwner
@@ -292,6 +295,12 @@ class ChatViewModel : ViewModel() {
            _dmConversations.value = _dmConversations.value.map { it.copy(online = false) }
        } else if (type in listOf(4, 5, 12, 16, 17, 24, 25, 31, 33)) refreshDmCallRoute()
        when (type) {
+            55 -> { /* RADIO_MUTE_RESULT: group_id:8LE, node_id:8LE, success. */
+                if (data == null || data.size != 17) {
+                    LogManager.addLog("ERROR", "Radio", "Invalid member mute result"); _radioMuteFailed.value = true; return
+                }
+                if (data[16].toInt() == 0) _radioMuteFailed.value = true
+            }
            53 -> { /* FEEDBACK_CHANGED: channel, message_id, kind. */
                if (data == null || data.size < 34) return
                val size = data[0].toInt() and 255
@@ -394,6 +403,7 @@ class ChatViewModel : ViewModel() {
            12 -> LogManager.addLog("INFO", "VM", "service started")
            13 -> {
                memberRadios.clear()
+                memberRadioMutes.clear()
                _members.value = _members.value.map { it.copy(radioActive = false) }
                _attachmentPreparations.value = emptyMap()
                _pmInvite.value?.let { state ->
@@ -513,6 +523,7 @@ class ChatViewModel : ViewModel() {
                }
                val radios = snapshot.mapValues { (_, w) -> (w.flags and 0x10) != 0 }
                memberRadios[chId] = radios
+                memberRadioMutes[chId] = snapshot.mapValues { (_, w) -> (w.flags and 0x20) != 0 }
                if (_currentChannel.value?.id == chId)
                    _members.value = _members.value.map { snapshot[it.nodeId]?.toChatMember(it) ?: it }
                LogManager.addLog("DEBUG", "VM", "MEMBER_LIST: ch=$chId members=$count radios=${radios.values.count { it }}")
@@ -530,6 +541,7 @@ class ChatViewModel : ViewModel() {
                val radio = (w.flags and 0x10) != 0
                val previousRadio = memberRadios[chId]?.get(w.nodeId)
                memberRadios[chId] = memberRadios[chId].orEmpty() + (w.nodeId to radio)
+                memberRadioMutes[chId] = memberRadioMutes[chId].orEmpty() + (w.nodeId to ((w.flags and 0x20) != 0))
                if (previousRadio != radio)
                    LogManager.addLog("DEBUG", "VM", "Member radio: ch=$chId node=${w.nodeId} enabled=$radio self=${w.isSelf}")
                val cur = _currentChannel.value
@@ -554,6 +566,7 @@ class ChatViewModel : ViewModel() {
                val nodeId = buf.getLong()
                val chId = String(data, 1, cl)
                memberRadios[chId] = memberRadios[chId].orEmpty() - nodeId
+                memberRadioMutes[chId] = memberRadioMutes[chId].orEmpty() - nodeId
                val cur = _currentChannel.value
                if (cur != null && cur.id == String(data, 1, cl))
                    _members.value = _members.value.filter { it.nodeId != nodeId }
@@ -654,6 +667,7 @@ class ChatViewModel : ViewModel() {
                val chId = String(data, 1, cl)
                LogManager.addLog("INFO", "VM", "CHANNEL_DELETED ch=$chId")
                memberRadios.remove(chId)
+                memberRadioMutes.remove(chId)
                if (radioChannelId == chId) turnRadioOff()
                if (_currentChannel.value?.id == chId) {
                    _currentChannel.value = null
@@ -1170,7 +1184,8 @@ class ChatViewModel : ViewModel() {
                    bgpPresence = ns.bgpPresence, bgpRtt = ns.bgpRtt,
                    bgpNodes = ns.bgpNodes
                ) else m
-                base.copy(connecting = base.nodeId in connecting, radioActive = memberRadios[chId]?.get(base.nodeId) == true)
+                base.copy(connecting = base.nodeId in connecting, radioActive = memberRadios[chId]?.get(base.nodeId) == true,
+                    radioMuted = memberRadioMutes[chId]?.get(base.nodeId) ?: base.radioMuted)
            }
            NativeLib.requestMemberList(chId)
        }
@@ -1210,6 +1225,12 @@ class ChatViewModel : ViewModel() {
        refreshSelectedMemberDetail(channelId, nodeId)
    }

+    fun toggleMemberRadioMute(channelId: String, nodeId: Long) {
+        if (repo == null || !NativeLib.toggleMemberRadioMute(channelId, nodeId)) _radioMuteFailed.value = true
+    }
+
+    fun dismissRadioMuteError() { _radioMuteFailed.value = false }
+
    fun setMemberFlags(channelId: String, nodeId: Long, admin: Boolean, supernode: Boolean, moder: Boolean, storage: Boolean,
                       verified: Boolean, deleted: Boolean) {
        val r = repo ?: return
@@ -1535,6 +1556,7 @@ class ChatViewModel : ViewModel() {
    fun clearState() {
        memberDetailJob?.cancel(); memberDetailTarget = null; _selectedMember.value = null
        memberRadios.clear()
+        memberRadioMutes.clear()
        dismissPmInvite(); _linkJoin.value = null; _joinedChannel.value = null
        _attachmentPreparations.value = emptyMap()
        repo?.close()