From 43cdc681ca3d092617c80afc9126c21d84ac3c34 Mon Sep 17 00:00:00 2001 From: Nathaniel Wesley Filardo Date: Sun, 22 Sep 2019 14:58:54 +0100 Subject: [PATCH] Main: better message timestamps Fixes https://github.com/cmukgb/ctfws-timer-android/issues/14 --- .../ctfwstimer/CtFwSDisplayLocal.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java index 04beaae..332bcd3 100644 --- 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"); } -- 2.50.1