aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Grozev <boris@jitsi.org>2013-08-15 14:50:46 +0300
committerBoris Grozev <boris@jitsi.org>2013-08-15 14:50:46 +0300
commitde279e469061a6cf8b0ce5545009cc1ef408b263 (patch)
tree722edc9ce61025f5c23f23204466ceb986a0eb3b
parente17ee10417820373bcb573db7e2e01c999b9c2a4 (diff)
downloadjitsi-de279e469061a6cf8b0ce5545009cc1ef408b263.zip
jitsi-de279e469061a6cf8b0ce5545009cc1ef408b263.tar.gz
jitsi-de279e469061a6cf8b0ce5545009cc1ef408b263.tar.bz2
Only allow contacts from the same account as the videobridge to be invited into
videobridge conferences
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java25
1 files changed, 22 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java b/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
index b941000..01f316c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallTransferHandler.java
@@ -160,9 +160,28 @@ public class CallTransferHandler
if (detailProvider != null)
{
- callee = detail.getAddress();
- provider = detailProvider;
- break;
+ /*
+ * Currently for videobridge conferences we only support
+ * adding contacts via the account with the videobridge
+ */
+ if (callConference.isJitsiVideoBridge())
+ {
+ for (Call call : callConference.getCalls())
+ {
+ if (detailProvider == call.getProtocolProvider())
+ {
+ callee = detail.getAddress();
+ provider = detailProvider;
+ break;
+ }
+ }
+ }
+ else
+ {
+ callee = detail.getAddress();
+ provider = detailProvider;
+ break;
+ }
}
}