Fixes disappearing call history on search in the contact list.

Call history records shown last.

2 files changed, 42 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java
index ac03042..91c3373 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryContactSource.java
@@ -117,6 +117,9 @@ public class CallHistoryContactSource implements ContactSourceService
             {
                 public void callRecordReceived(CallRecordEvent event)
                 {
+                    if (getStatus() == ContactQuery.QUERY_CANCELED)
+                        return;
+
                     SourceContact contact = new CallHistorySourceContact(
                                                 CallHistoryContactSource.this,
                                                 event.getCallRecord());
@@ -131,6 +134,17 @@ public class CallHistoryContactSource implements ContactSourceService
                     fireQueryStatusEvent(status);
                 }
             });
+
+            Iterator<CallRecord> callRecords
+                = callHistoryQuery.getCallRecords().iterator();
+
+            while (callRecords.hasNext())
+            {
+                SourceContact contact = new CallHistorySourceContact(
+                    CallHistoryContactSource.this,
+                    callRecords.next());
+                sourceContacts.add(contact);
+            }
         }
 
         /**
@@ -240,6 +254,11 @@ public class CallHistoryContactSource implements ContactSourceService
             for (ContactQueryListener l : listeners)
                 l.queryStatusChanged(event);
         }
+
+        public String getQueryString()
+        {
+            return callHistoryQuery.getQueryString();
+        }
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/callhistory/CallHistoryQueryImpl.java b/src/net/java/sip/communicator/impl/callhistory/CallHistoryQueryImpl.java
index 5ee98a2..b2b0ceb 100644
--- a/src/net/java/sip/communicator/impl/callhistory/CallHistoryQueryImpl.java
+++ b/src/net/java/sip/communicator/impl/callhistory/CallHistoryQueryImpl.java
@@ -12,6 +12,7 @@ import net.java.sip.communicator.service.callhistory.*;
 import net.java.sip.communicator.service.callhistory.event.*;
 import net.java.sip.communicator.service.history.*;
 import net.java.sip.communicator.service.history.event.*;
+import net.java.sip.communicator.service.history.records.*;
 
 /**
  * 
@@ -53,6 +54,18 @@ public class CallHistoryQueryImpl
                 fireQueryStatusEvent(event.getEventType());
             }
         });
+
+        Iterator<HistoryRecord> historyRecords
+            = historyQuery.getHistoryRecords().iterator();
+
+        while (historyRecords.hasNext())
+        {
+            CallRecord callRecord
+                = CallHistoryServiceImpl.convertHistoryRecordToCallRecord(
+                    historyRecords.next());
+
+            callRecords.add(callRecord);
+        }
     }
 
     /**
@@ -142,4 +155,14 @@ public class CallHistoryQueryImpl
             }
         }
     }
+
+    /**
+     * Returns the query string, this query was created for.
+     *
+     * @return the query string, this query was created for
+     */
+    public String getQueryString()
+    {
+        return historyQuery.getQueryString();
+    }
 }