catch illegal state exception in TrackWrapper

Daniel Gultsch created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java  | 12 
src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java |  2 
2 files changed, 10 insertions(+), 4 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/xmpp/jingle/TrackWrapper.java

@@ -6,6 +6,8 @@ import com.google.common.base.CaseFormat;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 
+import eu.siacs.conversations.Config;
+
 import org.webrtc.MediaStreamTrack;
 import org.webrtc.PeerConnection;
 import org.webrtc.RtpSender;
@@ -16,8 +18,6 @@ import java.util.UUID;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import eu.siacs.conversations.Config;
-
 class TrackWrapper<T extends MediaStreamTrack> {
     public final T track;
     public final RtpSender rtpSender;
@@ -43,7 +43,13 @@ class TrackWrapper<T extends MediaStreamTrack> {
         final RtpTransceiver transceiver =
                 peerConnection == null ? null : getTransceiver(peerConnection, trackWrapper);
         if (transceiver == null) {
-            Log.w(Config.LOGTAG, "unable to detect transceiver for " + trackWrapper.rtpSender.id());
+            final String id;
+            try {
+                id = trackWrapper.rtpSender.id();
+            } catch (final IllegalStateException e) {
+                return Optional.absent();
+            }
+            Log.w(Config.LOGTAG, "unable to detect transceiver for " + id);
             return Optional.of(trackWrapper.track);
         }
         final RtpTransceiver.RtpTransceiverDirection direction = transceiver.getDirection();

src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java

@@ -549,7 +549,7 @@ public class WebRTCWrapper {
                 return false;
             }
         } else {
-            throw new IllegalStateException("Local audio track does not exist (yet)");
+            return false;
         }
     }