Corrected the message timestamps.

zond · Feb 1, 2017 · 38c3bf8 · 38c3bf8
1 parent f7e6188
commit 38c3bf8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/app/src/main/java/se/oort/diplicity/apigen/Ticker.java b/app/src/main/java/se/oort/diplicity/apigen/Ticker.java
@@ -3,19 +3,25 @@
 import java.util.*;
 
 public class Ticker implements java.io.Serializable {
-  public Long nanos;
-  public Date unserializedAt;
-  public Ticker(Date unserializedAt, Long nanos) {
+    public Long nanos;
+    public Date unserializedAt;
+    public Ticker(Date unserializedAt, Long nanos) {
     this.unserializedAt = unserializedAt;
     this.nanos = nanos;
-  }
-  public Date deadlineAt() {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(unserializedAt);
-		cal.add(Calendar.MILLISECOND, (int) (nanos / (long) 1000000));
-		return cal.getTime();
-	}
-	public Long nanosLeft() {
-		return (long) (deadlineAt().getTime() - unserializedAt.getTime()) * (long) 1000000;
-	}
+    }
+    public Date createdAt() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(unserializedAt);
+        cal.add(Calendar.MILLISECOND, (int) (nanos / (long) -1000000));
+        return cal.getTime();
+    }
+    public Date deadlineAt() {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(unserializedAt);
+        cal.add(Calendar.MILLISECOND, (int) (nanos / (long) 1000000));
+        return cal.getTime();
+    }
+    public Long nanosLeft() {
+       return (long) (deadlineAt().getTime() - unserializedAt.getTime()) * (long) 1000000;
+    }
 }
diff --git a/app/src/main/java/se/oort/diplicity/game/PressActivity.java b/app/src/main/java/se/oort/diplicity/game/PressActivity.java
@@ -167,7 +167,7 @@ public void send(final MultiContainer<Message> messageMultiContainer) {
                             }
 
                             ((TextView) row.findViewById(R.id.body)).setText(message.Body);
-                            ((TextView) row.findViewById(R.id.at)).setText(message.Age.deadlineAt().toString());
+                            ((TextView) row.findViewById(R.id.at)).setText(message.Age.createdAt().toString());
                             ((TextView) row.findViewById(R.id.sender)).setText(getResources().getString(R.string.x_, message.Sender));
                             if (author != null) {
                                 ImageView avatar = (ImageView) row.findViewById(R.id.avatar);