Stop ringing imediatelly when cancelling a proposal

AGProjects · Oct 7, 2011 · bbacd22 · bbacd22
1 parent 6d02601
commit bbacd22
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/SessionController.py b/SessionController.py
@@ -267,11 +267,17 @@ def endStream(self, streamHandler):
 
     def cancelProposal(self, stream):
         if self.session:
-            self.cancelledStream = stream
-            try:
-                self.session.cancel_proposal()
-            except IllegalStateError, e:
-                self.log_info("IllegalStateError: %s" % e)
+            if self.canCancelProposal():
+                self.log_info("Cancelling proposal...")
+                self.cancelledStream = stream
+                try:
+                    self.session.cancel_proposal()
+                    self.notification_center.post_notification("BlinkWillCancelProposal", sender=self.session)
+
+                except IllegalStateError, e:
+                    self.log_info("IllegalStateError: %s" % e)
+            else:
+                self.log_info("Cancelling proposal is already in progress")
 
     @property
     def ended(self):

diff --git a/SessionRinger.py b/SessionRinger.py
@@ -70,6 +70,8 @@ def start(self):
         notification_center.add_observer(self, name="CFGSettingsObjectDidChange")
         notification_center.add_observer(self, name="ChatViewControllerDidDisplayMessage")
         notification_center.add_observer(self, name="ConferenceHasAddedAudio")
+        notification_center.add_observer(self, name="BlinkWillCancelProposal")
+
         self.started = True
 
     def stop(self):
@@ -81,6 +83,7 @@ def stop(self):
         notification_center.remove_observer(self, name="CFGSettingsObjectDidChange")
         notification_center.remove_observer(self, name="ChatViewControllerDidDisplayMessage")
         notification_center.remove_observer(self, name="ConferenceHasAddedAudio")
+        notification_center.remove_observer(self, name="BlinkWillCancelProposal")
 
     def update_playing_ringtones(self):
         should_play_incoming = False
@@ -291,7 +294,7 @@ def handle_notification(self, notification):
             NotificationCenter().remove_observer(self, sender=session)
             self.active_sessions.discard(session)
             self.stop_ringing(session)
-        elif name in ("SIPSessionGotAcceptProposal", "SIPSessionGotRejectProposal", "SIPSessionHadProposalFailure"):
+        elif name in ("SIPSessionGotAcceptProposal", "SIPSessionGotRejectProposal", "SIPSessionHadProposalFailure", "BlinkWillCancelProposal"):
             self.stop_ringing(session)
         elif name == "SIPSessionGotProposal":
             stream_types = [stream.type for stream in data.streams]