From e41f5211fd0a6ac32b0d4416016f01c473eda4cd Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Fri, 26 Oct 2012 14:23:50 -0400
Subject: [PATCH] #17013: Set call state to CURRENT on Unhold action
---
src/com/savoirfairelinux/sflphone/client/CallActivity.java | 6 +++++-
src/com/savoirfairelinux/sflphone/utils/CallList.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index 8693482e5..643234efe 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -184,9 +184,13 @@ public class CallActivity extends Activity implements OnClickListener
mCall.setCallState(SipCall.CALL_STATE_HOLD);
setCallStateDisplay(newState);
} else if(newState.equals("UNHOLD")) {
- mCall.setCallState(SipCall.CALL_STATE_UNHOLD);
+ mCall.setCallState(SipCall.CALL_STATE_CURRENT);
+ setCallStateDisplay("CURRENT");
+ } else {
+ mCall.setCallState(SipCall.CALL_STATE_NONE);
setCallStateDisplay(newState);
}
+
}
private void setCallStateDisplay(String newState) {
diff --git a/src/com/savoirfairelinux/sflphone/utils/CallList.java b/src/com/savoirfairelinux/sflphone/utils/CallList.java
index 42b921b48..f1e5205c9 100644
--- a/src/com/savoirfairelinux/sflphone/utils/CallList.java
+++ b/src/com/savoirfairelinux/sflphone/utils/CallList.java
@@ -125,7 +125,7 @@ public class CallList extends BroadcastReceiver
} else if(newState.equals("HOLD")) {
call.setCallState(SipCall.CALL_STATE_HOLD);
} else if(newState.equals("UNHOLD")) {
- call.setCallState(SipCall.CALL_STATE_UNHOLD);
+ call.setCallState(SipCall.CALL_STATE_CURRENT);
} else {
call.setCallState(SipCall.CALL_STATE_NONE);
}
--
GitLab