Add mute button on Android

Author: wiiznokes

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/audio/MicAudioManager.kt

@@ -41,6 +41,8 @@ class MicAudioManager(
     private val bufferFloatConvert: ByteBuffer
     private var streamJob: Job? = null
 
+    private var isMuted = false
+
     init {
         // check microphone
         require(ctx.packageManager.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)) {
@@ -92,6 +94,12 @@ class MicAudioManager(
         // launch in scope so infinite loop will be canceled when scope exits
         streamJob = scope.launch {
             while (true) {
+
+                if (isMuted) {
+                    delay(RECORD_DELAY_MS)
+                    continue
+                }
+
                 if (recorder.state != AudioRecord.STATE_INITIALIZED || recorder.recordingState != AudioRecord.RECORDSTATE_RECORDING) {
                     delay(RECORD_DELAY_MS)
                     continue
@@ -143,6 +151,14 @@ class MicAudioManager(
         }
     }
 
+    fun mute() {
+        isMuted = true
+    }
+
+    fun unmute() {
+        isMuted = false
+    }
+
     // start recording
     fun start() {
         recorder.startRecording()

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/Command.kt

@@ -12,10 +12,16 @@ import io.github.teamclouday.AndroidMic.utils.Either
 import io.github.teamclouday.AndroidMic.utils.checkIp
 import io.github.teamclouday.AndroidMic.utils.checkPort
 
-
+/**
+ * Service -> UI
+ */
 private const val ID_MSG: String = "ID_MSG"
-private const val ID_STATE: String = "ID_STATE"
+private const val ID_CONNECTION_STATE: String = "ID_CONNECTION_STATE"
+private const val ID_MUTE_STATE: String = "ID_MUTE_STATE"
 
+/**
+ * UI -> Service
+ */
 private const val ID_MODE: String = "ID_MODE"
 
 private const val ID_IP: String = "ID_IP"
@@ -27,7 +33,7 @@ private const val ID_AUDIO_FORMAT: String = "ID_AUDIO_FORMAT"
 
 
 /**
- * Commands UI -> Service
+ * UI -> Service
  */
 enum class Command {
     StartStream,
@@ -36,18 +42,12 @@ enum class Command {
 
     // called when the ui is bind
     BindCheck,
-}
-
-fun Bundle.getOrdinal(key: String): Int? {
-    val v = this.getInt(key, Int.MIN_VALUE);
 
-    return if (v == Int.MIN_VALUE) {
-        null
-    } else {
-        v
-    }
+    Mute,
+    Unmute,
 }
 
+
 data class CommandData(
     val command: Command,
     val mode: Mode? = null,
@@ -134,29 +134,38 @@ data class CommandData(
 
 
 /**
- * Response Service -> UI
+ * Service -> UI
  */
-enum class Response {
+enum class ResponseKind {
     Standard,
 }
 
-enum class ServiceState {
+private enum class ConnectionState {
     Connected,
-    Disconnected,
+    Disconnected;
+}
+
+private enum class MuteState {
+    Muted,
+    Unmuted,
 }
 
 data class ResponseData(
-    val state: ServiceState? = null,
     val msg: String? = null,
-    val kind: Response = Response.Standard,
+    val isConnected: Boolean? = null,
+    val isMuted: Boolean? = null,
+    val kind: ResponseKind = ResponseKind.Standard,
 ) {
 
 
     companion object {
         fun fromMessage(msg: Message): ResponseData {
             return ResponseData(
-                kind = Response.entries[msg.what],
-                state = msg.data.getOrdinal(ID_STATE)?.let { ServiceState.entries[it] },
+                kind = ResponseKind.entries[msg.what],
+                isConnected = msg.data.getOrdinal(ID_CONNECTION_STATE)
+                    ?.let { ConnectionState.entries[it] == ConnectionState.Connected },
+                isMuted = msg.data.getOrdinal(ID_MUTE_STATE)
+                    ?.let { MuteState.entries[it] == MuteState.Muted },
                 msg = msg.data.getString(ID_MSG)
             )
         }
@@ -168,7 +177,13 @@ data class ResponseData(
         val r = Bundle()
 
         this.msg?.let { r.putString(ID_MSG, it) }
-        this.state?.let { r.putInt(ID_STATE, it.ordinal) }
+        this.isConnected?.let {
+            r.putInt(
+                ID_CONNECTION_STATE,
+                (if (it) ConnectionState.Connected else ConnectionState.Disconnected).ordinal
+            )
+        }
+        this.isMuted?.let { r.putInt(ID_MUTE_STATE, (if (it) MuteState.Muted else MuteState.Unmuted).ordinal) }
 
         val reply = Message.obtain()
         reply.data = r
@@ -180,4 +195,12 @@ data class ResponseData(
 }
 
 
+fun Bundle.getOrdinal(key: String): Int? {
+    val v = this.getInt(key, Int.MIN_VALUE);
 
+    return if (v == Int.MIN_VALUE) {
+        null
+    } else {
+        v
+    }
+}

Android/app/src/main/java/io/github/teamclouday/AndroidMic/domain/service/ForegroundService.kt

@@ -27,6 +27,7 @@ import kotlinx.coroutines.launch
 data class ServiceStates(
     var isStreamStarted: Boolean = false,
     var isAudioStarted: Boolean = false,
+    var isMuted: Boolean = false,
     var mode: Mode = Mode.WIFI
 )
 
@@ -52,6 +53,16 @@ class ForegroundService : Service() {
                 Command.BindCheck -> {
                     uiMessenger = msg.replyTo
                 }
+
+                Command.Mute -> {
+                    states.isMuted = true
+                    managerAudio?.mute()
+                }
+
+                Command.Unmute -> {
+                    states.isMuted = false
+                    managerAudio?.unmute()
+                }
             }
 
         }
@@ -181,13 +192,15 @@ class ForegroundService : Service() {
 
     // start streaming
     private fun startStream(msg: CommandData, replyTo: Messenger) {
+        states.isMuted = false
         // check connection state
         if (states.isStreamStarted) {
             reply(
                 replyTo,
                 ResponseData(
-                    ServiceState.Connected,
-                    this.getString(R.string.stream_already_started)
+                    msg = this.getString(R.string.stream_already_started),
+                    isConnected = true,
+                    isMuted = states.isMuted,
                 )
             )
             return
@@ -206,8 +219,9 @@ class ForegroundService : Service() {
             reply(
                 replyTo,
                 ResponseData(
-                    ServiceState.Disconnected,
-                    applicationContext.getString(R.string.error) + e.message
+                    msg = applicationContext.getString(R.string.error) + e.message,
+                    isConnected = false,
+                    isMuted = states.isMuted,
                 )
             )
             return
@@ -219,8 +233,9 @@ class ForegroundService : Service() {
             reply(
                 replyTo,
                 ResponseData(
-                    ServiceState.Disconnected,
-                    applicationContext.getString(R.string.failed_to_connect)
+                    msg = applicationContext.getString(R.string.failed_to_connect),
+                    isConnected = false,
+                    isMuted = states.isMuted,
                 )
             )
             shutdownStream()
@@ -245,8 +260,9 @@ class ForegroundService : Service() {
         reply(
             replyTo,
             ResponseData(
-                ServiceState.Connected,
-                applicationContext.getString(R.string.connected_device) + managerStream?.getInfo()
+                msg = applicationContext.getString(R.string.connected_device) + managerStream?.getInfo(),
+                isConnected = true,
+                isMuted = states.isMuted,
             )
         )
 
@@ -263,8 +279,9 @@ class ForegroundService : Service() {
         reply(
             uiMessenger,
             ResponseData(
-                ServiceState.Disconnected,
-                applicationContext.getString(R.string.device_disconnected)
+                msg = applicationContext.getString(R.string.device_disconnected),
+                isConnected = false,
+                isMuted = states.isMuted,
             )
         )
 
@@ -279,13 +296,6 @@ class ForegroundService : Service() {
         states.isStreamStarted = false
     }
 
-    private fun isConnected(): ServiceState {
-        return if (states.isStreamStarted) {
-            ServiceState.Connected
-        } else {
-            ServiceState.Disconnected
-        }
-    }
 
     // start mic
     private fun startAudio(msg: CommandData, replyTo: Messenger): Boolean {
@@ -349,6 +359,6 @@ class ForegroundService : Service() {
     private fun getStatus(replyTo: Messenger) {
         Log.d(TAG, "getStatus")
 
-        reply(replyTo, ResponseData(isConnected()))
+        reply(replyTo, ResponseData(isConnected = states.isStreamStarted, isMuted = states.isMuted))
     }
 }

Android/app/src/main/java/io/github/teamclouday/AndroidMic/ui/MainViewModel.kt

@@ -21,9 +21,8 @@ import io.github.teamclouday.AndroidMic.SampleRates
 import io.github.teamclouday.AndroidMic.Themes
 import io.github.teamclouday.AndroidMic.domain.service.Command
 import io.github.teamclouday.AndroidMic.domain.service.CommandData
-import io.github.teamclouday.AndroidMic.domain.service.Response
+import io.github.teamclouday.AndroidMic.domain.service.ResponseKind
 import io.github.teamclouday.AndroidMic.domain.service.ResponseData
-import io.github.teamclouday.AndroidMic.domain.service.ServiceState
 import io.github.teamclouday.AndroidMic.ui.utils.UiHelper
 import io.github.teamclouday.AndroidMic.utils.Either
 import kotlinx.coroutines.launch
@@ -51,6 +50,8 @@ class MainViewModel : ViewModel() {
     val isStreamStarted = mutableStateOf(false)
     val isButtonConnectClickable = mutableStateOf(false)
 
+    val isMuted = mutableStateOf(false)
+
     init {
         Log.d(TAG, "init")
     }
@@ -61,10 +62,14 @@ class MainViewModel : ViewModel() {
             val data = ResponseData.fromMessage(msg)
 
             when (data.kind) {
-                Response.Standard -> {
-                    data.state?.let {
+                ResponseKind.Standard -> {
+                    data.isConnected?.let {
                         isButtonConnectClickable.value = true
-                        isStreamStarted.value = it == ServiceState.Connected
+                        isStreamStarted.value = it
+                    }
+
+                    data.isMuted?.let {
+                        isMuted.value = it
                     }
 
                     data.msg?.let {
@@ -89,14 +94,31 @@ class MainViewModel : ViewModel() {
 
         isStreamStarted.value = false
         isButtonConnectClickable.value = false
+        isMuted.value = false
 
         val msg = CommandData(Command.BindCheck).toCommandMsg()
         msg.replyTo = messenger
         service?.send(msg)
     }
 
+    fun onMuteSwitch() {
+        if (!isBound) return
+
+        val message = if (isMuted.value) {
+            isMuted.value = false
+            CommandData(Command.Unmute)
+        } else {
+            isMuted.value = true
+            CommandData(Command.Mute)
+        }.toCommandMsg()
+
+        message.replyTo = messenger
+        service?.send(message)
+    }
+
     fun onConnectButton(): Dialogs? {
         if (!isBound) return null
+        isMuted.value = false
         val message = if (isStreamStarted.value) {
             Log.d(TAG, "onConnectButton: stop stream")
             CommandData(Command.StopStream)