aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Ivov <emcho@jitsi.org>2010-10-22 10:24:32 +0000
committerEmil Ivov <emcho@jitsi.org>2010-10-22 10:24:32 +0000
commit70ec460a498d4b6a425b50b323514d9d1ab21f9e (patch)
tree0732773b31baa663f490e16eec6f1c2b37c311d4
parent46b548df2f1ab86bf964d0e422b9e37320b41aa8 (diff)
downloadjitsi-70ec460a498d4b6a425b50b323514d9d1ab21f9e.zip
jitsi-70ec460a498d4b6a425b50b323514d9d1ab21f9e.tar.gz
jitsi-70ec460a498d4b6a425b50b323514d9d1ab21f9e.tar.bz2
Handles 180 SIP responses arriving after a 183 by not starting a local audio notification since the 183 means the server is already sending one.
-rw-r--r--src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java
index ad6b803..60c83e6 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPeerAdapter.java
@@ -81,8 +81,13 @@ public class CallPeerAdapter
NotificationManager.stopSound(NotificationManager.DIALING);
}
- if (newState == CallPeerState.ALERTING_REMOTE_SIDE)
+ if (newState == CallPeerState.ALERTING_REMOTE_SIDE
+ //if we were already in state CONNECTING_WITH_EARLY_MEDIA the server
+ //is already taking care of playing the notifications so we don't
+ //need to fire a notification here.
+ && oldState != CallPeerState.CONNECTING_WITH_EARLY_MEDIA)
{
+ //
NotificationManager
.fireNotification(NotificationManager.OUTGOING_CALL);
}
@@ -108,6 +113,8 @@ public class CallPeerAdapter
}
else if (newState == CallPeerState.CONNECTING_WITH_EARLY_MEDIA)
{
+ //this means a call with early media. make sure that we are not
+ //playing local notifications any more.
NotificationManager
.stopSound(NotificationManager.OUTGOING_CALL);
}