diff options
| author | Damian Minkov <damencho@jitsi.org> | 2013-08-09 17:59:14 +0300 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2013-08-09 17:59:14 +0300 |
| commit | 51edd54df2d28e937d247f930a66ead13d78a74d (patch) | |
| tree | e4fd38f28da5f18e4d5ed513a10238f1e6b8a479 /src/net/java/sip/communicator | |
| parent | f16c8cafdf4f191130e540e3bb086dd7e5483df9 (diff) | |
| download | jitsi-51edd54df2d28e937d247f930a66ead13d78a74d.zip jitsi-51edd54df2d28e937d247f930a66ead13d78a74d.tar.gz jitsi-51edd54df2d28e937d247f930a66ead13d78a74d.tar.bz2 | |
Fixes use of routing for video enabled property not evaluated in some checks.
Diffstat (limited to 'src/net/java/sip/communicator')
| -rw-r--r-- | src/net/java/sip/communicator/util/call/MetaContactPhoneUtil.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/util/call/MetaContactPhoneUtil.java b/src/net/java/sip/communicator/util/call/MetaContactPhoneUtil.java index 3db99b4..99e553e 100644 --- a/src/net/java/sip/communicator/util/call/MetaContactPhoneUtil.java +++ b/src/net/java/sip/communicator/util/call/MetaContactPhoneUtil.java @@ -141,6 +141,11 @@ public class MetaContactPhoneUtil videoPhones.put(contact, phonesList); + // to check for routingForVideoEnabled prop + isVideoCallEnabled(contact); + // to check for routingForDesktopEnabled prop + isDesktopSharingEnabled(contact); + return phonesList; } @@ -232,7 +237,7 @@ public class MetaContactPhoneUtil routingForVideoEnabled = ConfigurationUtils .isRouteVideoAndDesktopUsingPhoneNumberEnabled() - && phones.contains(contact) + && phones.containsKey(contact) && phones.get(contact).size() > 0 && AccountUtils.getOpSetRegisteredProviders( OperationSetVideoTelephony.class, @@ -293,7 +298,7 @@ public class MetaContactPhoneUtil routingForDesktopEnabled = ConfigurationUtils .isRouteVideoAndDesktopUsingPhoneNumberEnabled() - && phones.contains(contact) + && phones.containsKey(contact) && phones.get(contact).size() > 0 && AccountUtils.getOpSetRegisteredProviders( OperationSetDesktopSharingServer.class, |