diff options
| author | Damian Minkov <damencho@jitsi.org> | 2012-07-09 15:43:29 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2012-07-09 15:43:29 +0000 |
| commit | 0030f69cee6e81301e332d75a16c923aa8d33401 (patch) | |
| tree | 2f32e9dd13ee7e9316d9c77d550017fbb7016454 /src/net/java/sip/communicator/impl/gui/main | |
| parent | 81b590fac3ce98f8d10a1a755fd97d2f32f5d348 (diff) | |
| download | jitsi-0030f69cee6e81301e332d75a16c923aa8d33401.zip jitsi-0030f69cee6e81301e332d75a16c923aa8d33401.tar.gz jitsi-0030f69cee6e81301e332d75a16c923aa8d33401.tar.bz2 | |
Fixes showing today's messages in history window.
Diffstat (limited to 'src/net/java/sip/communicator/impl/gui/main')
| -rw-r--r-- | src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java index 8718564..0a109b6 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/history/HistoryWindow.java @@ -389,6 +389,8 @@ public class HistoryWindow /** * Returns the next date from the history. + * When <tt>date</tt> is the last one, we return the current date, + * means we are loading today messages (till now). * * @param date The date which indicates where to start. * @return the date after the given date @@ -408,8 +410,7 @@ public class HistoryWindow } } - long ts = System.currentTimeMillis(); - return new Date(ts - ts % (24*60*60*1000)); + return new Date(System.currentTimeMillis()); } /** |