Tweak AboutActivity

Notably, include Server URI over here since we're about to drop it from
the main Activity

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 070cb09d42e8a340929762f2baceeff73c3ac285..56764d6b73a6bb47acdecacfba5f18d75a81a983 100644 (file)
--- 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 45cfe86a7fa67d93745ea0c0e1a0e736b9e9760e..2c1e2bed87d9e90e3f112189c2a4475581968d6c 100644 (file)
--- 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 3df64dd1fab11abbe20fd978c231feb90306bbd4..422c647e57c8948d1ca1766fcf2a2dfe8a774c0e 100644 (file)
--- 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 18339912fa058653e7ae1fd5599abff8a99a53ed..05833a37d1c3f3d6407247e8cb287f4f89a31001 100644 (file)
--- 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>