Fix times in message list

The Date object stores a UTC timestamp. It will automatically be converted to the correct local time. Fixes Pushjet#27
mrtnmtth · Jan 30, 2018 · b44f0d2 · b44f0d2
1 parent 3bb40aa
commit b44f0d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/app/src/main/java/io/Pushjet/api/PushListAdapter.java b/app/src/main/java/io/Pushjet/api/PushListAdapter.java
@@ -70,7 +70,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         if (title.equals(""))
             title = entries.get(position).getService().getName();
         String description = entries.get(position).getMessage();
-        Date pushDate = entries.get(position).getLocalTimestamp();
+        Date pushDate = entries.get(position).getTimestamp();
         Bitmap icon = entries.get(position).getService().getIconBitmapOrDefault(context);
 
         dateText.setText(this.df.format(pushDate));

diff --git a/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java b/app/src/main/java/io/Pushjet/api/PushjetApi/PushjetMessage.java
@@ -77,10 +77,6 @@ public void setTimestamp(Date timestamp) {
         this.timestamp = timestamp;
     }
 
-    public Date getLocalTimestamp() {
-        return new Date(timestamp.getTime() + TimeZone.getDefault().getOffset(System.currentTimeMillis()));
-    }
-
     public String getTitleOrName() {
         String ret = title;
         if (ret.equals(""))