From d17512426ea790d7046b817b98c9fe8ce54e9322 Mon Sep 17 00:00:00 2001 From: Ingo Bauersachs Date: Sat, 7 Jan 2017 20:49:32 +0100 Subject: Ignore all unknown MediaTypes --- .../communicator/impl/protocol/jabber/CallPeerJabberImpl.java | 8 +------- .../service/protocol/media/CallPeerMediaHandler.java | 11 +---------- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'src/net/java/sip') diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java index 69af6ae..c257202 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java @@ -1588,16 +1588,10 @@ public class CallPeerJabberImpl { case AUDIO: return audioSenders; - case DATA: - /* - * FIXME DATA has been introduced as a MediaType but explicit - * support for DATA content has not been added yet. - */ - return SendersEnum.none; case VIDEO: return videoSenders; default: - throw new IllegalArgumentException("mediaType"); + return SendersEnum.none; } } diff --git a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java index de2d03a..c8a3a12 100644 --- a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java +++ b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java @@ -622,10 +622,8 @@ public abstract class CallPeerMediaHandler> return audioDirectionUserPreference; case VIDEO: return videoDirectionUserPreference; - case DATA: - return MediaDirection.INACTIVE; default: - throw new IllegalArgumentException("mediaType"); + return MediaDirection.INACTIVE; } } @@ -1039,13 +1037,6 @@ public abstract class CallPeerMediaHandler> { case AUDIO: return audioStream; - case DATA: - /* - * DATA is a valid MediaType value and CallPeerMediaHandler does not - * utilize it at this time so no IllegalArgumentException is thrown - * and null is returned (as documented). - */ - return null; case VIDEO: return videoStream; default: -- cgit v1.1