Avoid showing escape codes even briefly in game state

Whoops!

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
index e3a962f1895cca1df8ebba5baec52ad2606ffe29..4b69b17ebb0f74de86d9de9bcbd5469e34c3c9f6 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/Activity.java
@@ -162,7 +162,7 @@ public class Activity extends CtFwSActivityBase {
                 if (mCdl != null) {
                     tv.setText(mCdl.gameStateLabelText);
                 } else {
-                    tv.setText(R.string.header_gamestate0);
+                    tv.setText(R.string.header_not_config);
                 }
                 egg = false;
             }, 3000);

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/CtFwSDisplay.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/CtFwSDisplay.java
index 224adc42b3a837f7927e75c1a52abea921d1e505..6ad05cef1793ed6b1eaa5c306d4b89049bdf0d67 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/CtFwSDisplay.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/main/CtFwSDisplay.java
@@ -34,7 +34,7 @@ public class CtFwSDisplay implements CtFwSGameStateManager.Observer {
 
     CtFwSDisplay(Activity a) {
         mAct = a;
-        gameStateLabelText = mAct.getResources().getString(R.string.header_gamestate0);
+        gameStateLabelText = mAct.getResources().getString(R.string.header_not_config);
 
         stun_short = new StunTimer(
                 (Chronometer)mAct.findViewById(R.id.ch_wait_short),
@@ -77,8 +77,7 @@ public class CtFwSDisplay implements CtFwSGameStateManager.Observer {
         }
 
         if (nr == CtFwSGameStateManager.NowRationale.NR_NOT_CONFIG) {
-            gameStateLabelText = String.format(rs.getString(R.string.header_gamestate0),
-                    rs.getString(R.string.notify_not_config));
+            gameStateLabelText = rs.getString(R.string.header_not_config);
         } else {
 
             String sfx;

diff --git a/mobile/src/main/res/layout/activity_main.xml b/mobile/src/main/res/layout/activity_main.xml
index c29cc18e14eca0743d307cb183e89619e1d283ca..c9683bc4451081e0cdddb89613a4c5e62c1a9454 100644 (file)
--- a/mobile/src/main/res/layout/activity_main.xml
+++ b/mobile/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/header_gamestate0" />
+            android:text="@string/header_not_config" />
 
         <TextView
             android:id="@+id/header_sides"

diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 896fe11c21688a957ecd14a01f7f23cc24d9c40f..0eae9e843adcfa9d28a07be8c93203bb576e7043 100644 (file)
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     </string>
     <string name="flags_noviz">Flag scores hidden</string>
 
+    <string name="header_not_config">Game not configured</string>
     <string name="header_gamestate0">Game State: %1$s</string>
     <string name="header_gamestateN" tools:ignore="PluralsCandidate">Game %1$d State: %2$s</string>
     <string name="header_egg">DO NOT TAP ON GLASS</string>