From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 27 Oct 2018 16:13:23 +0000 (+0100)
Subject: Ensure we have flag counts more often
X-Git-Tag: release-1.2~11
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=e16f6a2d8c160cf8ec5fb9ab1d684b740d729803;p=acmetensortoys-ctfws-android

Ensure we have flag counts more often

In particular, we will want to display this even if we didn't get a Now
message, say, if we've relauched the app after the game ended.
---

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
index 87bdcf9..8a8f8d2 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
@@ -162,10 +162,24 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
         stv.post(r);
     }
 
+    private void doSetFlagsLabel(final CtFwSGameStateManager gs) {
+        final TextView tv_flags = mAct.findViewById(R.id.tv_flags_label);
+        tv_flags.post(new Runnable() {
+            @Override
+            public void run() {
+                tv_flags.setText(mAct.getResources()
+                        .getQuantityString(R.plurals.ctfws_flags,
+                                gs.getFlagsTotal(),
+                                gs.getFlagsTotal()));
+            }
+        });
+    }
+
     @Override
     public void onCtFwSConfigure(final CtFwSGameStateManager gs) {
         doSetGameStateLabelText(gs, null);
         doSetSidesText(gs);
+        doSetFlagsLabel(gs);
     }
 
     @Override
@@ -177,6 +191,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
 
         doSetGameStateLabelText(gs, now);
         doSetSidesText(gs);
+        doSetFlagsLabel(gs);
 
         if (now.rationale != CtFwSGameStateManager.NowRationale.NR_GAME_IN_PROGRESS) {
             Log.d("CtFwS", "Rationale: " + now.rationale + " stop=" + now.stop);
@@ -287,18 +302,6 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
                 }
             });
         }
-        {
-            final TextView tv_flags = mAct.findViewById(R.id.tv_flags_label);
-            tv_flags.post(new Runnable() {
-                @Override
-                public void run() {
-                    tv_flags.setText(mAct.getResources()
-                            .getQuantityString(R.plurals.ctfws_flags,
-                                    gs.getFlagsTotal(),
-                                    gs.getFlagsTotal()));
-                }
-            });
-        }
     }
 
     private void doReset() {