Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-09 05:24:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

include mqtt devid in email-author info

Browse source
This commit is contained in:
Eric House 2020-09-04 20:36:47 -07:00
parent 1e941acd2c
commit 5a05ab2e56
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
xwords4/android/app/src/main/java/org/eehouse/android/xw4/Utils.java
View file

@ -75,6 +75,7 @@ import java.util.Random;
import org.eehouse.android.xw4.Perms23.Perm; import org.eehouse.android.xw4.Perms23.Perm;
import org.eehouse.android.xw4.jni.CommonPrefs; import org.eehouse.android.xw4.jni.CommonPrefs;
import org.eehouse.android.xw4.jni.XwJNI;
import org.eehouse.android.xw4.loc.LocUtils; import org.eehouse.android.xw4.loc.LocUtils;
public class Utils { public class Utils {
@ -199,9 +200,10 @@ public class Utils {
String[] addrs = { LocUtils.getString( context, String[] addrs = { LocUtils.getString( context,
R.string.email_author_email ) }; R.string.email_author_email ) };
intent.putExtra( Intent.EXTRA_EMAIL, addrs ); intent.putExtra( Intent.EXTRA_EMAIL, addrs );
String devID = XwJNI.dvc_getMQTTDevID( null );
String body = LocUtils.getString( context, R.string.email_body_rev_fmt, String body = LocUtils.getString( context, R.string.email_body_rev_fmt,
BuildConfig.GIT_REV, Build.MODEL, BuildConfig.GIT_REV, Build.MODEL,
Build.VERSION.RELEASE ); Build.VERSION.RELEASE, devID );
if ( null != msg ) { if ( null != msg ) {
body += "\n\n" + msg; body += "\n\n" + msg;
} }

4
xwords4/android/app/src/main/res/values/strings.xml
View file

@ -1624,8 +1624,8 @@
<string name="email_author_chooser">Send comment via</string> <string name="email_author_chooser">Send comment via</string>
<!-- Default text for email body generated by "email author" menuitem --> <!-- Default text for email body generated by "email author" menuitem -->
<string name="email_body_rev_fmt">(If relevant, please include the <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 (“%1$s”) of CrossDbg, the make/model (“%2$s”) and OS
version (%3$s) of your phone or tablet.)</string> version (%3$s) of your phone or tablet, and your devID (%4$s).)</string>
<!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> --> <!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
<!-- In invitation dialogs, button to remove checked items --> <!-- In invitation dialogs, button to remove checked items -->
<string name="bt_pick_clear_button">Remove</string> <string name="bt_pick_clear_button">Remove</string>