aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2017-01-07 20:49:32 +0100
committerIngo Bauersachs <ingo@jitsi.org>2017-01-07 20:49:32 +0100
commitd17512426ea790d7046b817b98c9fe8ce54e9322 (patch)
treeee7a6ad4b5a82f1064b3745e2ee9ccabda626bc6
parent029753e4262330865773848b895c6ca2af16f5a5 (diff)
downloadjitsi-d17512426ea790d7046b817b98c9fe8ce54e9322.zip
jitsi-d17512426ea790d7046b817b98c9fe8ce54e9322.tar.gz
jitsi-d17512426ea790d7046b817b98c9fe8ce54e9322.tar.bz2
Ignore all unknown MediaTypes
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/CallPeerJabberImpl.java8
-rw-r--r--src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java11
2 files changed, 2 insertions, 17 deletions
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<T extends MediaAwareCallPeer<?,?,?>>
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<T extends MediaAwareCallPeer<?,?,?>>
{
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: