commit a458ba232b0ae761c3a2d74cfb59fdc674d1ff98
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Dec 11 15:04:11 2013 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Dec 11 15:04:11 2013 -0500
tree 6e8d9fc5fb23104f6fe43f089bfd6795ad6dbb26
parent 5dd430f5819a11a8dff8c175ca26cef8b4c7c48e

* #36758: link with displayed name stored in history

src/org/sflphone/model/HistoryEntry.java

diff --git a/src/org/sflphone/model/HistoryEntry.java b/src/org/sflphone/model/HistoryEntry.java
index 578a030..278277b 100644
--- a/src/org/sflphone/model/HistoryEntry.java
+++ b/src/org/sflphone/model/HistoryEntry.java
@@ -85,11 +85,13 @@
 
     public void addHistoryCall(HistoryCall historyCall) {
         calls.put(historyCall.call_start, historyCall);
-        if (historyCall.getDirection().contentEquals(ServiceConstants.history.OUTGOING_STRING)) {
-            ++outgoing_sum;
-        } else if (historyCall.isIncoming()) {
+        if (historyCall.isIncoming()) {
             ++incoming_sum;
+        } else {
+            ++outgoing_sum;
         }
+        if (historyCall.isMissed())
+            missed_sum++;
     }
 
     public String getNumber() {
@@ -134,7 +136,6 @@
         dest.writeList(new ArrayList<HistoryCall>(calls.values()));
         dest.writeList(new ArrayList<Long>(calls.keySet()));
 
-        dest.writeMap(calls);
         dest.writeString(accountID);
         dest.writeInt(missed_sum);
         dest.writeInt(outgoing_sum);
@@ -242,7 +243,7 @@
         }
 
         public String getDisplayName() {
-            return displayName;
+            return displayName.substring(0, displayName.indexOf('@'));
         }
 
         @Override