From 36adf7f86c9268c18e9180d142da55f04fb4e1e2 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 31 Jul 2015 07:12:27 -0700
Subject: [PATCH 01/17] get rid of About menuitem in board -- in main view is
 enough

---
 xwords4/android/XWords4/res/menu-small/board_menu.xml        | 5 -----
 xwords4/android/XWords4/res/menu/board_menu.xml              | 4 ----
 .../XWords4/src/org/eehouse/android/xw4/BoardDelegate.java   | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/xwords4/android/XWords4/res/menu-small/board_menu.xml b/xwords4/android/XWords4/res/menu-small/board_menu.xml
index fe5c90f2f..f933fe7b9 100644
--- a/xwords4/android/XWords4/res/menu-small/board_menu.xml
+++ b/xwords4/android/XWords4/res/menu-small/board_menu.xml
@@ -93,11 +93,6 @@
           android:title="@string/menu_prefs"
           android:alphabeticShortcut="P"
           />
-    <item android:id="@+id/board_menu_file_about"
-          android:title="@string/board_menu_file_about"
-          android:alphabeticShortcut="A"
-          />
-
     <item android:id="@+id/board_menu_game_netstats"
           android:title="@string/board_menu_game_netstats" />
 
diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/XWords4/res/menu/board_menu.xml
index dfec84b14..65cffc8d2 100644
--- a/xwords4/android/XWords4/res/menu/board_menu.xml
+++ b/xwords4/android/XWords4/res/menu/board_menu.xml
@@ -65,10 +65,6 @@
           android:title="@string/menu_prefs"
           android:alphabeticShortcut="P"
           />
-    <item android:id="@+id/board_menu_file_about"
-          android:title="@string/board_menu_file_about"
-          android:alphabeticShortcut="A"
-          />
 
     <item android:id="@+id/board_menu_game_netstats"
           android:title="@string/board_menu_game_netstats" />
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index d11b650d8..db6f32c9e 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -920,10 +920,6 @@ public class BoardDelegate extends DelegateBase
             Utils.launchSettings( m_activity );
             break;
 
-        case R.id.board_menu_file_about:
-            showAboutDialog();
-            break;
-
         default:
             DbgUtils.logf( "menuitem %d not handled", id );
             handled = false;

From 81834bcbfab89230858f13890c3f8ce68b1d1a66 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 31 Jul 2015 07:10:19 -0700
Subject: [PATCH 02/17] provide app name in variant too to fix empty
 substitution errors (e.g. About menutem)

---
 xwords4/android/XWords4-dbg/build.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwords4/android/XWords4-dbg/build.xml b/xwords4/android/XWords4-dbg/build.xml
index dd73d82c4..76facd222 100644
--- a/xwords4/android/XWords4-dbg/build.xml
+++ b/xwords4/android/XWords4-dbg/build.xml
@@ -54,6 +54,8 @@
 
     <property name="INITIAL_CLIENT_VERS" value="4"/>
     <property name="VARIANT_NAME" value="xw4dbg"/>
+    <property name="APP_NAME" value="CrossDbg"/>
+
     <target name="-pre-clean">
         <antcall target="my-pre-clean" />
     </target>

From b56924b030e2892c92a264c74b32b3214485edfd Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 16:29:53 -0700
Subject: [PATCH 03/17] fix off-by-one error that probably had me slowly
 leaking local obj references for the last few years.

---
 xwords4/android/XWords4/jni/andutils.c | 4 ++--
 xwords4/android/XWords4/jni/andutils.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/jni/andutils.c b/xwords4/android/XWords4/jni/andutils.c
index ec2c9cbe6..25ac4b227 100644
--- a/xwords4/android/XWords4/jni/andutils.c
+++ b/xwords4/android/XWords4/jni/andutils.c
@@ -659,10 +659,10 @@ void deleteLocalRef( JNIEnv* env, jobject jobj )
 }
 
 void
