commit e41f5211fd0a6ac32b0d4416016f01c473eda4cd
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Fri Oct 26 14:23:50 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Fri Oct 26 14:23:50 2012 -0400
tree e4f5a64c630de5286bddee6c156737571ac3f391
parent e9dc899fda0f6f5f7fa5706ce3cd7e036155fe59

#17013: Set call state to CURRENT on Unhold action

src/com/savoirfairelinux/sflphone/client/CallActivity.java

diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index 8693482..643234e 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -184,9 +184,13 @@
             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) {

src/com/savoirfairelinux/sflphone/utils/CallList.java

diff --git a/src/com/savoirfairelinux/sflphone/utils/CallList.java b/src/com/savoirfairelinux/sflphone/utils/CallList.java
index 42b921b..f1e5205 100644
--- a/src/com/savoirfairelinux/sflphone/utils/CallList.java
+++ b/src/com/savoirfairelinux/sflphone/utils/CallList.java
@@ -125,7 +125,7 @@
         } 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);
         }