commit fde875fbf21dc4f6757c687b3346582c353cd30a
author alision <alexandre.lision@savoirfairelinux.com> Tue May 28 17:01:54 2013 -0400
committer alision <alexandre.lision@savoirfairelinux.com> Tue May 28 17:01:54 2013 -0400
tree 9371ff4be41e88ba61138939e8b2ba858f17d6e4
parent 11e8e1604db779d9cbd8f9f1aba9950f05a56ef2

* #25115 First Implementation of new CallActivity with dual-pane
* #25116 SipCall redesigned, holding list of contacts (android or unknown)

src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java

diff --git a/src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java b/src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java
index 05d9226..3214a32 100644
--- a/src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java
+++ b/src/com/savoirfairelinux/sflphone/adapters/CallElementAdapter.java
@@ -66,8 +66,8 @@
         // to the view objects
 
         SipCall call = (SipCall) mCallList.values().toArray()[position];
-        entryView.displayName.setText(call.getDisplayName());
-        entryView.phones.setText(call.getPhone());
+        entryView.displayName.setText(call.getContacts().get(0).getmDisplayName());
+        entryView.phones.setText(call.getContacts().get(0).getPhones().get(0).getNumber());
         entryView.state.setText(CURRENT_STATE_LABEL + call.getCallStateString());
 
         return rowView;
@@ -110,26 +110,26 @@
             return;
         }
         if (newState.equals("INCOMING")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_INCOMING);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_INCOMING);
         } else if (newState.equals("RINGING")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_RINGING);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_RINGING);
         } else if (newState.equals("CURRENT")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_CURRENT);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_CURRENT);
         } else if (newState.equals("HUNGUP")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_HUNGUP);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_HUNGUP);
             mCallList.remove(id);
         } else if (newState.equals("BUSY")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_BUSY);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_BUSY);
             mCallList.remove(id);
         } else if (newState.equals("FAILURE")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_FAILURE);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_FAILURE);
             mCallList.remove(id);
         } else if (newState.equals("HOLD")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_HOLD);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_HOLD);
         } else if (newState.equals("UNHOLD")) {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_CURRENT);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_CURRENT);
         } else {
-            mCallList.get(id).setCallState(SipCall.CALL_STATE_NONE);
+            mCallList.get(id).setCallState(SipCall.state.CALL_STATE_NONE);
         }
         notifyDataSetChanged();