Don't republish muted tracks (#113)

@@ -48,13 +48,6 @@ internal constructor(
             .mapNotNull { it as? LocalTrackPublication }
             .mapNotNull { it as? LocalTrackPublication }
             .toList()
             .toList()
 
 
-    private var isReconnecting = false
-
-    /**
-     * Holds on to publishes that need to be republished after a full reconnect.
-     */
-    private var publishes = mutableMapOf<Track, TrackPublishOptions>()
-
     /**
     /**
      * Creates an audio track, recording audio through the microphone with the given [options].
      * Creates an audio track, recording audio through the microphone with the given [options].
      *
      *
@@ -214,18 +207,15 @@ internal constructor(
         ),
         ),
         publishListener: PublishListener? = null
         publishListener: PublishListener? = null
     ) {
     ) {
-        val published = publishTrackImpl(
-            track,
+        publishTrackImpl(
+            track = track,
+            options = options,
             requestConfig = {
             requestConfig = {
                 disableDtx = !options.dtx
                 disableDtx = !options.dtx
                 source = LivekitModels.TrackSource.MICROPHONE
                 source = LivekitModels.TrackSource.MICROPHONE
             },
             },
             publishListener = publishListener,
             publishListener = publishListener,
         )
         )
-
-        if (published) {
-            publishes[track] = options
-        }
     }
     }
 
 
     suspend fun publishVideoTrack(
     suspend fun publishVideoTrack(
@@ -238,8 +228,9 @@ internal constructor(
         val videoLayers =
         val videoLayers =
             EncodingUtils.videoLayersFromEncodings(track.dimensions.width, track.dimensions.height, encodings)
             EncodingUtils.videoLayersFromEncodings(track.dimensions.width, track.dimensions.height, encodings)
 
 
-        val published = publishTrackImpl(
-            track,
+        publishTrackImpl(
+            track = track,
+            options = options,
             requestConfig = {
             requestConfig = {
                 width = track.dimensions.width
                 width = track.dimensions.width
                 height = track.dimensions.height
                 height = track.dimensions.height
@@ -253,10 +244,6 @@ internal constructor(
             encodings = encodings,
             encodings = encodings,
             publishListener = publishListener
             publishListener = publishListener
         )
         )
-
-        if (published) {
-            publishes[track] = options
-        }
     }
     }
 
 
 
 
@@ -265,6 +252,7 @@ internal constructor(
      */
      */
     private suspend fun publishTrackImpl(
     private suspend fun publishTrackImpl(
         track: Track,
         track: Track,
+        options: TrackPublishOptions,
         requestConfig: LivekitRtc.AddTrackRequest.Builder.() -> Unit,
         requestConfig: LivekitRtc.AddTrackRequest.Builder.() -> Unit,
         encodings: List<RtpParameters.Encoding> = emptyList(),
         encodings: List<RtpParameters.Encoding> = emptyList(),
         publishListener: PublishListener? = null
         publishListener: PublishListener? = null
@@ -306,7 +294,12 @@ internal constructor(
 
 
         // TODO: enable setting preferred codec
         // TODO: enable setting preferred codec
 
 
-        val publication = LocalTrackPublication(trackInfo, track, this)
+        val publication = LocalTrackPublication(
+            info = trackInfo,
+            track = track,
+            participant = this,
+            options = options,
+        )
         addTrackPublication(publication)
         addTrackPublication(publication)
 
 
         publishListener?.onPublishSuccess(publication)
         publishListener?.onPublishSuccess(publication)
@@ -402,15 +395,13 @@ internal constructor(
         engine.updateSubscriptionPermissions(allParticipantsAllowed, participantTrackPermissions)
         engine.updateSubscriptionPermissions(allParticipantsAllowed, participantTrackPermissions)
     }
     }
 
 
-    fun unpublishTrack(track: Track) {
+    fun unpublishTrack(track: Track, stopOnUnpublish: Boolean = true) {
         val publication = localTrackPublications.firstOrNull { it.track == track }
         val publication = localTrackPublications.firstOrNull { it.track == track }
         if (publication === null) {
         if (publication === null) {
             LKLog.d { "this track was never published." }
             LKLog.d { "this track was never published." }
             return
             return
         }
         }
 
 
-        publishes.remove(track)
-
         val sid = publication.sid
         val sid = publication.sid
         tracks = tracks.toMutableMap().apply { remove(sid) }
         tracks = tracks.toMutableMap().apply { remove(sid) }
 
 
@@ -423,7 +414,9 @@ internal constructor(
                 }
                 }
             }
             }
         }
         }
+        if (stopOnUnpublish) {
             track.stop()
             track.stop()
+        }
         internalListener?.onTrackUnpublished(publication, this)
         internalListener?.onTrackUnpublished(publication, this)
         eventBus.postEvent(ParticipantEvent.LocalTrackUnpublished(this, publication), scope)
         eventBus.postEvent(ParticipantEvent.LocalTrackUnpublished(this, publication), scope)
     }
     }
@@ -536,14 +529,21 @@ internal constructor(
     }
     }
 
 
     suspend fun republishTracks() {
     suspend fun republishTracks() {
-        for ((track, options) in publishes) {
+        val republishes = localTrackPublications
+
+        for (pub in republishes) {
+            val track = pub.track ?: continue
+            unpublishTrack(track, false)
+            // Cannot publish muted tracks.
+            if (!pub.muted) {
                 when (track) {
                 when (track) {
-                is LocalAudioTrack -> publishAudioTrack(track, options as AudioTrackPublishOptions, null)
-                is LocalVideoTrack -> publishVideoTrack(track, options as VideoTrackPublishOptions, null)
+                    is LocalAudioTrack -> publishAudioTrack(track, pub.options as AudioTrackPublishOptions, null)
+                    is LocalVideoTrack -> publishVideoTrack(track, pub.options as VideoTrackPublishOptions, null)
                     else -> throw IllegalStateException("LocalParticipant has a non local track publish?")
                     else -> throw IllegalStateException("LocalParticipant has a non local track publish?")
                 }
                 }
             }
             }
         }
         }
+    }
 
 
     fun cleanup() {
     fun cleanup() {
         for (pub in tracks.values) {
         for (pub in tracks.values) {

 package io.livekit.android.room.track
 package io.livekit.android.room.track
 
 
 import io.livekit.android.room.participant.LocalParticipant
 import io.livekit.android.room.participant.LocalParticipant
+import io.livekit.android.room.participant.TrackPublishOptions
 import livekit.LivekitModels
 import livekit.LivekitModels
 
 
 class LocalTrackPublication(
 class LocalTrackPublication(
     info: LivekitModels.TrackInfo,
     info: LivekitModels.TrackInfo,
     track: Track,
     track: Track,
-    participant: LocalParticipant
+    participant: LocalParticipant,
+    val options: TrackPublishOptions,
 ) : TrackPublication(info, track, participant) {
 ) : TrackPublication(info, track, participant) {
 
 
     /**
     /**