-deleteLocalRefs( JNIEnv* env, jobject jobj, ... )
+deleteLocalRefs( JNIEnv* env, ... )
 {
     va_list ap;
-    va_start( ap, jobj );
+    va_start( ap, env );
     for ( ; ; ) {
         jobject jnext = va_arg( ap, jobject );
         if ( DELETE_NO_REF == jnext ) {
diff --git a/xwords4/android/XWords4/jni/andutils.h b/xwords4/android/XWords4/jni/andutils.h
index 214c41022..f66af6a89 100644
--- a/xwords4/android/XWords4/jni/andutils.h
+++ b/xwords4/android/XWords4/jni/andutils.h
@@ -97,6 +97,6 @@ jint jEnumToInt( JNIEnv* env, jobject jenum );
 XP_U32 getCurSeconds( JNIEnv* env );
 
 void deleteLocalRef( JNIEnv* env, jobject jobj );
-void deleteLocalRefs( JNIEnv* env, jobject jobj, ... );
+void deleteLocalRefs( JNIEnv* env, ... );
 # define DELETE_NO_REF ((jobject)-1)    /* terminates above varargs list */
 #endif

From b500a4646d97b272cbc0d3b676befb0e721b770a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 29 Jul 2015 19:48:56 -0700
Subject: [PATCH 04/17] use different uuid for dbg variant so it's not
 cross-sending BT messages with other variants, causing among other problems
 spurious "deleted on other device" warnings.

---
 xwords4/android/XWords4/jni/Android.mk     |  1 +
 xwords4/android/XWords4/jni/xwjni.c        | 10 ++++++++--
 xwords4/android/scripts/common_targets.xml |  1 +
 xwords4/common/comms.h                     |  1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/XWords4/jni/Android.mk b/xwords4/android/XWords4/jni/Android.mk
index 9f02d5721..b0c291a38 100644
--- a/xwords4/android/XWords4/jni/Android.mk
+++ b/xwords4/android/XWords4/jni/Android.mk
@@ -41,6 +41,7 @@ LOCAL_DEFINES += \
 	-DCOMMON_LAYOUT \
 	-DCOMMS_VERSION=1 \
 	-DINITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS} \
+	-DVARIANT=\"${VARIANT}\" \
 	-DRELAY_ROOM_DEFAULT=\"\" \
 	-D__LITTLE_ENDIAN \
 
diff --git a/xwords4/android/XWords4/jni/xwjni.c b/xwords4/android/XWords4/jni/xwjni.c
index 29ae3ea43..5248bd815 100644
--- a/xwords4/android/XWords4/jni/xwjni.c
+++ b/xwords4/android/XWords4/jni/xwjni.c
@@ -471,8 +471,14 @@ Java_org_eehouse_android_xw4_jni_XwJNI_comms_1getUUID
 {
     jstring jstr = NULL;
 #ifdef XWFEATURE_BLUETOOTH
-    const char* uuid = XW_BT_UUID;
-    XP_LOGF( "uuid: %s", uuid );
+    const char* uuid;
+    if ( 0 == XP_STRCMP( VARIANT, "xw4" ) ) {
+        uuid = XW_BT_UUID;
+    } else if ( 0 == XP_STRCMP( VARIANT, "xw4dbg" ) ) {
+        uuid = XW_BT_UUID_DBG;
+    } else {
+        XP_ASSERT(0);
+    }
     jstr = (*env)->NewStringUTF( env, uuid );
 #endif
     return jstr;
diff --git a/xwords4/android/scripts/common_targets.xml b/xwords4/android/scripts/common_targets.xml
index ef91f60e6..83a1c640b 100644
--- a/xwords4/android/scripts/common_targets.xml
+++ b/xwords4/android/scripts/common_targets.xml
@@ -35,6 +35,7 @@
             <arg value="INITIAL_CLIENT_VERS=${INITIAL_CLIENT_VERS}" />
             <arg value="CHAT_ENABLED=${CHAT_ENABLED}" />
             <arg value="THUMBNAIL_ENABLED=${THUMBNAIL_ENABLED}" />
+            <arg value="VARIANT=${VARIANT_NAME}" />
         </exec>
 
         <exec dir="." executable="../scripts/mkimages.sh" 
diff --git a/xwords4/common/comms.h b/xwords4/common/comms.h
index b6615294f..dcd95cdf2 100644
--- a/xwords4/common/comms.h
+++ b/xwords4/common/comms.h
@@ -59,6 +59,7 @@ typedef enum {
 
 #ifdef XWFEATURE_BLUETOOTH
 # define XW_BT_UUID "7be0d084-ff89-4d6d-9c78-594773a6f963"
+# define XW_BT_UUID_DBG "b079b640-35fe-11e5-a432-0002a5d5c51b"
 
 # define XW_BT_NAME "Crosswords"
 #endif

From 1959ff3b2d2281c146425cd47d0f12d7dd3a10e4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 1 Aug 2015 22:17:13 -0700
Subject: [PATCH 05/17] fix NPE reported by crittercism

---
 .../XWords4/src/org/eehouse/android/xw4/BoardDelegate.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
index db6f32c9e..4d3dd8de2 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
@@ -2119,7 +2119,8 @@ public class BoardDelegate extends DelegateBase
 
     private void pingBTRemotes()
     {
-        if ( m_connTypes.contains( CommsConnType.COMMS_CONN_BT ) ) {
+        if ( null != m_connTypes
+             && m_connTypes.contains( CommsConnType.COMMS_CONN_BT ) ) {
             CommsAddrRec[] addrs = XwJNI.comms_getAddrs( m_jniGamePtr );
             for ( CommsAddrRec addr : addrs ) {
                 if ( addr.contains( CommsConnType.COMMS_CONN_BT ) ) {

From 6871ef24a6a6c65aa6bf8453dd516832f395703f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 1 Aug 2015 22:39:00 -0700
Subject: [PATCH 06/17] move several strings, including app name, NBS port, and
 url prefix, into generated .xml file so Dbg and regular variants can co-exist
 better

Conflicts:
	xwords4/android/XWords4/archive/R.java
---
 .../android/XWords4-dbg/res/values/.gitignore |  3 ++-
 xwords4/android/XWords4/res/values/.gitignore |  2 +-
 .../XWords4/res/values/common_rsrc.xml        |  3 ---
 xwords4/android/scripts/genvers.sh            | 24 +++++++++++++++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4-dbg/res/values/.gitignore b/xwords4/android/XWords4-dbg/res/values/.gitignore
index 72e6f3e45..3347fc597 100644
--- a/xwords4/android/XWords4-dbg/res/values/.gitignore
+++ b/xwords4/android/XWords4-dbg/res/values/.gitignore
@@ -1,4 +1,5 @@
-git_string.xml
 strings.xml
 styles.xml
 common_rsrc.xml
+gen_strings.xml
+app_name.xml
diff --git a/xwords4/android/XWords4/res/values/.gitignore b/xwords4/android/XWords4/res/values/.gitignore
index 02baea630..a8f81aa73 100644
--- a/xwords4/android/XWords4/res/values/.gitignore
+++ b/xwords4/android/XWords4/res/values/.gitignore
@@ -1 +1 @@
-/git_string.xml
+/gen_strings.xml
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index 47b6085b8..ead3423ee 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -139,15 +139,12 @@
   <string name="default_host">eehouse.org</string>
   <string name="xwords_nfc_mime">application/org.eehouse.android.xw4</string>
   <string name="invite_host">eehouse.org</string>
-  <string name="invite_prefix">/and/</string>
   <string name="invite_mime">application/x-xwordsinvite</string>
   <!--string name="invite_mime">text/plain</string-->
 
   <string name="dict_url">http://eehouse.org/and_wordlists</string>
   <string name="default_update_url">http://eehouse.org/xw4/info.py</string>
 
-  <string name="nbs_port">3344</string>
-
   <!--string name="dict_url">http://10.0.2.2/~eehouse/and_dicts</string-->
 
   <string-array name="board_sizes">
diff --git a/xwords4/android/scripts/genvers.sh b/xwords4/android/scripts/genvers.sh
index 7f77f5b71..0a828d42e 100755
--- a/xwords4/android/scripts/genvers.sh
+++ b/xwords4/android/scripts/genvers.sh
@@ -22,6 +22,23 @@ cd ../
 
 GITVERSION=$(../scripts/gitversion.sh)
 
+case $VARIANT in
+	xw4)
+		APPNAME=Crosswords
+		SMSPORT=3344
+		INVITE_PREFIX=/and/
+		;;
+	xw4dbg)
+		APPNAME=CrossDbg
+		SMSPORT=3345
+		INVITE_PREFIX=/anddbg/
+		;;
+	*)
+		usage
+		;;
+esac
+
+
 # Need to verify that R.java is unmodified; otherwise we can't set
 # this constant!!!  Shouldn't be a problem with release builds,
 # though.
@@ -31,12 +48,15 @@ fi
 # TODO: deal with case where there's no hash available -- exported
 # code maybe?  Better: gitversion.sh does that.
 
-cat <<EOF > ${BUILD_DIR}/res/values/git_string.xml
+cat <<EOF > ${BUILD_DIR}/res/values/gen_strings.xml
 <?xml version="1.0" encoding="utf-8"?>
-<!-- auto-generated; do not edit -->
+<!-- auto-generated (by $(basename $0)); do not edit -->
 
 <resources>
+    <string name="app_name">$APPNAME</string>  
     <string name="git_rev">$GITVERSION</string>
+    <string name="nbs_port">$SMSPORT</string>
+    <string name="invite_prefix">$INVITE_PREFIX</string>
 </resources>
 EOF
 

From a5f332dd1d814d1b833b0afad18994f3d4895e30 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 10:29:17 -0700
Subject: [PATCH 07/17] different logging TAG for different variants

---
 .../android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java  | 2 +-
 xwords4/android/scripts/genvers.sh                             | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
index 971abf66a..c7c24a3dc 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
@@ -43,7 +43,7 @@ import junit.framework.Assert;
 import org.eehouse.android.xw4.loc.LocUtils;
 
 public class DbgUtils {
-    private static final String TAG = "XW4";
+    private static final String TAG = BuildConstants.DBG_TAG;
     private static boolean s_doLog = BuildConfig.DEBUG;
 
     private static Time s_time = new Time();
diff --git a/xwords4/android/scripts/genvers.sh b/xwords4/android/scripts/genvers.sh
index 0a828d42e..6a7ab7cb5 100755
--- a/xwords4/android/scripts/genvers.sh
+++ b/xwords4/android/scripts/genvers.sh
@@ -27,11 +27,13 @@ case $VARIANT in
 		APPNAME=Crosswords
 		SMSPORT=3344
 		INVITE_PREFIX=/and/
+		DBG_TAG=XW4
 		;;
 	xw4dbg)
 		APPNAME=CrossDbg
 		SMSPORT=3345
 		INVITE_PREFIX=/anddbg/
+		DBG_TAG=X4BG
 		;;
 	*)
 		usage
@@ -75,6 +77,7 @@ class BuildConstants {
     public static final boolean CHAT_SUPPORTED = $CHAT_SUPPORTED;
     public static final boolean THUMBNAIL_SUPPORTED = $THUMBNAIL_SUPPORTED;
     public static final long BUILD_STAMP = $(date +'%s');
+    public static final String DBG_TAG = "$DBG_TAG";
 }
 EOF
 

From 1e7f51a88d1cd2a41c36297529a86733ad74dd75 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 14:14:19 -0700
Subject: [PATCH 08/17] move last-pressed button to bottom of screen where it's
 natural to look for it

---
 xwords4/android/XWords4/res/layout/smsinviter.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/XWords4/res/layout/smsinviter.xml b/xwords4/android/XWords4/res/layout/smsinviter.xml
index bc8255fb7..7487a14e3 100644
--- a/xwords4/android/XWords4/res/layout/smsinviter.xml
+++ b/xwords4/android/XWords4/res/layout/smsinviter.xml
@@ -28,13 +28,6 @@
             android:padding="20dp"
             />
 
-  <Button android:id="@+id/button_invite"
-          android:text="@string/button_invite"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="10dip"
-          />
-
   <LinearLayout android:orientation="horizontal"
                 android:layout_width="fill_parent" 
                 android:layout_height="wrap_content"
@@ -55,4 +48,11 @@
               />
   </LinearLayout>
 
+  <Button android:id="@+id/button_invite"
+          android:text="@string/button_invite"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="10dip"
+          />
+
 </LinearLayout>

From c83d3368ada12b1edb21b83be2692d7845e69892 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 14:15:14 -0700
Subject: [PATCH 09/17] allow using script for any project with an
 AndroidManifest.xml

---
 xwords4/android/scripts/find-and-ant.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/scripts/find-and-ant.sh b/xwords4/android/scripts/find-and-ant.sh
index 004c8ada1..c7a9f6de8 100755
--- a/xwords4/android/scripts/find-and-ant.sh
+++ b/xwords4/android/scripts/find-and-ant.sh
@@ -66,7 +66,7 @@ case $DIRNAME in
         PKG=xw4
         ;;
     *)
-        usage "running in unexpected directory $DIRNAME"
+        echo "running in unexpected directory $DIRNAME; hope that's ok"
         ;;
 esac
 

From 97bf616db145cab694b83dfc0822260271360534 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 14:35:05 -0700
Subject: [PATCH 10/17] Problem: NBS port is being ignored by dispatcher to
 broadcast receivers on receiving device, so variants are getting their own
 and all other NBS messages. Solution: change protocol to include port message
 is meant for so mis-delivered ones can be dropped.

---
 .../org/eehouse/android/xw4/SMSService.java   | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
index 406edc407..dfe0ea19f 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/SMSService.java
@@ -71,7 +71,9 @@ public class SMSService extends XWService {
     private static final String MSG_SENT = "MSG_SENT";
     private static final String MSG_DELIVERED = "MSG_DELIVERED";
 
-    private static final int SMS_PROTO_VERSION = 0;
+    private static final int SMS_PROTO_VERSION_ORIG = 0;
+    private static final int SMS_PROTO_VERSION_WITHPORT = 1;
+    private static final int SMS_PROTO_VERSION = SMS_PROTO_VERSION_WITHPORT;
     private static final int MAX_LEN_TEXT = 100;
     private static final int MAX_LEN_BINARY = 100;
     private static final int MAX_MSG_COUNT = 16; // 1.6K enough? Should be....
@@ -449,6 +451,7 @@ public class SMSService extends XWService {
         ByteArrayOutputStream bas = new ByteArrayOutputStream( 128 );
         DataOutputStream das = new DataOutputStream( bas );
         das.writeByte( SMS_PROTO_VERSION );
+        das.writeShort( getNBSPort() );
         das.writeByte( cmd.ordinal() );
         das.write( bytes, 0, bytes.length );
         das.flush();
@@ -568,7 +571,7 @@ public class SMSService extends XWService {
     {
         boolean success = true;
         if ( index == 0 && count == 1 ) { // most common case
-            disAssemble( senderPhone, msg );
+            success = disAssemble( senderPhone, msg );
         } else if ( count > 0 && count < MAX_MSG_COUNT && index < count ) {
             // required?  Should always be in main thread.
             synchronized( s_partialMsgs ) { 
@@ -585,7 +588,7 @@ public class SMSService extends XWService {
                 }
 
                 if ( store.add( index, msg ).isComplete() ) {
-                    disAssemble( senderPhone, store.messageData() );
+                    success = disAssemble( senderPhone, store.messageData() );
                     perPhone.remove( id );
                 }
             }
@@ -595,21 +598,33 @@ public class SMSService extends XWService {
         return success;
     }
 
-    private void disAssemble( String senderPhone, byte[] fullMsg )
+    private boolean disAssemble( String senderPhone, byte[] fullMsg )
     {
+        boolean success = false;
         DataInputStream dis = 
             new DataInputStream( new ByteArrayInputStream(fullMsg) );
         try {
             byte proto = dis.readByte();
-            if ( SMS_PROTO_VERSION != proto ) {
+            short myPort = getNBSPort();
+            short sentPort;
+            if ( SMS_PROTO_VERSION_WITHPORT > proto ) {
+                sentPort = myPort;
+            } else {
+                sentPort = dis.readShort();
+            }
+            if ( SMS_PROTO_VERSION < proto ) {
                 DbgUtils.logf( "SMSService.disAssemble: bad proto %d from %s;"
                                + " dropping", proto, senderPhone );
                 sendResult( MultiEvent.BAD_PROTO_SMS, senderPhone );
+            } else if ( sentPort != myPort ) {
+                DbgUtils.logdf( "SMSService.disAssemble(): received on port %d"
+                                + " but expected %d", sentPort, myPort );
             } else {
                 SMS_CMD cmd = SMS_CMD.values()[dis.readByte()];
                 byte[] rest = new byte[dis.available()];
                 dis.read( rest );
                 receive( cmd, rest, senderPhone );
+                success = true;
             }
         } catch ( java.io.IOException ioe ) {
             DbgUtils.loge( ioe );
@@ -617,6 +632,7 @@ public class SMSService extends XWService {
             // enum this older code doesn't know about; drop it
             DbgUtils.logf( "disAssemble: dropping message with too-new enum" );
         }
+        return success;
     }
 
     private void postNotification( String phone, int gameID, long rowid )
@@ -673,7 +689,7 @@ public class SMSService extends XWService {
             }
 
             if ( !success ) {
-                short nbsPort = (short)Integer.parseInt( getString( R.string.nbs_port ) );
+                short nbsPort = getNBSPort();
                 try {
                     SmsManager mgr = SmsManager.getDefault();
                     PendingIntent sent = makeStatusIntent( MSG_SENT );
@@ -782,6 +798,16 @@ public class SMSService extends XWService {
         return result;
     }
 
+    private static Short s_nbsPort = null;
+    private short getNBSPort()
+    {
+        if ( null == s_nbsPort ) {
+            String asStr = getString( R.string.nbs_port );
+            s_nbsPort = new Short((short)Integer.parseInt( asStr ) );
+        }
+        return s_nbsPort;
+    }
+
     private class SMSMsgSink extends MultiMsgSink {
         public SMSMsgSink( Context context ) {
             super( context );

From a612a89ac6728fbfbffcc4ab735497f9c4786a35 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 2 Aug 2015 16:15:32 -0700
Subject: [PATCH 11/17] fix variant crashes: had forgotten PKG_PATH on new
 method

---
 xwords4/android/XWords4/jni/utilwrapper.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/XWords4/jni/utilwrapper.c b/xwords4/android/XWords4/jni/utilwrapper.c
index ed100cf5e..d9f6cd1c3 100644
--- a/xwords4/android/XWords4/jni/utilwrapper.c
+++ b/xwords4/android/XWords4/jni/utilwrapper.c
@@ -643,11 +643,11 @@ static void
 and_util_deviceRegistered( XW_UtilCtxt* uc, DevIDType typ, 
                            const XP_UCHAR* idRelay )
 {
-    UTIL_CBK_HEADER( "deviceRegistered", "(Lorg/eehouse/android/xw4/"
-                     "jni/UtilCtxt$DevIDType;Ljava/lang/String;)V" );
+    UTIL_CBK_HEADER( "deviceRegistered", 
+                     "(L" PKG_PATH("jni/UtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
     jstring jstr = (*env)->NewStringUTF( env, idRelay );
     jobject jtyp = intToJEnum( env, typ, 
-                               "org/eehouse/android/xw4/jni/UtilCtxt$DevIDType" );
+                               PKG_PATH("jni/UtilCtxt$DevIDType") );
     (*env)->CallVoidMethod( env, util->jutil, mid, jtyp, jstr );
     deleteLocalRefs( env, jstr, jtyp, DELETE_NO_REF );
     UTIL_CBK_TAIL();

From cfa101350a6e357d3ee8126035c688222e12b8dc Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 11 Jul 2015 10:52:00 -0700
Subject: [PATCH 12/17] add logdf, logging for DEBUG builds only

---
 .../XWords4/src/org/eehouse/android/xw4/DbgUtils.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
index c7c24a3dc..c36156fc4 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DbgUtils.java
@@ -78,6 +78,14 @@ public class DbgUtils {
         }
     } // logf
 
+    public static void logdf( String format, Object... args )
+    {
+        if ( s_doLog && BuildConfig.DEBUG ) {
+            Formatter formatter = new Formatter();
+            logf( formatter.format( format, args ).toString() );
+        }
+    } // logdf
+
     public static void showf( Context context, String format, Object... args )
     {
         Formatter formatter = new Formatter();

From bcd620a4f9f81319ca00ec48801c5df52769fc2d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 3 Aug 2015 05:07:49 -0700
Subject: [PATCH 13/17] clean up to make cherry-picked changes work

---
 xwords4/android/XWords4/archive/R.java        | 364 +++++++++---------
 .../XWords4/res/values/common_rsrc.xml        |   2 -
 2 files changed, 183 insertions(+), 183 deletions(-)

diff --git a/xwords4/android/XWords4/archive/R.java b/xwords4/android/XWords4/archive/R.java
index 418c68b86..ec0d1b1f9 100644
--- a/xwords4/android/XWords4/archive/R.java
+++ b/xwords4/android/XWords4/archive/R.java
@@ -84,30 +84,29 @@ public final class R {
         public static final int add_player=0x7f0a0030;
         public static final int advertise_new_room_check=0x7f0a0037;
         public static final int blessed_label=0x7f0a0057;
-        public static final int board_menu_chat=0x7f0a009f;
-        public static final int board_menu_dict=0x7f0a009b;
+        public static final int board_menu_chat=0x7f0a009e;
+        public static final int board_menu_dict=0x7f0a009a;
         public static final int board_menu_done=0x7f0a0085;
-        public static final int board_menu_file_about=0x7f0a0093;
         public static final int board_menu_file_prefs=0x7f0a0092;
-        public static final int board_menu_flip=0x7f0a009d;
+        public static final int board_menu_flip=0x7f0a009c;
         public static final int board_menu_game_counts=0x7f0a008b;
         public static final int board_menu_game_history=0x7f0a008d;
         public static final int board_menu_game_left=0x7f0a008c;
-        public static final int board_menu_game_netstats=0x7f0a0094;
+        public static final int board_menu_game_netstats=0x7f0a0093;
         public static final int board_menu_game_resend=0x7f0a008f;
         public static final int board_menu_game_resign=0x7f0a008e;
-        public static final int board_menu_hint_next=0x7f0a0099;
-        public static final int board_menu_hint_prev=0x7f0a0098;
-        public static final int board_menu_invite=0x7f0a0095;
-        public static final int board_menu_juggle=0x7f0a009c;
-        public static final int board_menu_toggle=0x7f0a00a0;
+        public static final int board_menu_hint_next=0x7f0a0098;
+        public static final int board_menu_hint_prev=0x7f0a0097;
+        public static final int board_menu_invite=0x7f0a0094;
+        public static final int board_menu_juggle=0x7f0a009b;
+        public static final int board_menu_toggle=0x7f0a009f;
         public static final int board_menu_trade=0x7f0a0086;
         public static final int board_menu_trade_cancel=0x7f0a0087;
         public static final int board_menu_trade_commit=0x7f0a0088;
         public static final int board_menu_tray=0x7f0a008a;
-        public static final int board_menu_undo_current=0x7f0a009a;
+        public static final int board_menu_undo_current=0x7f0a0099;
         public static final int board_menu_undo_last=0x7f0a0089;
-        public static final int board_menu_zoom=0x7f0a009e;
+        public static final int board_menu_zoom=0x7f0a009d;
         public static final int board_root=0x7f0a0002;
         public static final int board_view=0x7f0a0003;
         public static final int boardsize_spinner=0x7f0a0043;
@@ -123,7 +122,7 @@ public final class R {
         public static final int chat_button=0x7f0a0080;
         public static final int chat_edit=0x7f0a0010;
         public static final int chat_history=0x7f0a000f;
-        public static final int chat_menu_clear=0x7f0a00a1;
+        public static final int chat_menu_clear=0x7f0a00a0;
         public static final int checkbox=0x7f0a0051;
         public static final int color_display_sample=0x7f0a0012;
         public static final int color_edit_sample=0x7f0a0013;
@@ -138,11 +137,11 @@ public final class R {
         public static final int dict_label=0x7f0a0069;
         public static final int dict_spinner=0x7f0a002d;
         public static final int dictlist_button=0x7f0a007f;
-        public static final int dicts_delete=0x7f0a00a4;
-        public static final int dicts_deselect_all=0x7f0a00a3;
-        public static final int dicts_download=0x7f0a00a2;
-        public static final int dicts_move=0x7f0a00a5;
-        public static final int dicts_select=0x7f0a00a6;
+        public static final int dicts_delete=0x7f0a00a3;
+        public static final int dicts_deselect_all=0x7f0a00a2;
+        public static final int dicts_download=0x7f0a00a1;
+        public static final int dicts_move=0x7f0a00a4;
+        public static final int dicts_select=0x7f0a00a5;
         public static final int divider=0x7f0a0024;
         public static final int download_button=0x7f0a0072;
         public static final int dwnld_message=0x7f0a004f;
@@ -161,35 +160,35 @@ public final class R {
         public static final int game_locked_check=0x7f0a0028;
         public static final int game_name=0x7f0a0046;
         public static final int gamel_menu_checkmoves=0x7f0a0091;
-        public static final int games_game_config=0x7f0a00b2;
-        public static final int games_game_copy=0x7f0a00b7;
-        public static final int games_game_delete=0x7f0a00b1;
-        public static final int games_game_move=0x7f0a00b3;
-        public static final int games_game_new_from=0x7f0a00b5;
-        public static final int games_game_rename=0x7f0a00b6;
-        public static final int games_game_reset=0x7f0a00b4;
-        public static final int games_group_default=0x7f0a00bb;
-        public static final int games_group_delete=0x7f0a00ba;
-        public static final int games_group_movedown=0x7f0a00b9;
-        public static final int games_group_moveup=0x7f0a00b8;
-        public static final int games_group_rename=0x7f0a00bc;
-        public static final int games_menu_about=0x7f0a00ae;
-        public static final int games_menu_checkmoves=0x7f0a00b0;
-        public static final int games_menu_checkupdates=0x7f0a00bd;
-        public static final int games_menu_dicts=0x7f0a00ac;
-        public static final int games_menu_email=0x7f0a00ad;
-        public static final int games_menu_loaddb=0x7f0a00bf;
-        public static final int games_menu_newgame_net=0x7f0a00a8;
-        public static final int games_menu_newgame_solo=0x7f0a00a7;
-        public static final int games_menu_newgroup=0x7f0a00a9;
-        public static final int games_menu_prefs=0x7f0a00aa;
-        public static final int games_menu_rateme=0x7f0a00ab;
-        public static final int games_menu_resend=0x7f0a00af;
-        public static final int games_menu_storedb=0x7f0a00be;
+        public static final int games_game_config=0x7f0a00b1;
+        public static final int games_game_copy=0x7f0a00b6;
+        public static final int games_game_delete=0x7f0a00b0;
+        public static final int games_game_move=0x7f0a00b2;
+        public static final int games_game_new_from=0x7f0a00b4;
+        public static final int games_game_rename=0x7f0a00b5;
+        public static final int games_game_reset=0x7f0a00b3;
+        public static final int games_group_default=0x7f0a00ba;
+        public static final int games_group_delete=0x7f0a00b9;
+        public static final int games_group_movedown=0x7f0a00b8;
+        public static final int games_group_moveup=0x7f0a00b7;
+        public static final int games_group_rename=0x7f0a00bb;
+        public static final int games_menu_about=0x7f0a00ad;
+        public static final int games_menu_checkmoves=0x7f0a00af;
+        public static final int games_menu_checkupdates=0x7f0a00bc;
+        public static final int games_menu_dicts=0x7f0a00ab;
+        public static final int games_menu_email=0x7f0a00ac;
+        public static final int games_menu_loaddb=0x7f0a00be;
+        public static final int games_menu_newgame_net=0x7f0a00a7;
+        public static final int games_menu_newgame_solo=0x7f0a00a6;
+        public static final int games_menu_newgroup=0x7f0a00a8;
+        public static final int games_menu_prefs=0x7f0a00a9;
+        public static final int games_menu_rateme=0x7f0a00aa;
+        public static final int games_menu_resend=0x7f0a00ae;
+        public static final int games_menu_storedb=0x7f0a00bd;
         public static final int games_menu_study=0x7f0a0090;
         public static final int group_done=0x7f0a0084;
-        public static final int group_exchange=0x7f0a0096;
-        public static final int group_hint=0x7f0a0097;
+        public static final int group_exchange=0x7f0a0095;
+        public static final int group_hint=0x7f0a0096;
         public static final int hideable=0x7f0a004b;
         public static final int hints_allowed=0x7f0a003c;
         public static final int invite_desc=0x7f0a0009;
@@ -201,10 +200,10 @@ public final class R {
         public static final int label=0x7f0a0025;
         public static final int lang_separator=0x7f0a002b;
         public static final int lang_spinner=0x7f0a002c;
-        public static final int loc_item_check=0x7f0a00c1;
-        public static final int loc_item_clear=0x7f0a00c0;
-        public static final int loc_item_copy_bless=0x7f0a00c3;
-        public static final int loc_item_copy_eng=0x7f0a00c2;
+        public static final int loc_item_check=0x7f0a00c0;
+        public static final int loc_item_clear=0x7f0a00bf;
+        public static final int loc_item_copy_bless=0x7f0a00c2;
+        public static final int loc_item_copy_eng=0x7f0a00c1;
         public static final int loc_search_button=0x7f0a005e;
         public static final int loc_search_field=0x7f0a005d;
         public static final int local_label=0x7f0a0059;
@@ -252,11 +251,11 @@ public final class R {
         public static final int send_button=0x7f0a0011;
         public static final int show_remote=0x7f0a001e;
         public static final int shuffle_button=0x7f0a007d;
-        public static final int slmenu_clear_sel=0x7f0a00c8;
-        public static final int slmenu_copy_sel=0x7f0a00c7;
-        public static final int slmenu_deselect_all=0x7f0a00c6;
-        public static final int slmenu_lookup_sel=0x7f0a00c4;
-        public static final int slmenu_select_all=0x7f0a00c5;
+        public static final int slmenu_clear_sel=0x7f0a00c7;
+        public static final int slmenu_copy_sel=0x7f0a00c6;
+        public static final int slmenu_deselect_all=0x7f0a00c5;
+        public static final int slmenu_lookup_sel=0x7f0a00c3;
+        public static final int slmenu_select_all=0x7f0a00c4;
         public static final int smart_robot=0x7f0a0040;
         public static final int state=0x7f0a004d;
         public static final int summary=0x7f0a0060;
@@ -458,9 +457,7 @@ public final class R {
         /**   
          */
         public static final int alert_empty_dict_fmt=0x7f0501d8;
-        /**  The name of the app.  Not localized! 
-         */
-        public static final int app_name=0x7f050001;
+        public static final int app_name=0x7f05007b;
         public static final int app_not_found_fmt=0x7f0502ad;
         public static final int app_version=0x7f050000;
         /**  the background color of the area outside the board,
@@ -706,6 +703,11 @@ public final class R {
     Any changes you make to it will be lost.
 
 
+    DO NOT EDIT THIS FILE!!!!
+    It was generated (from res_src/values-nl/strings.xml).
+    Any changes you make to it will be lost.
+
+
     DO NOT EDIT THIS FILE!!!!
     It was generated (from res_src/values-pt/strings.xml).
     Any changes you make to it will be lost.
@@ -981,7 +983,7 @@ public final class R {
         public static final int default_dict=0x7f05011f;
         /**  other 
          */
-        public static final int default_host=0x7f050076;
+        public static final int default_host=0x7f050075;
         /**  label within default wordlists in app preferences 
          */
         public static final int default_language=0x7f0502ae;
@@ -1013,7 +1015,7 @@ public final class R {
          new game 
          */
         public static final int default_robodict=0x7f050120;
-        public static final int default_update_url=0x7f05007c;
+        public static final int default_update_url=0x7f05007a;
         public static final int delete_dicts=0x7f050299;
         /**   
  <string name="sms_disabled">Playing via SMS is currently disabled. 
@@ -1036,7 +1038,7 @@ public final class R {
         public static final int dict_on_server=0x7f05029f;
         /** string name="invite_mime">text/plain</string
          */
-        public static final int dict_url=0x7f05007b;
+        public static final int dict_url=0x7f050079;
         /** 
        ############################################################
        # :Menus:
@@ -1091,7 +1093,7 @@ public final class R {
         public static final int email_author_chooser=0x7f0501df;
         /**  Nor is my email address 
          */
-        public static final int email_author_email=0x7f050075;
+        public static final int email_author_email=0x7f050074;
         /**   
          */
         public static final int email_author_subject=0x7f0501de;
@@ -1244,7 +1246,7 @@ public final class R {
          */
         public static final int get_sms_number=0x7f050200;
         public static final int getinfo=0x7f050298;
-        public static final int git_rev=0x7f05007e;
+        public static final int git_rev=0x7f05007c;
         public static final int git_rev_title=0x7f0502da;
         public static final int got_langdict_summary=0x7f0502f3;
         public static final int got_langdict_title=0x7f0502f2;
@@ -1355,7 +1357,7 @@ public final class R {
         public static final int invite_dict_missing_body_fmt=0x7f050239;
         public static final int invite_dict_missing_body_noname_fmt=0x7f05023a;
         public static final int invite_dict_missing_title=0x7f050238;
-        public static final int invite_host=0x7f050078;
+        public static final int invite_host=0x7f050077;
         /**  This is the body of the html version of the invitation. A URL
          is created with parameters describing the game and
          substituted for "%1$s".  (The funky \u003c and friends are
@@ -1366,7 +1368,7 @@ public final class R {
         /**  Appended to message above if local device has NFC available 
          */
         public static final int invite_if_nfc=0x7f0500e0;
-        public static final int invite_mime=0x7f05007a;
+        public static final int invite_mime=0x7f050078;
         public static final int invite_multi_summary=0x7f0502bb;
         public static final int invite_multi_title=0x7f0502ba;
         /**  Most users create games with only two players, which is the
@@ -1376,7 +1378,7 @@ public final class R {
          greater than one this text is appended to the above. 
          */
         public static final int invite_multiple=0x7f0500e1;
-        public static final int invite_prefix=0x7f050079;
+        public static final int invite_prefix=0x7f05007e;
         public static final int invite_progress_fmt=0x7f0501e4;
         /**   
          */
@@ -1416,131 +1418,131 @@ public final class R {
         /**  clarification of above 
          */
         public static final int keep_screenon_summary=0x7f050136;
-        public static final int key_addrs_pref=0x7f05003e;
-        public static final int key_background=0x7f05001a;
-        public static final int key_board_size=0x7f050029;
-        public static final int key_bonus_l2x=0x7f050014;
-        public static final int key_bonus_l3x=0x7f050015;
-        public static final int key_bonus_w2x=0x7f050016;
-        public static final int key_bonus_w3x=0x7f050017;
+        public static final int key_addrs_pref=0x7f05003d;
+        public static final int key_background=0x7f050019;
+        public static final int key_board_size=0x7f050028;
+        public static final int key_bonus_l2x=0x7f050013;
+        public static final int key_bonus_l3x=0x7f050014;
+        public static final int key_bonus_w2x=0x7f050015;
+        public static final int key_bonus_w3x=0x7f050016;
         /**  the color of text, e.g. "2L", shown on a bonus square on the
          board 
          */
         public static final int key_bonushint=0x7f050141;
-        public static final int key_bt_addrs=0x7f050040;
+        public static final int key_bt_addrs=0x7f05003f;
         /**  database keys whose entries aren't visible prefs 
          */
-        public static final int key_closed_langs=0x7f05003f;
-        public static final int key_clr_bonushint=0x7f05001c;
-        public static final int key_clr_crosshairs=0x7f05001b;
+        public static final int key_closed_langs=0x7f05003e;
+        public static final int key_clr_bonushint=0x7f05001b;
+        public static final int key_clr_crosshairs=0x7f05001a;
         /**  prefs keys 
          */
-        public static final int key_color_tiles=0x7f050002;
-        public static final int key_connect_frequency=0x7f050032;
-        public static final int key_connstat_data=0x7f050042;
-        public static final int key_default_dict=0x7f05002c;
-        public static final int key_default_group=0x7f050047;
-        public static final int key_default_language=0x7f05002b;
-        public static final int key_default_loc=0x7f05003b;
-        public static final int key_default_phonies=0x7f050030;
-        public static final int key_default_robodict=0x7f05002f;
-        public static final int key_default_timerenabled=0x7f050031;
-        public static final int key_dev_id=0x7f050043;
-        public static final int key_dict_host=0x7f050023;
-        public static final int key_disable_nag=0x7f050007;
-        public static final int key_download_path=0x7f05006c;
-        public static final int key_empty=0x7f050019;
-        public static final int key_enable_debug=0x7f050067;
-        public static final int key_enable_dup_invite=0x7f050068;
-        public static final int key_enable_nfc_toself=0x7f050069;
-        public static final int key_enable_pubroom=0x7f05000f;
-        public static final int key_enable_sms=0x7f050035;
-        public static final int key_enable_sms_toself=0x7f05006a;
-        public static final int key_explain_robot=0x7f050005;
-        public static final int key_force_radio=0x7f05003d;
-        public static final int key_force_tablet=0x7f05003c;
-        public static final int key_gcmvers_regid=0x7f050044;
-        public static final int key_got_langdict=0x7f05006d;
-        public static final int key_group_posns=0x7f050048;
-        public static final int key_hide_crosshairs=0x7f05000a;
-        public static final int key_hide_newgames=0x7f05000e;
-        public static final int key_hide_title=0x7f05000d;
-        public static final int key_hide_values=0x7f05000b;
-        public static final int key_init_autojuggle=0x7f050028;
-        public static final int key_init_hintsallowed=0x7f050026;
-        public static final int key_init_nethintsallowed=0x7f050027;
-        public static final int key_initial_player_minutes=0x7f05002a;
-        public static final int key_invite_multi=0x7f050070;
-        public static final int key_keep_screenon=0x7f050037;
-        public static final int key_last_packet=0x7f050049;
-        public static final int key_logging_on=0x7f050024;
-        public static final int key_na_browse=0x7f050061;
-        public static final int key_na_browseall=0x7f050062;
-        public static final int key_na_comms_bt=0x7f050072;
-        public static final int key_na_comms_relay=0x7f050074;
-        public static final int key_na_comms_sms=0x7f050073;
-        public static final int key_na_dicts=0x7f050066;
-        public static final int key_na_fmt_expl=0x7f050065;
-        public static final int key_na_lookup=0x7f050060;
-        public static final int key_na_studycopy=0x7f050064;
-        public static final int key_na_values=0x7f050063;
-        public static final int key_nag_intervals=0x7f05006b;
-        public static final int key_network_behavior=0x7f050036;
-        public static final int key_notagain_arrow=0x7f05005b;
-        public static final int key_notagain_backclears=0x7f05004d;
-        public static final int key_notagain_chat=0x7f05004e;
-        public static final int key_notagain_conndall=0x7f050058;
-        public static final int key_notagain_conndfirst=0x7f050059;
-        public static final int key_notagain_conndmid=0x7f05005a;
-        public static final int key_notagain_done=0x7f050056;
-        public static final int key_notagain_enablepublic=0x7f050071;
-        public static final int key_notagain_flip=0x7f050053;
-        public static final int key_notagain_hidenewgamebuttons=0x7f05005f;
-        public static final int key_notagain_hintnext=0x7f050051;
-        public static final int key_notagain_hintprev=0x7f050050;
-        public static final int key_notagain_juggle=0x7f050052;
-        public static final int key_notagain_newfrom=0x7f05005d;
+        public static final int key_color_tiles=0x7f050001;
+        public static final int key_connect_frequency=0x7f050031;
+        public static final int key_connstat_data=0x7f050041;
+        public static final int key_default_dict=0x7f05002b;
+        public static final int key_default_group=0x7f050046;
+        public static final int key_default_language=0x7f05002a;
+        public static final int key_default_loc=0x7f05003a;
+        public static final int key_default_phonies=0x7f05002f;
+        public static final int key_default_robodict=0x7f05002e;
+        public static final int key_default_timerenabled=0x7f050030;
+        public static final int key_dev_id=0x7f050042;
+        public static final int key_dict_host=0x7f050022;
+        public static final int key_disable_nag=0x7f050006;
+        public static final int key_download_path=0x7f05006b;
+        public static final int key_empty=0x7f050018;
+        public static final int key_enable_debug=0x7f050066;
+        public static final int key_enable_dup_invite=0x7f050067;
+        public static final int key_enable_nfc_toself=0x7f050068;
+        public static final int key_enable_pubroom=0x7f05000e;
+        public static final int key_enable_sms=0x7f050034;
+        public static final int key_enable_sms_toself=0x7f050069;
+        public static final int key_explain_robot=0x7f050004;
+        public static final int key_force_radio=0x7f05003c;
+        public static final int key_force_tablet=0x7f05003b;
+        public static final int key_gcmvers_regid=0x7f050043;
+        public static final int key_got_langdict=0x7f05006c;
+        public static final int key_group_posns=0x7f050047;
+        public static final int key_hide_crosshairs=0x7f050009;
+        public static final int key_hide_newgames=0x7f05000d;
+        public static final int key_hide_title=0x7f05000c;
+        public static final int key_hide_values=0x7f05000a;
+        public static final int key_init_autojuggle=0x7f050027;
+        public static final int key_init_hintsallowed=0x7f050025;
+        public static final int key_init_nethintsallowed=0x7f050026;
+        public static final int key_initial_player_minutes=0x7f050029;
+        public static final int key_invite_multi=0x7f05006f;
+        public static final int key_keep_screenon=0x7f050036;
+        public static final int key_last_packet=0x7f050048;
+        public static final int key_logging_on=0x7f050023;
+        public static final int key_na_browse=0x7f050060;
+        public static final int key_na_browseall=0x7f050061;
+        public static final int key_na_comms_bt=0x7f050071;
+        public static final int key_na_comms_relay=0x7f050073;
+        public static final int key_na_comms_sms=0x7f050072;
+        public static final int key_na_dicts=0x7f050065;
+        public static final int key_na_fmt_expl=0x7f050064;
+        public static final int key_na_lookup=0x7f05005f;
+        public static final int key_na_studycopy=0x7f050063;
+        public static final int key_na_values=0x7f050062;
+        public static final int key_nag_intervals=0x7f05006a;
+        public static final int key_network_behavior=0x7f050035;
+        public static final int key_notagain_arrow=0x7f05005a;
+        public static final int key_notagain_backclears=0x7f05004c;
+        public static final int key_notagain_chat=0x7f05004d;
+        public static final int key_notagain_conndall=0x7f050057;
+        public static final int key_notagain_conndfirst=0x7f050058;
+        public static final int key_notagain_conndmid=0x7f050059;
+        public static final int key_notagain_done=0x7f050055;
+        public static final int key_notagain_enablepublic=0x7f050070;
+        public static final int key_notagain_flip=0x7f050052;
+        public static final int key_notagain_hidenewgamebuttons=0x7f05005e;
+        public static final int key_notagain_hintnext=0x7f050050;
+        public static final int key_notagain_hintprev=0x7f05004f;
+        public static final int key_notagain_juggle=0x7f050051;
+        public static final int key_notagain_newfrom=0x7f05005c;
         /**  <string name="key_notagain_sms_ready">key_notagain_sms_ready</string> 
          */
-        public static final int key_notagain_newselect=0x7f05004c;
-        public static final int key_notagain_relay=0x7f05004f;
-        public static final int key_notagain_sync=0x7f05004b;
-        public static final int key_notagain_trading=0x7f05005e;
-        public static final int key_notagain_turnchanged=0x7f05005c;
-        public static final int key_notagain_undo=0x7f050055;
-        public static final int key_notagain_unlock=0x7f050057;
-        public static final int key_notagain_zoom=0x7f050054;
-        public static final int key_notify_sound=0x7f050033;
-        public static final int key_notify_vibrate=0x7f050034;
-        public static final int key_peek_other=0x7f050009;
-        public static final int key_player0=0x7f050010;
-        public static final int key_player1=0x7f050011;
-        public static final int key_player1_name=0x7f05002d;
-        public static final int key_player2=0x7f050012;
-        public static final int key_player3=0x7f050013;
-        public static final int key_proxy_port=0x7f050021;
-        public static final int key_relay_host=0x7f05001d;
-        public static final int key_relay_port=0x7f05001e;
-        public static final int key_relay_regid=0x7f050045;
-        public static final int key_relay_regid_ackd=0x7f050046;
-        public static final int key_ringer_zoom=0x7f05000c;
-        public static final int key_robot_name=0x7f05002e;
-        public static final int key_show_arrow=0x7f050003;
-        public static final int key_show_sms=0x7f050025;
-        public static final int key_skip_confirm=0x7f050006;
-        public static final int key_sms_phones=0x7f050041;
-        public static final int key_sms_port=0x7f050022;
-        public static final int key_sort_tiles=0x7f050008;
-        public static final int key_square_tiles=0x7f050004;
-        public static final int key_studyon=0x7f050039;
-        public static final int key_summary_field=0x7f05003a;
-        public static final int key_thumbsize=0x7f050038;
-        public static final int key_tile_back=0x7f050018;
-        public static final int key_udp_interval=0x7f05004a;
-        public static final int key_update_prerel=0x7f050020;
-        public static final int key_update_url=0x7f05001f;
-        public static final int key_xlations_enabled=0x7f05006f;
-        public static final int key_xlations_locale=0x7f05006e;
+        public static final int key_notagain_newselect=0x7f05004b;
+        public static final int key_notagain_relay=0x7f05004e;
+        public static final int key_notagain_sync=0x7f05004a;
+        public static final int key_notagain_trading=0x7f05005d;
+        public static final int key_notagain_turnchanged=0x7f05005b;
+        public static final int key_notagain_undo=0x7f050054;
+        public static final int key_notagain_unlock=0x7f050056;
+        public static final int key_notagain_zoom=0x7f050053;
+        public static final int key_notify_sound=0x7f050032;
+        public static final int key_notify_vibrate=0x7f050033;
+        public static final int key_peek_other=0x7f050008;
+        public static final int key_player0=0x7f05000f;
+        public static final int key_player1=0x7f050010;
+        public static final int key_player1_name=0x7f05002c;
+        public static final int key_player2=0x7f050011;
+        public static final int key_player3=0x7f050012;
+        public static final int key_proxy_port=0x7f050020;
+        public static final int key_relay_host=0x7f05001c;
+        public static final int key_relay_port=0x7f05001d;
+        public static final int key_relay_regid=0x7f050044;
+        public static final int key_relay_regid_ackd=0x7f050045;
+        public static final int key_ringer_zoom=0x7f05000b;
+        public static final int key_robot_name=0x7f05002d;
+        public static final int key_show_arrow=0x7f050002;
+        public static final int key_show_sms=0x7f050024;
+        public static final int key_skip_confirm=0x7f050005;
+        public static final int key_sms_phones=0x7f050040;
+        public static final int key_sms_port=0x7f050021;
+        public static final int key_sort_tiles=0x7f050007;
+        public static final int key_square_tiles=0x7f050003;
+        public static final int key_studyon=0x7f050038;
+        public static final int key_summary_field=0x7f050039;
+        public static final int key_thumbsize=0x7f050037;
+        public static final int key_tile_back=0x7f050017;
+        public static final int key_udp_interval=0x7f050049;
+        public static final int key_update_prerel=0x7f05001f;
+        public static final int key_update_url=0x7f05001e;
+        public static final int key_xlations_enabled=0x7f05006e;
+        public static final int key_xlations_locale=0x7f05006d;
         /**  text of separator marking out the language area of the
          dialog.  First is used for single-device games, and second
          for networked games (where players aren't allowed to have
@@ -2727,7 +2729,7 @@ public final class R {
          language
          */
         public static final int xlator=0x7f0501be;
-        public static final int xwords_nfc_mime=0x7f050077;
+        public static final int xwords_nfc_mime=0x7f050076;
     }
     public static final class style {
         public static final int about_items=0x7f080005;
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index ead3423ee..34a9f39ac 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -2,8 +2,6 @@
 
 <!-- Resources in this file do not require localization -->
 <resources>
-  <!-- The name of the app.  Not localized! -->
-  <string name="app_name">Crosswords</string>  
 
   <!-- prefs keys -->
   <string name="key_color_tiles">key_color_tiles</string>

From a45b698ea902ddca773ad9e492a0441462e31451 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 3 Aug 2015 05:25:10 -0700
Subject: [PATCH 14/17] don't crash when first run without network connection

---
 .../eehouse/android/xw4/DictsDelegate.java    | 79 ++++++++++---------
 .../src/org/eehouse/android/xw4/NetUtils.java |  2 +
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
index 9fdc0e99d..268451827 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/DictsDelegate.java
@@ -1140,50 +1140,53 @@ public class DictsDelegate extends ListDelegateBase
                 JSONObject theOne = null;
                 String langName = null;
                 String json = NetUtils.runPost( post, new JSONObject() );
-                try {
-                    JSONObject obj = new JSONObject( json );
-                    JSONArray langs = obj.optJSONArray( "langs" );
-                    int nLangs = langs.length();
-                    for ( int ii = 0; ii < nLangs; ++ii ) {
-                        JSONObject langObj = langs.getJSONObject( ii );
-                        String langCode = langObj.getString( "lc" );
-                        if ( ! langCode.equals( m_lc ) ) {
-                            continue;
-                        }
-                        // we have our language; look for one marked default;
-                        // otherwise take the largest.
-                        m_langName = langObj.getString( "lang" );
-                        JSONArray dicts = langObj.getJSONArray( "dicts" );
-                        int nDicts = dicts.length();
-                        int theOneNWords = 0;
-                        for ( int jj = 0; jj < nDicts; ++jj ) {
-                            JSONObject dict = dicts.getJSONObject( jj );
-                            if ( dict.optBoolean( "isDflt", false ) ) {
-                                theOne = dict;
-                                break;
-                            } else {
-                                int nWords = dict.getInt( "nWords" );
-                                if ( null == theOne || nWords > theOneNWords ) {
+                if ( null != json ) {
+                    try {
+                        JSONObject obj = new JSONObject( json );
+                        JSONArray langs = obj.optJSONArray( "langs" );
+                        int nLangs = langs.length();
+                        for ( int ii = 0; ii < nLangs; ++ii ) {
+                            JSONObject langObj = langs.getJSONObject( ii );
+                            String langCode = langObj.getString( "lc" );
+                            if ( ! langCode.equals( m_lc ) ) {
+                                continue;
+                            }
+                            // we have our language; look for one marked default;
+                            // otherwise take the largest.
+                            m_langName = langObj.getString( "lang" );
+                            JSONArray dicts = langObj.getJSONArray( "dicts" );
+                            int nDicts = dicts.length();
+                            int theOneNWords = 0;
+                            for ( int jj = 0; jj < nDicts; ++jj ) {
+                                JSONObject dict = dicts.getJSONObject( jj );
+                                if ( dict.optBoolean( "isDflt", false ) ) {
                                     theOne = dict;
-                                    theOneNWords = nWords;
+                                    break;
+                                } else {
+                                    int nWords = dict.getInt( "nWords" );
+                                    if ( null == theOne 
+                                         || nWords > theOneNWords ) {
+                                        theOne = dict;
+                                        theOneNWords = nWords;
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    // If we got here and theOne isn't set, there is
-                    // no wordlist available for this language. Set
-                    // the flag so we don't try again, even though
-                    // we've failed.
-                    if ( null == theOne ) {
-                        XWPrefs.setPrefsBoolean( m_context, 
-                                                 R.string.key_got_langdict, 
-                                                 true );
-                    }
+                        // If we got here and theOne isn't set, there is
+                        // no wordlist available for this language. Set
+                        // the flag so we don't try again, even though
+                        // we've failed.
+                        if ( null == theOne ) {
+                            XWPrefs.setPrefsBoolean( m_context, 
+                                                     R.string.key_got_langdict, 
+                                                     true );
+                        }
 
-                } catch ( JSONException ex ) {
-                    DbgUtils.loge( ex );
-                    theOne = null;
+                    } catch ( JSONException ex ) {
+                        DbgUtils.loge( ex );
+                        theOne = null;
+                    }
                 }
 
                 if ( null != theOne ) {
diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
index 414175340..c8eb2fcc3 100644
--- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
+++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/NetUtils.java
@@ -234,6 +234,8 @@ public class NetUtils {
             }
         } catch( java.io.UnsupportedEncodingException uee ) {
             DbgUtils.loge( uee );
+        } catch( java.net.UnknownHostException uhe ) {
+            DbgUtils.loge( uhe );
         } catch( java.io.IOException ioe ) {
             DbgUtils.loge( ioe );
         }

From debe424c8a0ce4d6b6e02820cfcbd269366b87ed Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Aug 2015 20:13:19 -0700
Subject: [PATCH 15/17] copy over from android_translate branch

---
 .../XWords4/res_src/values-ca/strings.xml     | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/XWords4/res_src/values-ca/strings.xml b/xwords4/android/XWords4/res_src/values-ca/strings.xml
index 59b569b21..702511e58 100644
--- a/xwords4/android/XWords4/res_src/values-ca/strings.xml
+++ b/xwords4/android/XWords4/res_src/values-ca/strings.xml
@@ -324,7 +324,7 @@
     <string name="vs_join">" vs. "</string>
 
     <plurals name="strd_remains_header_fmt">
-	<item quantity="one">%1$d fitxes romanents al sac.</item>
+	<item quantity="one">Queden %1$d fitxes al sac.</item>
 	<item quantity="other"/>
 </plurals>
     <plurals name="strd_remains_expl_fmt">
@@ -672,9 +672,9 @@
     <string name="slmenu_copy_sel">Copia al porta-retalls</string>
     <string name="slmenu_clear_sel">Suprimeix la selecció</string>
     <plurals name="paste_done_fmt">
-	<item quantity="one">S\'han copiat %1$d paraules</item>
-	<item quantity="other"/>
-</plurals>
+	  <item quantity="one">S\'han copiat %1$d paraules</item>
+	  <item quantity="other"/>
+    </plurals>
     <string name="add_done_fmt">S\'ha afegit %1$s a la llista d\'estudi %2$s</string>
     <string name="studylist_title_fmt">Llista d\'estudi per a %1$s</string>
 
@@ -808,9 +808,9 @@
     <string name="prev_player">Oponent</string>
 
     <plurals name="lmi_move_fmt">
-	<item quantity="one">%1$s ha jugat %2$s i anota %3$d punts</item>
-	<item quantity="other"/>
-</plurals>
+	  <item quantity="one">%1$s ha jugat %2$s i anota %3$d punts</item>
+	  <item quantity="other"/>
+    </plurals>
     <plurals name="lmi_trade_fmt">
 	<item quantity="one">%1$s ha canviat %2$d fitxes</item>
 	<item quantity="other"/>
@@ -893,7 +893,7 @@
     <string name="sms_bad_proto_fmt">La versió del Crosswords al telèfon amb número «%1$s» no és compatible amb aquest per a jugar via SMS. Heu d\'actualitzar abans de continuar.</string>
 
       <plurals name="invite_bt_desc_fmt">
-	<item quantity="one">Selecioneu fins a %1$d aparells que voleu incloure en aquesta partida. Useu el botó «%2$s» si no veieu l\'aparell que espereu.</item>
+	<item quantity="one">Seleccioneu fins a %1$d aparells que voleu incloure en aquesta partida. Useu el botó «%2$s» si no veieu l\'aparell que espereu.</item>
 	<item quantity="other"/>
 </plurals>
     <plurals name="invite_sms_desc_fmt">
@@ -1043,4 +1043,6 @@
   <string name="rematch_msg">Gestió de les invitacions per a tornar a jugar la partida. Us mostrarem aquest missatge mentre no l\'accepteu.\n\nNo heu de tenir aquesta partida oberta mentre espereu. Rebreu una notificació quan la partida estigui preparada per a jugar.</string>
 
     <string name="redir_host">Convida l\'amfitrió redirigit</string>
-  </resources>
+  <string name="str_no_hint_found">No puc trobar cap jugada</string>
+
+</resources>

From adceab1ed1c4ca51619669435f6ccdf65d86ee47 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Aug 2015 20:15:00 -0700
Subject: [PATCH 16/17] name change

---
 xwords4/android/scripts/{fix_loc_xmls.py => fix-loc-xmls.py} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename xwords4/android/scripts/{fix_loc_xmls.py => fix-loc-xmls.py} (100%)

diff --git a/xwords4/android/scripts/fix_loc_xmls.py b/xwords4/android/scripts/fix-loc-xmls.py
similarity index 100%
rename from xwords4/android/scripts/fix_loc_xmls.py
rename to xwords4/android/scripts/fix-loc-xmls.py

From 97ebdd0d63c8ba9b7c274ce5fe33715875685bec Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Aug 2015 20:15:38 -0700
Subject: [PATCH 17/17] copy changes over from android_translate branch

---
 xwords4/android/scripts/fix-loc-xmls.py | 159 ++++++++++++++++++------
 1 file changed, 122 insertions(+), 37 deletions(-)

diff --git a/xwords4/android/scripts/fix-loc-xmls.py b/xwords4/android/scripts/fix-loc-xmls.py
index 814d5ab2d..4a5f9f944 100755
--- a/xwords4/android/scripts/fix-loc-xmls.py
+++ b/xwords4/android/scripts/fix-loc-xmls.py
@@ -4,13 +4,31 @@ import mk_xml, os, sys, getopt, re
 
 from lxml import etree
 
+g_verbose = False
+
+def getDocNames( doc ):
+    stringNames = {}
+    pluralsNames = {}
+
+    for elem in doc.getroot():
+        if elem.tag == 'string': stringNames[elem.get('name')] = True
+        elif elem.tag == 'plurals': pluralsNames[elem.get('name')] = True
+
+    return { 'stringNames' : stringNames,
+             'pluralsNames' : pluralsNames,
+         }
+
+def getEnglishNames():
+    doc = etree.parse("res/values/strings.xml")
+    return getDocNames( doc )
+
 def longestCommon( name, pairs ):
     match = None
     for ii in range(1, len(name)):
         str = name[:ii]
         for key in pairs.keys():
             if str == key[:ii]:
-                print str, "matches", key, "so far"
+                if g_verbose: print str, "matches", key, "so far"
                 match = key
                 break
     return match
@@ -50,28 +68,40 @@ def checkAgainst( doc, pairs ):
                 # response = raw_input( "unknown name: %s; respond:" % (name) )
                 # print "you wrote:", response
 
-def findWithName( doc, name ):
+def findWithName( doc, name, tag ):
     result = None
-    for string in doc.findall('string'):
+    for string in doc.findall(tag):
         if string.get('name') == name:
             result = string
             break
-    print 'findWithName=>', result, 'for', name
+    # if g_verbose: print 'findWithName=>', result, 'for', name
     return result
 
+def makePluralsFrom( src ):
+    newNode = etree.fromstring('<plurals name="%s"></plurals>' % (src.get('name')))
+    for item in src.findall('item'):
+        obj = etree.fromstring('<item quantity="%s">XLATE ME: %s</item>' 
+                               % (item.get('quantity'), item.text))
+        newNode.append(obj)
+    return newNode
+
 def insertAfter( locRoot, englishElem, lastMatch, prevComments ):
     name = englishElem.get('name')
     text = englishElem.text
-    print "insertAfter(", locRoot, englishElem.get('name'), lastMatch.get('name'), prevComments, ")"
+    if g_verbose: print "insertAfter(", locRoot, englishElem.get('name'), lastMatch.get('name'), prevComments, ")"
     index = locRoot.getchildren().index(lastMatch)
-    print 'index:', index
+    if g_verbose: print 'index:', index
 
     for comment in prevComments:
         commentNode = etree.Comment(comment)
         index += 1
         locRoot.insert( index, commentNode )
 
-    newNode = etree.fromstring('<string name="%s">XLATE ME: %s</string>' % (name, text))
+    if 'string' == englishElem.tag:
+        newNode = etree.fromstring('<string name="%s">XLATE ME: %s</string>' % (name, text))
+    elif 'plurals' == englishElem.tag:
+        newNode = makePluralsFrom(englishElem)
+    else: sys.exit(1)
     index += 1
     locRoot.insert( index, newNode )
 
@@ -80,6 +110,14 @@ def longFormFor(fmt ):
     elif fmt == '%d': return '%1$d'
     else: assert False
 
+def printStats( doc ):
+    engNames = getEnglishNames()
+    langNames = getDocNames( doc )
+    print "strings: English: %d; lang: %d" % (len(engNames['stringNames']), 
+                                              len(langNames['stringNames']))
+    print "plurals: English: %d; lang: %d" % (len(engNames['pluralsNames']), 
+                                              len(langNames['pluralsNames']))
+
 def replacePcts( doc ):
     pat = re.compile( '(%[sd])', re.DOTALL | re.MULTILINE )
     for string in doc.findall('string'):
@@ -95,29 +133,29 @@ def replacePcts( doc ):
 # elem before it that is in doc and insert it after.  Start over each
 # time to avoid problems with iteration and order
 def doAddMissing( doc ):
-    done = False
-    while not done:
-        locRoot = doc.getroot()
-        lastMatch = None
-        prevComments = []
-        for elem in etree.parse("res/values/strings.xml").getroot().iter():
-            if not isinstance( elem.tag, basestring ):
-                prevComments.append( elem.text )
-                print "added comment:", elem.text
-            elif 'string' == elem.tag:
-                name = elem.get('name')
-                match = findWithName( locRoot, name )
-                print 'elem', name, 'has comments', prevComments
-                if None == match:
-                    print 'NO match for', name
-                    insertAfter( locRoot, elem, lastMatch, prevComments )
-                    done = True
-                    # sys.exit(0)
-                else:
-                    print 'got match for', name
-                    lastMatch = match
-                    lastComments = prevComments
-                prevComments = []
+    locRoot = doc.getroot()
+    lastMatch = None
+    prevComments = []
+    resources = etree.parse("res/values/strings.xml").getroot()
+    for elem in resources:
+        # if g_verbose: print "got elem:", elem
+        tag = elem.tag
+        if not isinstance( tag, basestring ):
+            prevComments.append( elem.text )
+            # if g_verbose: print "added comment:", elem.text
+        elif 'string' == tag or 'plurals' == tag:
+            name = elem.get('name')
+            match = findWithName( locRoot, name, tag )
+            if None == match:
+                if g_verbose: print 'NO match for', name
+                insertAfter( locRoot, elem, lastMatch, prevComments )
+            else:
+                lastMatch = match
+                lastComments = prevComments
+            prevComments = []
+        else:
+            print "unexpected tag:", elem.tag
+            sys.exit(1)
                     
 def compare( engPairs, docPath ):
     locStrings = mk_xml.getStrings( docPath, True )
@@ -127,29 +165,67 @@ def compare( engPairs, docPath ):
     otherOnly = [key for key in locStrings.keys() if not key in engPairs]
     print "%d strings missing from English: %s" % (len(otherOnly), ", ".join(otherOnly))
 
+def removeNotInEnglish( doc ):
+    locRoot = doc.getroot()
+    engNames = getEnglishNames()
+    for elem in locRoot:
+        if not isinstance( elem.tag, basestring ):
+            prevComment = elem
+        elif elem.tag == 'string':
+            name = elem.get('name')
+            if not name in engNames['stringNames']:
+                print "removing string", name
+                locRoot.remove(elem)
+                if prevComment: locRoot.remove(prevComment)
+            prevComment = None
+        elif elem.tag == 'plurals':
+            name = elem.get('name')
+            if not name in engNames['pluralsNames']:
+                print "removing plurals", name
+                locRoot.remove(elem)
+                if prevComment: locRoot.remove(prevComment)
+            prevComment = None
+        else: 
+            print "unknown tag", elem.tag
+            sys.exit(1)
+
+
 def usage():
     print "usage:", sys.argv[0]
     print "   -a   # insert missing string elements for translation"
     print "   -c   # compare each file with the English, listing string not in both"
+    print "   -i   # save any changes made (does not by default)"
     print "   -f   # work on this strings.xml file (does all if none specified)"
+    print "   -l   # work on the strings.xml file for this language (e.g. ca, nl)"
+    print "   -r   # remove elements not present in English"
+    print "   -s   # print stats"
     print "   -%   # replace %[sd] with the correct longer form"
-    print "   -s   # save any changes made (does not by default)"
     sys.exit(1)
 
+def langFileFor(code):
+    return "res_src/values-%s/strings.xml" % code
+
 def main():
+    global g_verbose
     stringsFiles = []
     addMissing = False
     doSave = False
     doCompare = False
     doReplace = False
+    doRemove = False
+    doStats = False
     try:
-        pairs, rest = getopt.getopt(sys.argv[1:], "acf:s%")
+        pairs, rest = getopt.getopt(sys.argv[1:], "acf:il:rsv%")
         for option, value in pairs:
             if option == '-a': addMissing = True
             elif option == '-c': doCompare = True
-            elif option == '-%': doReplace = True
+            elif option == '-i': doSave = True
             elif option == '-f': stringsFiles.append(value)
-            elif option == '-s': doSave = True
+            elif option == '-l': stringsFiles.append(langFileFor(value))
+            elif option == '-v': g_verbose = True
+            elif option == '-r': doRemove = True
+            elif option == '-s': doStats = True
+            elif option == '-%': doReplace = True
             else: usage()
     except:
         usage()
@@ -164,11 +240,20 @@ def main():
 
     parser = etree.XMLParser(remove_blank_text=True, encoding="utf-8")
     for path in stringsFiles:
+        print "looking at", path
         doc = etree.parse(path, parser)
         # checkAgainst( doc, pairs )
-        if doReplace: replacePcts( doc )
-        if addMissing: doAddMissing( doc )
-        if doCompare: compare( pairs, path )
+        if doReplace: 
+            replacePcts( doc )
+        if addMissing: 
+            doAddMissing( doc )
+        if doCompare: 
+            compare( pairs, path )
+        if doRemove:
+            removeNotInEnglish( doc )
+        # print stats after any other changes have been made
+        if doStats:
+            printStats( doc )
         if doSave:
             out = open( path, "w" )
             out.write( etree.tostring( doc, pretty_print=True, encoding="utf-8", xml_declaration=True ) )