From 5a05ab2e5638ac1c9975d9e7d9d1138d96ee0632 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 4 Sep 2020 20:36:47 -0700
Subject: [PATCH] include mqtt devid in email-author info

---
 .../app/src/main/java/org/eehouse/android/xw4/Utils.java      | 4 +++-
 xwords4/android/app/src/main/res/values/strings.xml           | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
index fc09f9d99..608637d46 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
@@ -75,6 +75,7 @@ import java.util.Random;
 
 import org.eehouse.android.xw4.Perms23.Perm;
 import org.eehouse.android.xw4.jni.CommonPrefs;
+import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
 public class Utils {
@@ -199,9 +200,10 @@ public class Utils {
         String[] addrs = { LocUtils.getString( context,
                                                R.string.email_author_email ) };
         intent.putExtra( Intent.EXTRA_EMAIL, addrs );
+        String devID = XwJNI.dvc_getMQTTDevID( null );
         String body = LocUtils.getString( context, R.string.email_body_rev_fmt,
                                           BuildConfig.GIT_REV, Build.MODEL,
-                                          Build.VERSION.RELEASE );
+                                          Build.VERSION.RELEASE, devID );
         if ( null != msg ) {
             body += "\n\n" + msg;
         }
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 693ab67e8..37c80aed9 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1624,8 +1624,8 @@
     <string name="email_author_chooser">Send comment via</string>
     <!-- Default text for email body generated by "email author" menuitem -->
     <string name="email_body_rev_fmt">(If relevant, please include the
-    version (“%1$s”) of CrossWords and the make/model (“%2$s”) and OS
-    version (%3$s) of your phone or tablet.)</string>
+    version (“%1$s”) of CrossDbg, the make/model (“%2$s”) and OS
+    version (%3$s) of your phone or tablet, and your devID (%4$s).)</string>
     <!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
     <!-- In invitation dialogs, button to remove checked items -->
     <string name="bt_pick_clear_button">Remove</string>