#17013: Set call state to CURRENT on Unhold action

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) {

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);
         }