Merge lp:~tiagosh/telephony-service/rtm-14.09-fix-hangup-failure into lp:telephony-service/rtm-14.09

[Tiago Salem Herrmann]

Don't remove the call channel if hangup() does not succeed.

Don't remove the call channel if hangup() does not succeed.

[lp:~tiagosh/telephony-service/rtm-14.09-fix-hangup-failure]

940. By Tiago Salem Herrmann on 2015-02-17

add comment back and remove channel from mClosingChannels

=== modified file 'handler/callhandler.cpp'
--- handler/callhandler.cpp	2015-01-28 14:51:24 +0000
+++ handler/callhandler.cpp	2015-02-17 00:19:46 +0000
@@ -87,7 +87,8 @@
 }
 
 CallHandler::CallHandler(QObject *parent)
-: QObject(parent)
+: QObject(parent),
+  mHangupRequested(false)
 {
 }
 
@@ -317,7 +318,9 @@
     // if you request it to be closed, the CallStateEnded will never be reached and the UI
     // and logging will be broken.
     Tp::CallChannelPtr channel = mClosingChannels.take(op);
-    mCallChannels.removeAll(channel);
+    if (mCallChannels.count() == 1) {
+        mHangupRequested = true;
+    }
 }
 
 void CallHandler::onCallChannelInvalidated()
@@ -330,9 +333,10 @@
 
     mCallChannels.removeAll(channel);
 
-    if (mCallChannels.isEmpty()) {
+    if (mCallChannels.isEmpty() && !mHangupRequested) {
         ToneGenerator::instance()->playCallEndedTone();
     }
+    mHangupRequested = false;
 }
 
 void CallHandler::onCallStateChanged(Tp::CallState state)

=== modified file 'handler/callhandler.h'
--- handler/callhandler.h	2015-01-28 14:51:24 +0000
+++ handler/callhandler.h	2015-02-17 00:19:46 +0000
@@ -73,6 +73,7 @@
     QMap<QString, Tp::ContactPtr> mContacts;
     QList<Tp::CallChannelPtr> mCallChannels;
     QMap<Tp::PendingOperation*,Tp::CallChannelPtr> mClosingChannels;
+    bool mHangupRequested;
 };
 
 #endif // CALLHANDLER_H