From 382658b4c2057bd9d63ddcc892e0308be5c6e06b Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Mon, 28 Feb 2022 20:08:31 +0000
Subject: [PATCH] Tweak AboutActivity

Notably, include Server URI over here since we're about to drop it from
the main Activity
---
 .../ctfwstimer/lib/CtFwSGameStateManager.java       |  2 +-
 .../ctfwstimer/activity/AboutActivity.java          | 13 +++++++++----
 mobile/src/main/res/layout-land/activity_about.xml  |  3 ++-
 mobile/src/main/res/layout/activity_about.xml       |  3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
index 070cb09..56764d6 100644
--- a/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
+++ b/lib/src/main/java/com/acmetensortoys/ctfwstimer/lib/CtFwSGameStateManager.java
@@ -96,7 +96,7 @@ public class CtFwSGameStateManager {
             notifyConfigEtAl();
         }
     }
-    public String getLastConfigMessage() { return lastConfigMessage; }
+    public String debugGetLastConfigMessage() { return lastConfigMessage; }
     public synchronized String toMqttConfigMessage() {
         if (!curstate.configured) {
             return "none";
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
index 45cfe86..2c1e2be 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/activity/AboutActivity.java
@@ -68,12 +68,17 @@ public class AboutActivity extends CtFwSActivityBase {
         }
 
         if (mSrvBinder != null) {
-            CtFwSGameStateManager cgs = mSrvBinder.getGameState();
+            sb.append("\nServer URI: ");
+            sb.append(mSrvBinder.debugGetServerURL());
+            sb.append("\n");
 
-            sb.append("\nLast game configuration:\n  raw:       ");
-            sb.append(cgs.getLastConfigMessage());
-            sb.append("\n  parsed: ");
+            CtFwSGameStateManager cgs = mSrvBinder.getGameState();
+            sb.append("\nGame:\n  cfg msg: ");
+            sb.append(cgs.debugGetLastConfigMessage());
+            sb.append("\n  cfg dec: ");
             sb.append(cgs.toMqttConfigMessage());
+            sb.append("\n  flags dec: ");
+            sb.append(cgs.toMqttFlagsMessage());
             sb.append("\n");
         } else {
             sb.append("Null service binder\n");
diff --git a/mobile/src/main/res/layout-land/activity_about.xml b/mobile/src/main/res/layout-land/activity_about.xml
index 3df64dd..422c647 100644
--- a/mobile/src/main/res/layout-land/activity_about.xml
+++ b/mobile/src/main/res/layout-land/activity_about.xml
@@ -76,7 +76,8 @@
                     <TextView
                         android:id="@+id/about_debug_tv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
+                        android:layout_height="match_parent"
+                        android:textIsSelectable="true" />
 
                 </LinearLayout>
 
diff --git a/mobile/src/main/res/layout/activity_about.xml b/mobile/src/main/res/layout/activity_about.xml
index 1833991..05833a3 100644
--- a/mobile/src/main/res/layout/activity_about.xml
+++ b/mobile/src/main/res/layout/activity_about.xml
@@ -76,7 +76,8 @@
                     <TextView
                         android:id="@+id/about_debug_tv"
                         android:layout_width="match_parent"
-                        android:layout_height="match_parent"/>
+                        android:layout_height="match_parent"
+                        android:textIsSelectable="true" />
 
                 </LinearLayout>
 
-- 
2.50.1