Main: better message timestamps

Fixes https://github.com/cmukgb/ctfws-timer-android/issues/14

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
index 04beaaea252cdfb712fac753fe615d9670457cca..332bcd3087f0c7a4c9101428a0e0beeebfe0ef0d 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
@@ -394,10 +394,18 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
         final StringBuffer sb = new StringBuffer();
         for (CtFwSGameStateManager.Msg m : msgs) {
 
-            long td = (m.when == 0) ? 0 : (gs.isConfigured()) ? m.when - gs.getStartT() : 0;
+            if (m.when == 0 || !gs.isConfigured()) {
+                // leave out the time stamp
+            } else if (m.when <= gs.getFirstRoundStartT()) {
+                sb.append("Setup+");
+                sb.append(DateUtils.formatElapsedTime(m.when - gs.getStartT()));
+                sb.append(": ");
+            } else {
+                sb.append("Game+");
+                sb.append(DateUtils.formatElapsedTime(m.when - gs.getFirstRoundStartT()));
+                sb.append(": ");
+            }
 
-            sb.append(DateUtils.formatElapsedTime(td));
-            sb.append(": ");
             sb.append(m.msg);
             sb.append("\n");
         }