From 6c25a1e03f3ca148a52bbbecf2932263d364f0cb Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Fri, 26 Oct 2012 15:49:16 -0400
Subject: [PATCH] #17013: Allow hanging up call in state HOLD
---
src/com/savoirfairelinux/sflphone/client/CallActivity.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index 643234efe..6d31e6fc5 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -130,7 +130,8 @@ public class CallActivity extends Activity implements OnClickListener
break;
case R.id.buttonhangup:
if((mCall.getCallStateInt() == SipCall.CALL_STATE_NONE) ||
- (mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT)) {
+ (mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT) ||
+ (mCall.getCallStateInt() == SipCall.CALL_STATE_HOLD)) {
mCall.notifyServiceHangup(service);
finish();
}
@@ -140,13 +141,11 @@ public class CallActivity extends Activity implements OnClickListener
}
break;
case R.id.buttonhold:
- Log.i(TAG, "HOLDBUTTONCLICK call state " + mCall.getCallStateString());
if(mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT) {
mCall.notifyServiceHold(service);
}
break;
case R.id.buttonunhold:
- Log.i(TAG, "UNHOLDBUTTONCLICK call state " + mCall.getCallStateString());
if(mCall.getCallStateInt() == SipCall.CALL_STATE_HOLD) {
mCall.notifyServiceUnhold(service);
}
--
GitLab