From 0957b968fcd922a42a0be7d264d93d3793be9e88 Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sun, 6 Oct 2019 22:38:00 +0100
Subject: [PATCH] Revise notification text

---
 .../ctfwstimer/service/MainServiceNotification.java      | 9 ++++++---
 mobile/src/main/res/values/strings.xml                   | 3 ++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
index 46d2e35..6bf2e18 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/service/MainServiceNotification.java
@@ -86,16 +86,19 @@ class MainServiceNotification {
                     Resources rs = mService.getResources();
 
                     if (now.rationale == CtFwSGameStateManager.NowRationale.NR_GAME_IN_PROGRESS) {
-                        userNoteBuilder.setSubText(rs.getString(R.string.notify_game_afoot));
-                        String ct;
+                        String ct, st;
                         if (now.round == 0) {
-                            ct = rs.getString(R.string.notify_game_setup);
+                            st = rs.getString(R.string.notify_game_setup);
+                            ct = rs.getString(R.string.notify_game_start_soon);
                         } else if (now.round == game.getRounds()) {
+                            st = rs.getString(R.string.notify_game_afoot);
                             ct = rs.getString(R.string.notify_game_end_soon);
                         } else {
+                            st = rs.getString(R.string.notify_game_afoot);
                             ct = String.format(rs.getString(R.string.notify_jailbreak),
                                     now.round, game.getRounds() - 1);
                         }
+                        userNoteBuilder.setSubText(st);
                         userNoteBuilder.setContentTitle(ct);
                     } else {
                         userNoteBuilder.setSubText(rs.getString(R.string.notify_start_future));
diff --git a/mobile/src/main/res/values/strings.xml b/mobile/src/main/res/values/strings.xml
index 266fa62..e5c492b 100644
--- a/mobile/src/main/res/values/strings.xml
+++ b/mobile/src/main/res/values/strings.xml
@@ -39,7 +39,8 @@
     <string name="header_messages">Messages:</string>
 
     <string name="notify_game_afoot">The game\'s afoot!</string>
-    <string name="notify_game_end_soon">Game ending soon</string>
+    <string name="notify_game_start_soon">Awaiting start of game&#8230;</string>
+    <string name="notify_game_end_soon">No more jailbreaks!</string>
     <string name="notify_game_setup">Setup phase</string>
     <string name="notify_start_future">Start time in the future!</string>
     <string name="notify_game_over">Game over!</string>
-- 
2.50.1