From b962b18dffc7c57d02982501a3dd999001afde5c Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Mon, 6 Nov 2023 17:11:59 -0800
Subject: [PATCH] include devid in ack payload

So server can choose to unretain.
---
 .../src/main/java/org/eehouse/android/xw4/MQTTUtils.java    | 6 +++---
 xwords4/android/app/src/main/res/values/strings.xml         | 4 ++++
 xwords4/android/app/src/main/res/values/tmpstrings.xml      | 5 -----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
index 2c0d88244..f2e64b2d1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MQTTUtils.java
@@ -618,10 +618,10 @@ public class MQTTUtils extends Thread
         String sum = Utils.getMD5SumFor( payload );
         JSONObject params = new JSONObject();
         try {
-            params.put( "sum", sum );
+            String devid = XwJNI.dvc_getMQTTDevID();
+            params.put( "devid", devid );
             params.put( "gid", gameID );
-            // params.put( "from", senderDevID );
-            // params.put( "to", XwJNI.dvc_getMQTTDevID( null ) );
+            params.put( "sum", sum );
 
             HttpsURLConnection conn
                 = NetUtils.makeHttpsMQTTConn( context, "ack" );
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 8459d8582..d4ebd5766 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1596,6 +1596,10 @@
     <string name="summary_wait_guest">Unconnected</string>
     <!--  -->
     <string name="summary_gameover">Game over\u200C</string>
+    <!-- Shown in games list game summary when a remote device has been
+         deleted and so no play is possible (but the game didn't
+         necessarily end). -->
+    <string name="summary_game_gone">Remote game deleted</string>
     <!--  -->
     <string name="summary_conn">Game in play</string>
     <!--  -->
diff --git a/xwords4/android/app/src/main/res/values/tmpstrings.xml b/xwords4/android/app/src/main/res/values/tmpstrings.xml
index b78c17de2..8f5432a97 100644
--- a/xwords4/android/app/src/main/res/values/tmpstrings.xml
+++ b/xwords4/android/app/src/main/res/values/tmpstrings.xml
@@ -5,9 +5,4 @@
 
   <string name="dup_allscores_fmt">All scores: %1$s</string>
 
-  <!-- Shown in games list game summary when a remote device has been
-       deleted and so no play is possible (but the game didn't
-       necessarily end). -->
-  <string name="summary_game_gone">Deleted by opponent</string>
-
 </resources>