From dfd4a3f6f6d8d173962594c0346f4b375802b9cc Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 26 Jul 2018 19:16:50 -0700
Subject: [PATCH 001/145] put the api-26 changes back

lost in a rebase apparently
---
 xwords4/android/app/build.gradle | 2 +-
 xwords4/android/build.gradle     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 1359656ab..8b68bd894 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
     buildToolsVersion '27.0.3'
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 26
         versionCode VERSION_CODE_BASE
         versionName VERSION_NAME
     }
diff --git a/xwords4/android/build.gradle b/xwords4/android/build.gradle
index 8e6c7f8a9..de085ae7f 100644
--- a/xwords4/android/build.gradle
+++ b/xwords4/android/build.gradle
@@ -29,7 +29,7 @@ subprojects {
     afterEvaluate {project ->
         if (project.hasProperty("android")) {
             android {
-                compileSdkVersion 23
+                compileSdkVersion 26
             }
         }
     }

From 45600a295adf8795b3b800c6e783e2d7c3f9d973 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Thu, 13 Sep 2018 19:49:49 -0700
Subject: [PATCH 002/145] use NotificationChannel to work on O and beyond with
 SDK 26

Notifications don't work on Oreo without this change, which includes a
new Support Library in order to get NotificationChannel and creates and
uses that as docs describe. Requires that MinSDK be raised from 8 to 14,
which may lock some users out. It *should* be possible not to do this in
the fdroid variant since their app store doesn't requires SDK 26, but
I'll look at that later.
---
 xwords4/android/app/build.gradle              |  9 ++++--
 .../java/org/eehouse/android/xw4/Utils.java   | 30 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 283ced899..2176ad851 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -32,7 +32,7 @@ android {
     // default changes and .travis.yml can be kept in sync
     buildToolsVersion '27.0.3'
     defaultConfig {
-        minSdkVersion 8
+        minSdkVersion 14
         targetSdkVersion 26
         versionCode VERSION_CODE_BASE
         versionName VERSION_NAME
@@ -197,11 +197,16 @@ android {
     }
 }
 
+ext {
+    SUPPORT_LIB_VERSION = '27.1.1'
+}
+
 dependencies {
     // Look into replacing this with a fetch too PENDING
     xw4Implementation files('../libs/gcm.jar')
 
-    implementation 'com.android.support:support-v4:23.4.0'
+    implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
+    implementation "com.android.support:support-compat:$SUPPORT_LIB_VERSION"
 
     // 2.6.8 is probably as far forward as I can go without upping my
     // min-supported SDK version
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 c5a02bf0e..f83fd30a8 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
@@ -23,6 +23,7 @@ package org.eehouse.android.xw4;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ContentResolver;
@@ -38,6 +39,7 @@ import android.database.Cursor;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.ContactsContract.PhoneLookup;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.FileProvider;
@@ -81,6 +83,8 @@ public class Utils {
     private static final String TAG = Utils.class.getSimpleName();
     public static final int TURN_COLOR = 0x7F00FF00;
 
+    private static final String CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
+
     private static final String DB_PATH = "XW_GAMES";
     private static final String HIDDEN_PREFS = "xwprefs_hidden";
     private static final String FIRST_VERSION_KEY = "FIRST_VERSION_KEY";
@@ -236,6 +240,8 @@ public class Utils {
                                          String title, String body,
                                          int id )
     {
+        makeNotificationChannel( context );
+
         /* nextRandomInt: per this link
            http://stackoverflow.com/questions/10561419/scheduling-more-than-one-pendingintent-to-same-activity-using-alarmmanager
            one way to avoid getting the same PendingIntent for similar
@@ -254,9 +260,10 @@ public class Utils {
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
-        Notification notification = new NotificationCompat.Builder( context )
+        Notification notification = new NotificationCompat.Builder( context, CHANNEL_ID )
             .setContentIntent( pi )
             .setSmallIcon( R.drawable.notify )
+            .setPriority(NotificationCompat.PRIORITY_LOW)
             //.setTicker(body)
             //.setWhen(time)
             .setAutoCancel( true )
@@ -611,4 +618,25 @@ public class Utils {
         }
     }
 
+    private static boolean sChannelMade = false;
+    private static void makeNotificationChannel( Context context )
+    {
+        if ( !sChannelMade ) {
+            sChannelMade = true;
+            if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
+                NotificationManager notMgr = (NotificationManager)
+                    context.getSystemService( Context.NOTIFICATION_SERVICE );
+
+                String channelDescription = "XWORDS Default Channel";
+                NotificationChannel channel = notMgr.getNotificationChannel( CHANNEL_ID );
+                if ( channel == null ) {
+                    channel = new NotificationChannel( CHANNEL_ID, channelDescription,
+                                                       NotificationManager.IMPORTANCE_LOW );
+                    // channel.setLightColor(Color.GREEN);
+                    channel.enableVibration( true );
+                    notMgr.createNotificationChannel( channel );
+                }
+            }
+        }
+    }
 }

From 24440230bace47e2e3ab31f5c2aad697f3c454e7 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Fri, 21 Sep 2018 15:21:04 -0700
Subject: [PATCH 003/145] refactor so startService can change (no behavior
 change yet)

---
 .../org/eehouse/android/xw4/BTService.java    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 20c0bad8d..98d851b16 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -227,7 +227,7 @@ public class BTService extends XWService {
     public static void startService( Context context )
     {
         if ( XWApp.BTSUPPORTED ) {
-            context.startService( new Intent( context, BTService.class ) );
+            startService( context, new Intent( context, BTService.class ) );
         }
     }
 
@@ -235,20 +235,20 @@ public class BTService extends XWService {
     {
         Intent intent = getIntentTo( context, BTAction.RADIO );
         intent.putExtra( RADIO_KEY, cameOn );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void clearDevices( Context context, String[] btAddrs )
     {
         Intent intent = getIntentTo( context, BTAction.CLEAR );
         intent.putExtra( CLEAR_KEY, btAddrs );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void scan( Context context )
     {
         Intent intent = getIntentTo( context, BTAction.SCAN );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void pingHost( Context context, String hostAddr, int gameID )
@@ -257,7 +257,7 @@ public class BTService extends XWService {
         Intent intent = getIntentTo( context, BTAction.PINGHOST );
         intent.putExtra( ADDR_KEY, hostAddr );
         intent.putExtra( GAMEID_KEY, gameID );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void inviteRemote( Context context, String btAddr,
@@ -269,7 +269,7 @@ public class BTService extends XWService {
         intent.putExtra( GAMEDATA_KEY, nliData );
         intent.putExtra( ADDR_KEY, btAddr );
 
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void gotGameViaNFC( Context context, NetLaunchInfo bli )
@@ -282,7 +282,7 @@ public class BTService extends XWService {
         intent.putExtra( BT_NAME_KEY, bli.btName );
         intent.putExtra( BT_ADDRESS_KEY, bli.btAddress );
 
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static int enqueueFor( Context context, byte[] buf,
@@ -296,7 +296,7 @@ public class BTService extends XWService {
             intent.putExtra( MSG_KEY, buf );
             intent.putExtra( ADDR_KEY, btAddr );
             intent.putExtra( GAMEID_KEY, gameID );
-            context.startService( intent );
+            startService( context, intent );
             nSent = buf.length;
         }
 
@@ -312,6 +312,11 @@ public class BTService extends XWService {
         Intent intent = getIntentTo( context, BTAction.REMOVE );
         intent.putExtra( GAMEID_KEY, gameID );
         intent.putExtra( ADDR_KEY, btAddr );
+        startService( context, intent );
+    }
+
+    private static void startService( Context context, Intent intent )
+    {
         context.startService( intent );
     }
 

From 6bafbecd75597c6d7ea17dd9f867eb74f30fe9d2 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sat, 22 Sep 2018 09:22:37 -0700
Subject: [PATCH 004/145] toward service working on Oreo

Did a bunch of stuff to inherit from JobIntentService and use enqueue(),
but doesn't work yet. OS is unable to bind, with this error:
09-21 17:20:51.678  3050  3050 W JobServiceContext: Time-out while trying to bind 2edee28 #u0a277/1111 org.eehouse.android.xw4dbg/org.eehouse.android.xw4.BTService, dropping.
---
 .../android/app/src/main/AndroidManifest.xml  |  10 +-
 .../org/eehouse/android/xw4/BTService.java    |  28 ++-
 .../org/eehouse/android/xw4/BoardView.java    |   3 +-
 .../org/eehouse/android/xw4/DbgUtils.java     |   3 +-
 .../eehouse/android/xw4/NetStateCache.java    |  16 +-
 .../org/eehouse/android/xw4/RelayService.java | 220 ++++++++++--------
 .../java/org/eehouse/android/xw4/Utils.java   |   6 +
 .../org/eehouse/android/xw4/XWService.java    |  19 +-
 8 files changed, 189 insertions(+), 116 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index 27df1905e..810e8b25a 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -179,8 +179,14 @@
     <activity android:name=".loc.LocItemEditActivity"
               />
 
-    <service android:name="RelayService"/>
-    <service android:name="BTService"/>
+    <service android:name="RelayService"
+             android:permission="android.permission.BIND_JOB_SERVICE"
+             android:exported="false"
+             />
+    <service android:name="BTService"
+             android:permission="android.permission.BIND_JOB_SERVICE"
+             android:exported="false"
+             />
     <service android:name="SMSService"/>
 
     <receiver android:name=".MountEventReceiver">
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 98d851b16..61b033bd3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -29,6 +29,7 @@ import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
+import android.support.v4.app.JobIntentService;
 
 import junit.framework.Assert;
 
@@ -228,6 +229,8 @@ public class BTService extends XWService {
     {
         if ( XWApp.BTSUPPORTED ) {
             startService( context, new Intent( context, BTService.class ) );
+            // didn't help
+            // startService( context, new Intent( /*context, BTService.class*/ ) );
         }
     }
 
@@ -317,12 +320,19 @@ public class BTService extends XWService {
 
     private static void startService( Context context, Intent intent )
     {
-        context.startService( intent );
+        Log.d( TAG, "startService(%s)", intent );
+
+        if ( false ) {
+            // requires asking for Manifest.permission.FOREGROUND_SERVICE
+            context.startForegroundService( intent );
+        } else {
+            JobIntentService.enqueueWork( context, BTService.class, 1111, intent );
+        }
     }
 
     private static Intent getIntentTo( Context context, BTAction cmd )
     {
-        Intent intent = new Intent( context, BTService.class );
+        Intent intent = new Intent( /*context, BTService.class*/ );
         intent.putExtra( CMD_KEY, cmd.ordinal() );
         return intent;
     }
@@ -347,6 +357,11 @@ public class BTService extends XWService {
 
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
+    {
+        return handleCommand( intent );
+    }
+
+    private int handleCommand( Intent intent )
     {
         int result;
         if ( XWApp.BTSUPPORTED && null != intent ) {
@@ -433,7 +448,14 @@ public class BTService extends XWService {
             result = Service.START_STICKY_COMPATIBILITY;
         }
         return result;
-    } // onStartCommand()
+    } // handleCommand()
+
+    @Override
+    protected void onHandleWork( Intent intent )
+    {
+        Log.e( TAG, "onHandleWork(%s)", intent );
+        /*(void)*/handleCommand( intent );
+    }
 
     private class BTListenerThread extends Thread {
         private BluetoothServerSocket m_serverSocket;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
index d0c9f33de..fff413910 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
@@ -46,7 +46,6 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
 
     private static final float MIN_FONT_DIPS = 10.0f;
     private static final int MULTI_INACTIVE = -1;
-    private static final int VERSION_CODES_N = 24; // until we're building on SDK 24...
 
     private static boolean s_isFirstDraw;
     private static int s_curGameID;
@@ -205,7 +204,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
         synchronized( this ) {
             if ( layoutBoardOnce() && m_measuredFromDims ) {
                 Bitmap bitmap = s_bitmap;
-                if ( Build.VERSION.SDK_INT >= VERSION_CODES_N ) {
+                if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ) {
                     bitmap = Bitmap.createBitmap(bitmap);
                 }
                 canvas.drawBitmap( bitmap, 0, 0, new Paint() );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index f6116d8de..db5664334 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -25,7 +25,6 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.os.Bundle;
-import android.os.Looper;
 import android.text.TextUtils;
 import android.text.format.Time;
 
@@ -103,7 +102,7 @@ public class DbgUtils {
 
     public static void assertOnUIThread()
     {
-        Assert.assertTrue( Looper.getMainLooper().equals(Looper.myLooper()) );
+        Assert.assertTrue( Utils.isOnUIThread() );
     }
 
     public static void printStack( String tag, StackTraceElement[] trace )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 3081ccc41..101f52059 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -54,17 +54,21 @@ public class NetStateCache {
 
     public static void register( Context context, StateChangedIf proc )
     {
-        initIfNot( context );
-        synchronized( s_ifs ) {
-            s_ifs.add( proc );
+        if ( Utils.isOnUIThread() ) {
+            initIfNot( context );
+            synchronized( s_ifs ) {
+                s_ifs.add( proc );
+            }
         }
     }
 
     public static void unregister( Context context, StateChangedIf proc )
     {
-        initIfNot( context );
-        synchronized( s_ifs ) {
-            s_ifs.remove( proc );
+        if ( Utils.isOnUIThread() ) {
+            initIfNot( context );
+            synchronized( s_ifs ) {
+                s_ifs.remove( proc );
+            }
         }
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 0b79002e5..8082adaef 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -25,6 +25,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v4.app.JobIntentService;
 import android.text.TextUtils;
 
 import junit.framework.Assert;
@@ -192,13 +193,25 @@ public class RelayService extends XWService
     {
         Log.i( TAG, "startService()" );
         Intent intent = getIntentTo( context, MsgCmds.UDP_CHANGED );
-        context.startService( intent );
+        startService( context, intent );
+    }
+
+    private static void startService( Context context, Intent intent )
+    {
+        Log.d( TAG, "startService(%s)", intent );
+
+        if ( false ) {
+            // requires asking for Manifest.permission.FOREGROUND_SERVICE
+            context.startForegroundService( intent );
+        } else {
+            JobIntentService.enqueueWork( context, RelayService.class, 1112, intent );
+        }
     }
 
     private static void stopService( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.STOP );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void inviteRemote( Context context, int destDevID,
@@ -206,7 +219,7 @@ public class RelayService extends XWService
     {
         int myDevID = DevID.getRelayDevIDInt( context );
         if ( 0 != myDevID ) {
-            context.startService( getIntentTo( context, MsgCmds.INVITE )
+            startService( context, getIntentTo( context, MsgCmds.INVITE )
                                   .putExtra( DEV_ID_SRC, myDevID )
                                   .putExtra( DEV_ID_DEST, destDevID )
                                   .putExtra( RELAY_ID, relayID )
@@ -217,13 +230,13 @@ public class RelayService extends XWService
     public static void reset( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.RESET );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void timerFired( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.TIMER_FIRED );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static int sendPacket( Context context, long rowid, byte[] msg )
@@ -234,7 +247,7 @@ public class RelayService extends XWService
             Intent intent = getIntentTo( context, MsgCmds.SEND )
                 .putExtra( ROWID, rowid )
                 .putExtra( BINBUFFER, msg );
-            context.startService( intent );
+            startService( context, intent );
             result = msg.length;
         } else {
             Log.w( TAG, "sendPacket: network down" );
@@ -251,7 +264,7 @@ public class RelayService extends XWService
                 .putExtra( ROWID, rowid )
                 .putExtra( RELAY_ID, relayID )
                 .putExtra( BINBUFFER, msg );
-            context.startService( intent );
+            startService( context, intent );
             result = msg.length;
         }
         return result;
@@ -287,7 +300,7 @@ public class RelayService extends XWService
             Intent intent = getIntentTo( context, MsgCmds.RECEIVE )
                 .putExtra( ROWID, rowid )
                 .putExtra( BINBUFFER, msg );
-            context.startService( intent );
+            startService( context, intent );
         } else {
             Log.w( TAG, "postData(): Dropping message for rowid %d:"
                    + " not on device", rowid );
@@ -305,14 +318,14 @@ public class RelayService extends XWService
         Intent intent = getIntentTo( context, MsgCmds.PROCESS_GAME_MSGS )
             .putExtra( MSGS_ARR, msgs64 )
             .putExtra( RELAY_ID, relayId );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void processDevMsgs( Context context, String[] msgs64 )
     {
         Intent intent = getIntentTo( context, MsgCmds.PROCESS_DEV_MSGS )
             .putExtra( MSGS_ARR, msgs64 );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     private static Intent getIntentTo( Context context, MsgCmds cmd )
@@ -356,94 +369,7 @@ public class RelayService extends XWService
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
-        Integer result = null;
-        if ( null != intent ) {
-            MsgCmds cmd;
-            try {
-                cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
-            } catch (Exception ex) { // OOB most likely
-                cmd = null;
-            }
-            if ( null != cmd ) {
-                // Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
-                switch( cmd ) {
-                case PROCESS_GAME_MSGS:
-                    String[] relayIDs = new String[1];
-                    relayIDs[0] = intent.getStringExtra( RELAY_ID );
-                    long[] rowIDs = DBUtils.getRowIDsFor( this, relayIDs[0] );
-                    if ( 0 < rowIDs.length ) {
-                        byte[][][] msgs = expandMsgsArray( intent );
-                        process( msgs, rowIDs, relayIDs );
-                    }
-                    break;
-                case PROCESS_DEV_MSGS:
-                    byte[][][] msgss = expandMsgsArray( intent );
-                    for ( byte[][] msgs : msgss ) {
-                        for ( byte[] msg : msgs ) {
-                            gotPacket( msg, true, false );
-                        }
-                    }
-                    break;
-                case UDP_CHANGED:
-                    startThreads();
-                    break;
-                case RESET:
-                    stopThreads();
-                    startThreads();
-                    break;
-                case UPGRADE:
-                    UpdateCheckReceiver.checkVersions( this, false );
-                    break;
-                case GOT_INVITE:
-                    int srcDevID = intent.getIntExtra( INVITE_FROM, 0 );
-                    NetLaunchInfo nli
-                        = NetLaunchInfo.makeFrom( this, intent.getStringExtra(NLI_DATA) );
-                    receiveInvitation( srcDevID, nli );
-                    break;
-                case SEND:
-                case RECEIVE:
-                case SENDNOCONN:
-                    startUDPThreadsIfNot();
-                    long rowid = intent.getLongExtra( ROWID, -1 );
-                    byte[] msg = intent.getByteArrayExtra( BINBUFFER );
-                    if ( MsgCmds.SEND == cmd ) {
-                        sendMessage( rowid, msg );
-                    } else if ( MsgCmds.SENDNOCONN == cmd ) {
-                        String relayID = intent.getStringExtra( RELAY_ID );
-                        sendNoConnMessage( rowid, relayID, msg );
-                    } else {
-                        receiveMessage( this, rowid, null, msg, s_addr );
-                    }
-                    break;
-                case INVITE:
-                    startUDPThreadsIfNot();
-                    srcDevID = intent.getIntExtra( DEV_ID_SRC, 0 );
-                    int destDevID = intent.getIntExtra( DEV_ID_DEST, 0 );
-                    String relayID = intent.getStringExtra( RELAY_ID );
-                    String nliData = intent.getStringExtra( NLI_DATA );
-                    sendInvitation( srcDevID, destDevID, relayID, nliData );
-                    break;
-                case TIMER_FIRED:
-                    if ( !NetStateCache.netAvail( this ) ) {
-                        Log.w( TAG, "not connecting: no network" );
-                    } else if ( startFetchThreadIfNotUDP() ) {
-                        // do nothing
-                    } else if ( registerWithRelayIfNot() ) {
-                        requestMessages();
-                    }
-                    RelayReceiver.setTimer( this );
-                    break;
-                case STOP:
-                    stopThreads();
-                    stopSelf();
-                    break;
-                default:
-                    Assert.fail();
-                }
-
-                result = Service.START_STICKY;
-            }
-        }
+        Integer result = handleCommand( intent );
 
         if ( null == result ) {
             result = Service.START_STICKY_COMPATIBILITY;
@@ -465,12 +391,110 @@ public class RelayService extends XWService
         super.onDestroy();
     }
 
+    @Override
+    protected void onHandleWork( Intent intent )
+    {
+        Log.e( TAG, "onHandleWork(%s)", intent );
+        handleCommand( intent );
+    }
+
     // NetStateCache.StateChangedIf interface
     public void onNetAvail( boolean nowAvailable )
     {
         startService( this ); // bad name: will *stop* threads too
     }
 
+    private Integer handleCommand( Intent intent )
+    {
+        Integer result = null;
+        MsgCmds cmd;
+        try {
+            cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
+        } catch (Exception ex) { // OOB most likely
+            cmd = null;
+        }
+        if ( null != cmd ) {
+            // Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
+            switch( cmd ) {
+            case PROCESS_GAME_MSGS:
+                String[] relayIDs = new String[1];
+                relayIDs[0] = intent.getStringExtra( RELAY_ID );
+                long[] rowIDs = DBUtils.getRowIDsFor( this, relayIDs[0] );
+                if ( 0 < rowIDs.length ) {
+                    byte[][][] msgs = expandMsgsArray( intent );
+                    process( msgs, rowIDs, relayIDs );
+                }
+                break;
+            case PROCESS_DEV_MSGS:
+                byte[][][] msgss = expandMsgsArray( intent );
+                for ( byte[][] msgs : msgss ) {
+                    for ( byte[] msg : msgs ) {
+                        gotPacket( msg, true, false );
+                    }
+                }
+                break;
+            case UDP_CHANGED:
+                startThreads();
+                break;
+            case RESET:
+                stopThreads();
+                startThreads();
+                break;
+            case UPGRADE:
+                UpdateCheckReceiver.checkVersions( this, false );
+                break;
+            case GOT_INVITE:
+                int srcDevID = intent.getIntExtra( INVITE_FROM, 0 );
+                NetLaunchInfo nli
+                    = NetLaunchInfo.makeFrom( this, intent.getStringExtra(NLI_DATA) );
+                receiveInvitation( srcDevID, nli );
+                break;
+            case SEND:
+            case RECEIVE:
+            case SENDNOCONN:
+                startUDPThreadsIfNot();
+                long rowid = intent.getLongExtra( ROWID, -1 );
+                byte[] msg = intent.getByteArrayExtra( BINBUFFER );
+                if ( MsgCmds.SEND == cmd ) {
+                    sendMessage( rowid, msg );
+                } else if ( MsgCmds.SENDNOCONN == cmd ) {
+                    String relayID = intent.getStringExtra( RELAY_ID );
+                    sendNoConnMessage( rowid, relayID, msg );
+                } else {
+                    receiveMessage( this, rowid, null, msg, s_addr );
+                }
+                break;
+            case INVITE:
+                startUDPThreadsIfNot();
+                srcDevID = intent.getIntExtra( DEV_ID_SRC, 0 );
+                int destDevID = intent.getIntExtra( DEV_ID_DEST, 0 );
+                String relayID = intent.getStringExtra( RELAY_ID );
+                String nliData = intent.getStringExtra( NLI_DATA );
+                sendInvitation( srcDevID, destDevID, relayID, nliData );
+                break;
+            case TIMER_FIRED:
+                if ( !NetStateCache.netAvail( this ) ) {
+                    Log.w( TAG, "not connecting: no network" );
+                } else if ( startFetchThreadIfNotUDP() ) {
+                    // do nothing
+                } else if ( registerWithRelayIfNot() ) {
+                    requestMessages();
+                }
+                RelayReceiver.setTimer( this );
+                break;
+            case STOP:
+                stopThreads();
+                stopSelf();
+                break;
+            default:
+                Assert.fail();
+            }
+
+            result = Service.START_STICKY;
+        }
+        return result;
+    }
+
     private void setupNotifications( String[] relayIDs, BackMoveResult[] bmrs,
                                      ArrayList<Boolean> locals )
     {
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 f83fd30a8..96f64f19b 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
@@ -40,6 +40,7 @@ import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Looper;
 import android.provider.ContactsContract.PhoneLookup;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.FileProvider;
@@ -533,6 +534,11 @@ public class Utils {
         return result;
     }
 
+    public static boolean isOnUIThread()
+    {
+        return Looper.getMainLooper().equals(Looper.myLooper());
+    }
+
     public static String base64Encode( byte[] in )
     {
         return Base64.encodeToString( in, Base64.NO_WRAP );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 62e680abf..bd045895a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -23,7 +23,9 @@ package org.eehouse.android.xw4;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.IBinder;
+import android.support.v4.app.JobIntentService;
 
 import junit.framework.Assert;
 
@@ -37,7 +39,7 @@ import org.eehouse.android.xw4.jni.UtilCtxtImpl;
 import java.util.HashSet;
 import java.util.Set;
 
-abstract class XWService extends Service {
+abstract class XWService extends JobIntentService {
     private static final String TAG = XWService.class.getSimpleName();
     public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
 
@@ -46,10 +48,21 @@ abstract class XWService extends Service {
 
     private UtilCtxt m_utilCtxt;
 
+    // @Override
+    // public IBinder onBind( Intent intent )
+    // {
+    //     IBinder result = null;
+    //     if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
+    //         result = super.onBind( intent );
+    //     }
+    //     return result;
+    // }
+
     @Override
-    public IBinder onBind( Intent intent )
+    protected void onHandleWork(Intent intent)
     {
-        return null;
+        Log.e( TAG, "%s.onHandleWork(%s); dropping!!!", getClass().getSimpleName(),
+               intent );
     }
 
     public final static void setListener( MultiService.MultiEventListener li )

From dfcac132c870ca370dde337bc767383e9d436d9d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 22 Sep 2018 14:21:04 -0700
Subject: [PATCH 005/145] up strings for new translations-only release

---
 xwords4/android/app/build.gradle                |  4 ++--
 .../android/app/src/main/assets/changes.html    | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 0ca4752d2..9d7fcf467 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -1,6 +1,6 @@
 def INITIAL_CLIENT_VERS = 8
-def VERSION_CODE_BASE = 135
-def VERSION_NAME = '4.4.139'
+def VERSION_CODE_BASE = 136
+def VERSION_NAME = '4.4.140'
 def FABRIC_API_KEY = System.getenv("FABRIC_API_KEY")
 def GCM_SENDER_ID = System.getenv("GCM_SENDER_ID")
 def BUILD_INFO_NAME = "build-info.txt"
diff --git a/xwords4/android/app/src/main/assets/changes.html b/xwords4/android/app/src/main/assets/changes.html
index b873c30b0..e8979d7b2 100644
--- a/xwords4/android/app/src/main/assets/changes.html
+++ b/xwords4/android/app/src/main/assets/changes.html
@@ -13,9 +13,9 @@
 	</style>
   </head>
 <body>
-  <h2>CrossWords 4.4.139 release</h2>
+  <h2>CrossWords 4.4.140 release</h2>
 
-  <p>This release fixes a bug with picking tiles face-up</p>
+  <p>This release updates translations for Catalan, French, German and Japanese.</p>
 
   <div id="survey">
 	<p>Please <a href="https://www.surveymonkey.com/s/GX3XLHR">take
@@ -25,19 +25,18 @@
 
   <h3>New with this release</h3>
   <ul>
-      <li>Don't put up multiple tile pickers. (This feature is rarely
-          used, but had apparently been broken for a while.)</li>
-      <li>Fix two more bugs reported by users (Thanks!)</li>
-      <li>Include new translations for Catalan and Norwegian</li>
+      <li>Include changes made by Weblate volunteers for four
+      languages. (Thanks!)</li>
   </ul>
 
-  <p>(The full changelog 
+  <p>(The full changelog
   is <a href="http://xwords.sf.net/and_changes.php">here</a>.)</p>
 
   <h3>Next up</h3>
   <ul>
-      <li>Continue work to support WiFi Direct (currently working
-      sporadically)</li>
+      <li>Make changes in how background networking and bluetooth work
+          that Google's mandating for all releases after 1
+          November.</li>
   </ul>
 
   <p>Please let me know

From 61779142131838eaca0ecd2e291fb8b929a88b2a Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Thu, 22 Nov 2018 08:13:49 -0800
Subject: [PATCH 006/145] add lifecycle lib (events only logged only so far)

---
 xwords4/android/app/build.gradle                |  3 +++
 .../java/org/eehouse/android/xw4/XWApp.java     | 17 ++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 2176ad851..94d68ce0b 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -208,6 +208,9 @@ dependencies {
     implementation "com.android.support:support-v4:$SUPPORT_LIB_VERSION"
     implementation "com.android.support:support-compat:$SUPPORT_LIB_VERSION"
 
+    implementation "android.arch.lifecycle:extensions:1.1.1"
+    annotationProcessor "android.arch.lifecycle:compiler:1.1.1"
+
     // 2.6.8 is probably as far forward as I can go without upping my
     // min-supported SDK version
     xw4dImplementation('com.crashlytics.sdk.android:crashlytics:2.6.3@aar') {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 15cde5677..307b1230f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -21,6 +21,11 @@
 package org.eehouse.android.xw4;
 
 import android.app.Application;
+import android.arch.lifecycle.Lifecycle;
+import android.arch.lifecycle.LifecycleObserver;
+import android.arch.lifecycle.LifecycleOwner;
+import android.arch.lifecycle.OnLifecycleEvent;
+import android.arch.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
@@ -32,7 +37,9 @@ import java.util.UUID;
 
 import junit.framework.Assert;
 
-public class XWApp extends Application {
+import static android.arch.lifecycle.Lifecycle.Event.ON_ANY;
+
+public class XWApp extends Application implements LifecycleObserver {
     private static final String TAG = XWApp.class.getSimpleName();
 
     public static final boolean BTSUPPORTED = true;
@@ -65,6 +72,8 @@ public class XWApp extends Application {
         Assert.assertTrue( s_context == s_context.getApplicationContext() );
         super.onCreate();
 
+        ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
+
         // This one line should always get logged even if logging is
         // off -- because logging is on by default until logEnable is
         // called.
@@ -91,6 +100,12 @@ public class XWApp extends Application {
         WiDirWrapper.init( this );
     }
 
+    @OnLifecycleEvent(ON_ANY)
+    public void onAny(LifecycleOwner source, Lifecycle.Event event)
+    {
+        Log.d( TAG, "onAny(%s, %s)", source, event );
+    }
+
     // This is called on emulator only, but good for ensuring no memory leaks
     // by forcing JNI cleanup
     @Override

From 2ba5982ddfaa7adfba6f846b81206384d738d93c Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Thu, 22 Nov 2018 15:18:57 -0800
Subject: [PATCH 007/145] use foregroundService on devices that can handle it

And show the notification regardless. Tested only on pre-Oreo device so far.
---
 .../android/app/src/main/AndroidManifest.xml  | 11 +--
 .../org/eehouse/android/xw4/BTService.java    | 85 ++++++++++++++++---
 .../android/xw4/GamesListDelegate.java        |  6 ++
 .../org/eehouse/android/xw4/RelayService.java | 11 +--
 .../java/org/eehouse/android/xw4/Utils.java   |  2 +-
 .../java/org/eehouse/android/xw4/XWApp.java   | 13 ++-
 .../org/eehouse/android/xw4/XWService.java    | 19 +----
 7 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index 810e8b25a..ccc7396e2 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -179,15 +179,16 @@
     <activity android:name=".loc.LocItemEditActivity"
               />
 
-    <service android:name="RelayService"
-             android:permission="android.permission.BIND_JOB_SERVICE"
-             android:exported="false"
-             />
     <service android:name="BTService"
              android:permission="android.permission.BIND_JOB_SERVICE"
              android:exported="false"
              />
-    <service android:name="SMSService"/>
+    <service android:name="SMSService"
+             android:exported="false"
+             />
+    <service android:name="RelayService"
+             android:exported="false"
+             />
 
     <receiver android:name=".MountEventReceiver">
         <intent-filter>
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 61b033bd3..8b1f3a9b1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -21,6 +21,8 @@
 package org.eehouse.android.xw4;
 
 import android.app.Activity;
+import android.app.Notification;
+import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothClass.Device.Major;
@@ -29,7 +31,8 @@ import android.bluetooth.BluetoothServerSocket;
 import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.JobIntentService;
+import android.os.Build;
+import android.support.v4.app.NotificationCompat;
 
 import junit.framework.Assert;
 
@@ -66,6 +69,8 @@ public class BTService extends XWService {
     private static final int BT_PROTO = BT_PROTO_JSONS; // change in a release or two
 
     private enum BTAction { _NONE,
+                            START_FOREGROUND,
+                            START_BACKGROUND,
                             SCAN,
                             INVITE,
                             SEND,
@@ -93,6 +98,8 @@ public class BTService extends XWService {
     private static final String BT_NAME_KEY = "BT_NAME";
     private static final String BT_ADDRESS_KEY = "BT_ADDRESS";
 
+    private static Boolean sInForeground;
+
     private enum BTCmd {
         BAD_PROTO,
         PING,
@@ -225,12 +232,33 @@ public class BTService extends XWService {
         return result;
     }
 
+    private static void onAppStateChange( Context context, boolean inForeground )
+    {
+        if ( sInForeground == null || sInForeground != inForeground ) {
+            sInForeground = inForeground;
+
+            Intent intent =
+                getIntentTo( context,
+                             inForeground ? BTAction.START_FOREGROUND
+                             : BTAction.START_BACKGROUND );
+            startService( context, intent );
+        }
+    }
+
+    static void onAppToForeground( Context context )
+    {
+        onAppStateChange( context, true );
+    }
+
+    static void onAppToBackground( Context context )
+    {
+        onAppStateChange( context, false );
+    }
+
     public static void startService( Context context )
     {
         if ( XWApp.BTSUPPORTED ) {
             startService( context, new Intent( context, BTService.class ) );
-            // didn't help
-            // startService( context, new Intent( /*context, BTService.class*/ ) );
         }
     }
 
@@ -322,17 +350,26 @@ public class BTService extends XWService {
     {
         Log.d( TAG, "startService(%s)", intent );
 
-        if ( false ) {
-            // requires asking for Manifest.permission.FOREGROUND_SERVICE
+        if ( ! sInForeground && canRunForegroundService() ) {
             context.startForegroundService( intent );
-        } else {
-            JobIntentService.enqueueWork( context, BTService.class, 1111, intent );
+        } else if ( sInForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
+            context.startService( intent );
         }
     }
 
+    // We can run a foreground service IIF the OS version is recent enough AND
+    // user hasn't said not to do it.
+    private static boolean canRunForegroundService()
+    {
+        // added in API level 26
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+            // && Prefs.runForegroundServiceEnabled( context, true )
+            ;
+    }
+
     private static Intent getIntentTo( Context context, BTAction cmd )
     {
-        Intent intent = new Intent( /*context, BTService.class*/ );
+        Intent intent = new Intent( context, BTService.class );
         intent.putExtra( CMD_KEY, cmd.ordinal() );
         return intent;
     }
@@ -358,7 +395,13 @@ public class BTService extends XWService {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
-        return handleCommand( intent );
+        int result = handleCommand( intent );
+
+        if ( Service.START_STICKY == result && !sInForeground ) {
+            startForeground();
+        }
+
+        return result;
     }
 
     private int handleCommand( Intent intent )
@@ -375,6 +418,12 @@ public class BTService extends XWService {
                 BTAction cmd = BTAction.values()[ordinal];
                 Log.i( TAG, "onStartCommand; cmd=%s", cmd.toString() );
                 switch( cmd ) {
+                case START_FOREGROUND:
+                    stopForeground( true ); // Kill the notification
+                    // FALLTHRU
+                case START_BACKGROUND:
+                    break;
+
                 case CLEAR:
                     String[] btAddrs = intent.getStringArrayExtra( CLEAR_KEY );
                     clearDevs( btAddrs );
@@ -450,11 +499,21 @@ public class BTService extends XWService {
         return result;
     } // handleCommand()
 
-    @Override
-    protected void onHandleWork( Intent intent )
+    private void startForeground()
     {
-        Log.e( TAG, "onHandleWork(%s)", intent );
-        /*(void)*/handleCommand( intent );
+        Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
+        PendingIntent pendIntent = PendingIntent
+            .getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
+        Notification notification =
+            new NotificationCompat.Builder(this, Utils.CHANNEL_ID)
+            .setSmallIcon( R.drawable.notify )
+            .setContentTitle( BTService.class.getSimpleName() )
+            .setContentText("listening for bluetooth messages...")
+            .setContentIntent(pendIntent)
+            .build();
+
+        Log.d( TAG, "calling startForeground()" );
+        startForeground( 1337, notification );
     }
 
     private class BTListenerThread extends Thread {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 086c6cff3..16077063c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2665,6 +2665,12 @@ public class GamesListDelegate extends ListDelegateBase
         return intent;
     }
 
+    public static Intent makeBackgroundIntent( Context context )
+    {
+        Intent intent = makeSelfIntent( context );
+        return intent;
+    }
+
     public static Intent makeRowidIntent( Context context, long rowid )
     {
         Intent intent = makeSelfIntent( context );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 8082adaef..b89c623eb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
-import android.support.v4.app.JobIntentService;
 import android.text.TextUtils;
 
 import junit.framework.Assert;
@@ -201,10 +200,9 @@ public class RelayService extends XWService
         Log.d( TAG, "startService(%s)", intent );
 
         if ( false ) {
-            // requires asking for Manifest.permission.FOREGROUND_SERVICE
             context.startForegroundService( intent );
         } else {
-            JobIntentService.enqueueWork( context, RelayService.class, 1112, intent );
+            context.startService( intent );
         }
     }
 
@@ -391,13 +389,6 @@ public class RelayService extends XWService
         super.onDestroy();
     }
 
-    @Override
-    protected void onHandleWork( Intent intent )
-    {
-        Log.e( TAG, "onHandleWork(%s)", intent );
-        handleCommand( intent );
-    }
-
     // NetStateCache.StateChangedIf interface
     public void onNetAvail( boolean nowAvailable )
     {
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 96f64f19b..8bcfbf672 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
@@ -84,7 +84,7 @@ public class Utils {
     private static final String TAG = Utils.class.getSimpleName();
     public static final int TURN_COLOR = 0x7F00FF00;
 
-    private static final String CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
+    static final String CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
 
     private static final String DB_PATH = "XW_GAMES";
     private static final String HIDDEN_PREFS = "xwprefs_hidden";
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 307b1230f..7927c4f65 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -94,16 +94,23 @@ public class XWApp extends Application implements LifecycleObserver {
         }
         UpdateCheckReceiver.restartTimer( this );
 
-        BTService.startService( this );
         RelayService.startService( this );
         GCMIntentService.init( this );
         WiDirWrapper.init( this );
     }
 
     @OnLifecycleEvent(ON_ANY)
-    public void onAny(LifecycleOwner source, Lifecycle.Event event)
+    public void onAny( LifecycleOwner source,  Lifecycle.Event event )
     {
-        Log.d( TAG, "onAny(%s, %s)", source, event );
+        Log.d( TAG, "onAny(%s)", event );
+        switch( event ) {
+        case ON_RESUME:
+            BTService.onAppToForeground( this );
+            break;
+        case ON_STOP:
+            BTService.onAppToBackground( this );
+            break;
+        }
     }
 
     // This is called on emulator only, but good for ensuring no memory leaks
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index bd045895a..62e680abf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -23,9 +23,7 @@ package org.eehouse.android.xw4;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.IBinder;
-import android.support.v4.app.JobIntentService;
 
 import junit.framework.Assert;
 
@@ -39,7 +37,7 @@ import org.eehouse.android.xw4.jni.UtilCtxtImpl;
 import java.util.HashSet;
 import java.util.Set;
 
-abstract class XWService extends JobIntentService {
+abstract class XWService extends Service {
     private static final String TAG = XWService.class.getSimpleName();
     public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
 
@@ -48,21 +46,10 @@ abstract class XWService extends JobIntentService {
 
     private UtilCtxt m_utilCtxt;
 
-    // @Override
-    // public IBinder onBind( Intent intent )
-    // {
-    //     IBinder result = null;
-    //     if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
-    //         result = super.onBind( intent );
-    //     }
-    //     return result;
-    // }
-
     @Override
-    protected void onHandleWork(Intent intent)
+    public IBinder onBind( Intent intent )
     {
-        Log.e( TAG, "%s.onHandleWork(%s); dropping!!!", getClass().getSimpleName(),
-               intent );
+        return null;
     }
 
     public final static void setListener( MultiService.MultiEventListener li )

From f8e15bd3a0406c8917d922a2381a0d08c13576ec Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Fri, 23 Nov 2018 08:21:52 -0800
Subject: [PATCH 008/145] add explanation for foreground service notification

---
 .../org/eehouse/android/xw4/GamesListDelegate.java  | 13 +++++++++++++
 .../android/app/src/main/res/values/common_rsrc.xml |  1 +
 xwords4/android/app/src/main/res/values/strings.xml |  8 ++++++++
 3 files changed, 22 insertions(+)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 16077063c..1f14fe7f2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -86,6 +86,7 @@ public class GamesListDelegate extends ListDelegateBase
 
     private static final String RELAYIDS_EXTRA = "relayids";
     private static final String ROWID_EXTRA = "rowid";
+    private static final String BACKGROUND_EXTRA = "bkgrnd";
     private static final String GAMEID_EXTRA = "gameid";
     private static final String REMATCH_ROWID_EXTRA = "rm_rowid";
     private static final String REMATCH_DICT_EXTRA = "rm_dict";
@@ -2267,6 +2268,16 @@ public class GamesListDelegate extends ListDelegateBase
         }
     }
 
+    private void tryBackgroundIntent( Intent intent )
+    {
+        if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) {
+            makeNotAgainBuilder( R.string.not_again_btservice,
+                                 R.string.key_notagain_btservice,
+                                 Action.OPEN_GAME )
+                .show();
+        }
+    }
+
     private void askDefaultName()
     {
         String name = CommonPrefs.getDefaultPlayerName( m_activity, 0, true );
@@ -2481,6 +2492,7 @@ public class GamesListDelegate extends ListDelegateBase
         startRematch( intent );
         tryAlert( intent );
         tryNFCIntent( intent );
+        tryBackgroundIntent( intent );
     }
 
     private void doOpenGame( Object[] params )
@@ -2668,6 +2680,7 @@ public class GamesListDelegate extends ListDelegateBase
     public static Intent makeBackgroundIntent( Context context )
     {
         Intent intent = makeSelfIntent( context );
+        intent.putExtra( BACKGROUND_EXTRA, true );
         return intent;
     }
 
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index b776b8be4..389e79ddb 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -136,6 +136,7 @@
   <string name="key_invite_multi">key_invite_multi</string>
   <string name="key_na_rematch_two_only">key_notagain_rematch_two_only</string>
   <string name="key_notagain_dfltname">key_notagain_dfltname</string>
+  <string name="key_notagain_btservice">key_notagain_btservice</string>
 
   <string name="key_na_comms_bt">key_na_comms_bt</string>
   <string name="key_na_comms_p2p">key_na_comms_p2p</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 7427f169a..d330d7eda 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2641,6 +2641,14 @@
   player name \"%1$s\". Would you like to personalize with your own
   name before you create this game?</string>
 
+  <string name="not_again_btservice">This notification is present
+  whenever CrossWords is ready to receive Bluetooth messages in the
+  background. This readiness has a slight impact on battery. If you
+  don\'t want to listen in the background disable the \"Enable
+  Background Listener\" preference. CrossWords will still receive
+  Bluetooth moves and invitations while in the foreground, but any
+  sent while it\'s in the background will be lost.</string>
+
   <string name="no_invites">This game has sent no invitations</string>
 
   <string name="disable_dualpane">Disable side-by-side</string>

From eb6831ea1284b15948398dfce80759c64a607b91 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Fri, 23 Nov 2018 09:47:18 -0800
Subject: [PATCH 009/145] add bt-in-background preference

And clear it from a button in the alert that's posted when the
foreground service notification is selected.
---
 .../main/java/org/eehouse/android/xw4/BTService.java   |  4 +++-
 .../main/java/org/eehouse/android/xw4/DlgDelegate.java |  1 +
 .../org/eehouse/android/xw4/GamesListDelegate.java     | 10 ++++++++--
 .../src/main/java/org/eehouse/android/xw4/XWPrefs.java | 10 ++++++++++
 .../android/app/src/main/res/values/common_rsrc.xml    |  1 +
 xwords4/android/app/src/main/res/values/strings.xml    |  5 +++++
 xwords4/android/app/src/main/res/xml/xwprefs.xml       |  5 +++++
 7 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 8b1f3a9b1..e969812f0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -351,7 +351,9 @@ public class BTService extends XWService {
         Log.d( TAG, "startService(%s)", intent );
 
         if ( ! sInForeground && canRunForegroundService() ) {
-            context.startForegroundService( intent );
+            if ( XWPrefs.getBTBackgroundEnabled( context ) ) {
+                context.startForegroundService( intent );
+            }
         } else if ( sInForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
             context.startService( intent );
         }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index 8b13e3b91..c805f4999 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -57,6 +57,7 @@ public class DlgDelegate {
         SET_HIDE_NEWGAME_BUTTONS,
         DWNLD_LOC_DICT,
         NEW_GAME_DFLT_NAME,
+        DISABLE_BT_BACK,
 
         // BoardDelegate
         UNDO_LAST_ACTION,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 1f14fe7f2..73a6e9395 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1360,6 +1360,10 @@ public class GamesListDelegate extends ListDelegateBase
                                      true );
             break;
 
+        case DISABLE_BT_BACK:
+            XWPrefs.setBTBackgroundEnabled( m_activity, false );
+            break;
+
         default:
             handled = super.onPosButton( action, params );
         }
@@ -2271,9 +2275,11 @@ public class GamesListDelegate extends ListDelegateBase
     private void tryBackgroundIntent( Intent intent )
     {
         if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) {
+            ActionPair pair = new ActionPair( Action.DISABLE_BT_BACK,
+                                              R.string.disable_bt_back );
             makeNotAgainBuilder( R.string.not_again_btservice,
-                                 R.string.key_notagain_btservice,
-                                 Action.OPEN_GAME )
+                                 R.string.key_notagain_btservice )
+                .setActionPair( pair )
                 .show();
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 4de7cb416..fafe5208e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -52,6 +52,16 @@ public class XWPrefs {
         setPrefsBoolean( context, R.string.key_enable_sms, enabled );
     }
 
+    public static void setBTBackgroundEnabled( Context context, boolean enabled )
+    {
+        setPrefsBoolean( context, R.string.key_btback_enabled, enabled );
+    }
+
+    public static boolean getBTBackgroundEnabled( Context context )
+    {
+        return getPrefsBoolean( context, R.string.key_btback_enabled, true );
+    }
+
     public static boolean getDebugEnabled( Context context )
     {
         return getPrefsBoolean( context, R.string.key_enable_debug, false );
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 389e79ddb..5d8eef505 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -61,6 +61,7 @@
   <string name="key_notify_sound">key_notify_sound</string>
   <string name="key_disable_relay">key_disable_relay</string>
   <string name="key_notify_vibrate">key_notify_vibrate</string>
+  <string name="key_btback_enabled">key_btback_enabled</string>
   <string name="key_enable_sms">key_enable_sms</string>
   <string name="key_enable_p2p">key_enable_p2p</string>
   <string name="key_network_behavior">key_network_behavior</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index d330d7eda..6ab747561 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2026,6 +2026,9 @@
     <string name="title_enable_p2p">Enable WiFi Direct</string>
     <string name="summary_enable_p2p">Experimental, uses lots of battery</string>
 
+    <string name="title_btback_enabled">Enable background Bluetooth</string>
+    <string name="summary_btback_enabled">Always listen for Bluetooth messages</string>
+
     <!--  -->
     <string name="confirm_sms_title">Confirm your SMS plan</string>
     <!--  -->
@@ -2649,6 +2652,8 @@
   Bluetooth moves and invitations while in the foreground, but any
   sent while it\'s in the background will be lost.</string>
 
+  <string name="disable_bt_back">Disable Background</string>
+
   <string name="no_invites">This game has sent no invitations</string>
 
   <string name="disable_dualpane">Disable side-by-side</string>
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index 8d6204d6d..fdb679770 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -335,6 +335,11 @@
                         android:summary="@string/notify_other_summary"
                         android:defaultValue="false"
                         />
+    <CheckBoxPreference android:key="@string/key_btback_enabled"
+                        android:title="@string/title_btback_enabled"
+                        android:summary="@string/summary_btback_enabled"
+                        android:defaultValue="true"
+                        />
     <CheckBoxPreference android:key="@string/key_enable_p2p"
                         android:title="@string/title_enable_p2p"
                         android:summary="@string/summary_enable_p2p"

From 88fe2739c1e93df44deef48da0287ccb842f865d Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Sat, 24 Nov 2018 13:04:14 -0800
Subject: [PATCH 010/145] fix crashes (NPE and RelayService trying to run in
 background)

Still need to figure out what RelayService does. It needn't run for long
except where GCM isn't present.
---
 .../org/eehouse/android/xw4/BTService.java    | 21 +++++++++++++------
 .../eehouse/android/xw4/OnBootReceiver.java   |  4 +++-
 .../org/eehouse/android/xw4/RelayService.java | 13 +++++++++---
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index e969812f0..a58d03898 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -234,7 +234,8 @@ public class BTService extends XWService {
 
     private static void onAppStateChange( Context context, boolean inForeground )
     {
-        if ( sInForeground == null || sInForeground != inForeground ) {
+        Log.d( TAG, "onAppStateChange(inForeground=%b)", inForeground );
+        if ( null == sInForeground || inForeground() != inForeground ) {
             sInForeground = inForeground;
 
             Intent intent =
@@ -245,6 +246,11 @@ public class BTService extends XWService {
         }
     }
 
+    private static boolean inForeground()
+    {
+        return sInForeground != null && sInForeground;
+    }
+
     static void onAppToForeground( Context context )
     {
         onAppStateChange( context, true );
@@ -348,14 +354,17 @@ public class BTService extends XWService {
 
     private static void startService( Context context, Intent intent )
     {
-        Log.d( TAG, "startService(%s)", intent );
+        boolean inForeground = inForeground();
+        Log.d( TAG, "startService(%s); inForeground = %b", intent, inForeground );
 
-        if ( ! sInForeground && canRunForegroundService() ) {
+        if ( ! inForeground && canRunForegroundService() ) {
             if ( XWPrefs.getBTBackgroundEnabled( context ) ) {
                 context.startForegroundService( intent );
             }
-        } else if ( sInForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
+        } else if ( inForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
             context.startService( intent );
+        } else {
+            Log.d( TAG, "startService(); not starting" );
         }
     }
 
@@ -399,7 +408,7 @@ public class BTService extends XWService {
     {
         int result = handleCommand( intent );
 
-        if ( Service.START_STICKY == result && !sInForeground ) {
+        if ( Service.START_STICKY == result && ! inForeground() ) {
             startForeground();
         }
 
@@ -514,7 +523,7 @@ public class BTService extends XWService {
             .setContentIntent(pendIntent)
             .build();
 
-        Log.d( TAG, "calling startForeground()" );
+        Log.d( TAG, "calling service.startForeground()" );
         startForeground( 1337, notification );
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
index 3a1088efe..75525e924 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
@@ -30,10 +30,12 @@ public class OnBootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive( Context context, Intent intent )
     {
-        if ( null != intent && null != intent.getAction()
+        if ( null != intent
+             && null != intent.getAction()
              && intent.getAction().equals( Intent.ACTION_BOOT_COMPLETED ) ) {
             Log.d( TAG, "got ACTION_BOOT_COMPLETED" );
             startTimers( context );
+            BTService.onAppToBackground( context );
         }
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index b89c623eb..501891edd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -77,6 +77,8 @@ public class RelayService extends XWService
 
     private static final String CMD_STR = "CMD";
 
+    private static Boolean sInForeground;
+
     private static enum MsgCmds { INVALID,
                                   PROCESS_GAME_MSGS,
                                   PROCESS_DEV_MSGS,
@@ -188,6 +190,11 @@ public class RelayService extends XWService
         enabledChanged( context );
     }
 
+    private static boolean inForeground()
+    {
+        return sInForeground != null && sInForeground;
+    }
+
     public static void startService( Context context )
     {
         Log.i( TAG, "startService()" );
@@ -199,10 +206,10 @@ public class RelayService extends XWService
     {
         Log.d( TAG, "startService(%s)", intent );
 
-        if ( false ) {
-            context.startForegroundService( intent );
-        } else {
+        if ( inForeground() || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
             context.startService( intent );
+        } else {
+            Log.d( TAG, "startService(); not starting" );
         }
     }
 

From 988ac55eaa046ae447a5998c8425950cf5151918 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 27 Nov 2018 10:06:38 -0800
Subject: [PATCH 011/145] tweak apk-cmp script

---
 xwords4/android/scripts/apk-cmp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/scripts/apk-cmp.py b/xwords4/android/scripts/apk-cmp.py
index 06ff387cf..379175ec2 100755
--- a/xwords4/android/scripts/apk-cmp.py
+++ b/xwords4/android/scripts/apk-cmp.py
@@ -105,7 +105,7 @@ def compare( apks, apkData, indices ):
                 printDiff( apks, key )
             index += 1
     if 0 != same:
-        print "(skipped {same} files)".format(same=same)
+        print "({same} identical files skipped)".format(same=same)
 
 def main():
     apks = []

From 843c95e7ae7e301896815821c2990ca24bbb5d72 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 27 Nov 2018 11:27:18 -0800
Subject: [PATCH 012/145] new icon for omnipresent BTService notification

---
 xwords4/android/app/build.gradle                  |   1 +
 .../java/org/eehouse/android/xw4/BTService.java   |   2 +-
 .../src/main/res/drawable/notify_btservice.png    | Bin 0 -> 313 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 xwords4/android/app/src/main/res/drawable/notify_btservice.png

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index b48d1b914..21e7193ae 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -230,6 +230,7 @@ task copyStrings(type: Exec) {
 
 task ndkSetup(type: Exec) {
     workingDir '../'
+    // remove ', "--arm-only"' for Genymotion builds
     commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
 }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index a58d03898..1350edd28 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -517,7 +517,7 @@ public class BTService extends XWService {
             .getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
         Notification notification =
             new NotificationCompat.Builder(this, Utils.CHANNEL_ID)
-            .setSmallIcon( R.drawable.notify )
+            .setSmallIcon( R.drawable.notify_btservice )
             .setContentTitle( BTService.class.getSimpleName() )
             .setContentText("listening for bluetooth messages...")
             .setContentIntent(pendIntent)
diff --git a/xwords4/android/app/src/main/res/drawable/notify_btservice.png b/xwords4/android/app/src/main/res/drawable/notify_btservice.png
new file mode 100644
index 0000000000000000000000000000000000000000..99209ad54c28cdc894b71a142c34128a1f59581a
GIT binary patch
literal 313
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDD3?#L31Vw-pXMj(LD+5FN|NsAiJlpFZrGOM;
zNswPKgTu2MX&_FLx4R2N2dk_HNO^%rWHAGSp&1A>&U)^o02E{|@$_|Nf5a^<ETJD@
z<=GDuTIuQH7@~20?ImlzW&<9!gxy(M8%tl-9twD-pjw^gcX8$O7g2tZ_DKaQH(s^Y
z94f41WjMDw!!>TPd&Y|Yhu=)JV&VVNz~}hLbb(L0&1F$JHkBK*dG_(X`?SK~MBTkh
z6TYg6xbj;#T(h>45IESotoXu&?H115yZX1~OfUT_R3fF3VH@^Wt8=#+bNOAKIVTN_
y*Ys-dx3_jH>5%Kr*PeV_X+cGhY~1tzSNN5*>i?cLU!V(gG=rzBpUXO@geCxT1Z-&l

literal 0
HcmV?d00001


From 7eb278033ab552876ed0040355354c2cbe5dd8a7 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 19:20:43 -0800
Subject: [PATCH 013/145] revert change setting notifiction priority low

---
 .../android/app/src/main/java/org/eehouse/android/xw4/Utils.java | 1 -
 1 file changed, 1 deletion(-)

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 8bcfbf672..03d8dc8f1 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
@@ -264,7 +264,6 @@ public class Utils {
         Notification notification = new NotificationCompat.Builder( context, CHANNEL_ID )
             .setContentIntent( pi )
             .setSmallIcon( R.drawable.notify )
-            .setPriority(NotificationCompat.PRIORITY_LOW)
             //.setTicker(body)
             //.setWhen(time)
             .setAutoCancel( true )

From fc699caaa8630757b9bc7a7bcb807169b906349a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 19:27:32 -0800
Subject: [PATCH 014/145] ensure channel id always setup before use

---
 .../java/org/eehouse/android/xw4/BTService.java    |  2 +-
 .../main/java/org/eehouse/android/xw4/Utils.java   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 1350edd28..dc1f985b0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -516,7 +516,7 @@ public class BTService extends XWService {
         PendingIntent pendIntent = PendingIntent
             .getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
         Notification notification =
-            new NotificationCompat.Builder(this, Utils.CHANNEL_ID)
+            new NotificationCompat.Builder( this, Utils.getChannelId(this) )
             .setSmallIcon( R.drawable.notify_btservice )
             .setContentTitle( BTService.class.getSimpleName() )
             .setContentText("listening for bluetooth messages...")
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 03d8dc8f1..f80ff4018 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
@@ -84,7 +84,7 @@ public class Utils {
     private static final String TAG = Utils.class.getSimpleName();
     public static final int TURN_COLOR = 0x7F00FF00;
 
-    static final String CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
+    private static final String _CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
 
     private static final String DB_PATH = "XW_GAMES";
     private static final String HIDDEN_PREFS = "xwprefs_hidden";
@@ -241,8 +241,6 @@ public class Utils {
                                          String title, String body,
                                          int id )
     {
-        makeNotificationChannel( context );
-
         /* nextRandomInt: per this link
            http://stackoverflow.com/questions/10561419/scheduling-more-than-one-pendingintent-to-same-activity-using-alarmmanager
            one way to avoid getting the same PendingIntent for similar
@@ -261,7 +259,8 @@ public class Utils {
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
-        Notification notification = new NotificationCompat.Builder( context, CHANNEL_ID )
+        Notification notification =
+            new NotificationCompat.Builder( context, getChannelId(context) )
             .setContentIntent( pi )
             .setSmallIcon( R.drawable.notify )
             //.setTicker(body)
@@ -624,7 +623,7 @@ public class Utils {
     }
 
     private static boolean sChannelMade = false;
-    private static void makeNotificationChannel( Context context )
+    static String getChannelId( Context context )
     {
         if ( !sChannelMade ) {
             sChannelMade = true;
@@ -633,9 +632,9 @@ public class Utils {
                     context.getSystemService( Context.NOTIFICATION_SERVICE );
 
                 String channelDescription = "XWORDS Default Channel";
-                NotificationChannel channel = notMgr.getNotificationChannel( CHANNEL_ID );
+                NotificationChannel channel = notMgr.getNotificationChannel( _CHANNEL_ID );
                 if ( channel == null ) {
-                    channel = new NotificationChannel( CHANNEL_ID, channelDescription,
+                    channel = new NotificationChannel( _CHANNEL_ID, channelDescription,
                                                        NotificationManager.IMPORTANCE_LOW );
                     // channel.setLightColor(Color.GREEN);
                     channel.enableVibration( true );
@@ -643,5 +642,6 @@ public class Utils {
                 }
             }
         }
+        return _CHANNEL_ID;
     }
 }

From ce3cb62f0243d2db71f563483842b2975cd3e84a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 19:35:24 -0800
Subject: [PATCH 015/145] add reversed version of btservice notification icon

For the Dbg variant to match its normal notification icon.
---
 .../src/xw4d/res/drawable/notify_btservice.png    | Bin 0 -> 472 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 xwords4/android/app/src/xw4d/res/drawable/notify_btservice.png

diff --git a/xwords4/android/app/src/xw4d/res/drawable/notify_btservice.png b/xwords4/android/app/src/xw4d/res/drawable/notify_btservice.png
new file mode 100644
index 0000000000000000000000000000000000000000..43be5ea612a7932b2b38786951463905023e31b1
GIT binary patch
literal 472
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDD3?#L31Vw-pOS+@4BLl<6e(pbstU$g(vPY0F
z14ES>14Ba#1H&(%P{RubhEkx$R|yOZRx=nF#0%!^3bX-A@C5jTxH2%L1DXH-|7Tzb
zeOvZC6v$yL3GxeOaCmkj4a7<Ec6VVG<nj3g<Zu>vL>4nJ7@C1F<E-aS3P3^j5>H=O
z_D9^Z%nF**yVtx03N80^aSYKozxI+L-(dwF)&TL9p+_~Xio0T(&gA+frJlL6boW)x
zpHq&isimC=^SAk!+QaZ*i{8$wDm(aQL~@IEAI~m3@L=Pw2&;l<mfL;H6{KG6l6WFx
z;$htJ=j2YOAl}JL+F5%=KXk<N`>?fGf01S4kY(NC?0j}9GfNFq!N!G*TZ>PmO_upu
zn6vy%^Q8SuF9T90%>K;qMS)*#L*<A60yp;Vd-%uyAphb6H*SAEyq5*&WYrSah?11V
zl2ohYqEsNoU}Ruup=)TUYh)2(XlZ3+Xa(dNSXdbtOy?;yM$wR)pOTqYiCe?7z?1zz
O4Gf;HelF{r5}E+njhU<f

literal 0
HcmV?d00001


From 3f7d36e214997d9692a363c07ab4ced68e52b400 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 20:14:49 -0800
Subject: [PATCH 016/145] trying to fix travis build

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 132ede1e8..605f42385 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: android
 jdk: oraclejdk8
 env:
   global:
-  - ANDROID_TARGET=android-15
+  - ANDROID_TARGET=android-14
   - ANDROID_ABI=armeabi-v7a,x86
   - secure: d8PwteM+xp1IRU3QkvmHtxh+1Ta9n/kl/SJ3EZa3iColVVXY1etzjY3cKrEGKKMJuI4be30kPzvNw9/BVTawDpnU9/NtWqykJ8QHXNWnZIvUQ/kxHBS1DbcstmcYU9gvR83EFb8BT+Y9frpNfMcZDlSvBpEGqDQEPmxiDzSmjdUmJJQWStncxL9pE+lCdM6lHBgtfYoMMiqCQF/DxkQisjyUVF4mbTGuT9JOOWjVsTGPA7ehzsWDHoJ3p2ai8UKHAYucUWZcTt4rkq9l35ExvgKd3L8luk8U3X3Fk9yzVhPJC56T0XNbNrsQ2W7/7oGRv6EQFV3aKDZimJ7CVjBcEjZmPxeUVvCsMW8XB41ZvYcy6xsjF96oyjn1gb0r/2mZbTaWP0izSTwMYZ5vFNKUamDtRZgrneD0lfvXgfTzirrCU7FqO2RH7ZK5PQpSgSoZxKsKyeyFPEa2ihivc95rz1MS6mamle9wrIlSAgEGcaZMIYvKiOnCLk7CZCKuwm2dhYPgzCHW3PUopay59BBwMsSqWpxsiHEr5jYGpb0pHGbzPTJNUpg1LNQX5eMQOMlEt7rfpoC7JG24hR9vxl4Yf9LhxYlSwUiPy7TYHdbA0kUS68skfzxU6+ekWZF2QFM+L4vWCYmEHDy7n+I0df+PavycgNW989ROlAKhQjtMyqM=
 android:
@@ -10,7 +10,7 @@ android:
   - tools
   - platform-tools
   - build-tools-27.0.3
-  - android-23
+  - android-26
   licenses:
   - android-sdk-preview-license-.+
   - android-sdk-license-.+

From b2bf3a6e806d797023b04bd9b38246670f962d57 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 20:38:43 -0800
Subject: [PATCH 017/145] move google() above maven (to fix travis?)

---
 xwords4/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 21e7193ae..e49c1dab1 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -23,8 +23,8 @@ if ( FABRIC_API_KEY && hasProperty('useCrashlytics') ) {
     apply plugin: 'io.fabric'
 }
 repositories {
-    maven { url 'https://maven.fabric.io/public' }
     google()
+    maven { url 'https://maven.fabric.io/public' }
 }
 
 android {

From 91828cb851d2157c74745dd12122c41d771798fc Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 28 Nov 2018 21:21:48 -0800
Subject: [PATCH 018/145] add more google()

still trying to fix travis builds
---
 xwords4/android/build.gradle               | 3 ++-
 xwords4/android/scripts/build_with_lint.sh | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100755 xwords4/android/scripts/build_with_lint.sh

diff --git a/xwords4/android/build.gradle b/xwords4/android/build.gradle
index de085ae7f..85b486c88 100644
--- a/xwords4/android/build.gradle
+++ b/xwords4/android/build.gradle
@@ -2,9 +2,9 @@
 
 buildscript {
     repositories {
+        google()
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
-        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
@@ -17,6 +17,7 @@ buildscript {
 
 allprojects {
     repositories {
+        google()
         jcenter()
     }
 }
diff --git a/xwords4/android/scripts/build_with_lint.sh b/xwords4/android/scripts/build_with_lint.sh
deleted file mode 100755
index 46fc23078..000000000
--- a/xwords4/android/scripts/build_with_lint.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# invoke the build process with javac lint features enabled
-
-ant "-Djava.compilerargs=-Xlint:unchecked -Xlint:deprecation" clean debug

From 9eec5c37ef87b59e64d296ccaf7cda169abddf0f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 09:30:14 -0800
Subject: [PATCH 019/145] fix path name string causing JNI crash on emulator

---
 xwords4/android/jni/utilwrapper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index 4e948a906..03eab0bf4 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -702,10 +702,10 @@ and_dutil_deviceRegistered( XW_DUtilCtxt* duc, DevIDType typ,
                             const XP_UCHAR* idRelay )
 {
     DUTIL_CBK_HEADER( "deviceRegistered",
-                      "(L" PKG_PATH("jni/UtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
+                      "(L" PKG_PATH("jni/DUtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
     jstring jstr = (*env)->NewStringUTF( env, idRelay );
     jobject jtyp = intToJEnum( env, typ, 
-                               PKG_PATH("jni/UtilCtxt$DevIDType") );
+                               PKG_PATH("jni/DUtilCtxt$DevIDType") );
     (*env)->CallVoidMethod( env, dutil->jdutil, mid, jtyp, jstr );
     deleteLocalRefs( env, jstr, jtyp, DELETE_NO_REF );
     DUTIL_CBK_TAIL();

From b23b83700963a275c74f9eae1bec1d179ab2975c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 09:30:14 -0800
Subject: [PATCH 020/145] fix path name string causing JNI crash on emulator

And catch NPE that also seems to be emulator-only
---
 .../src/main/java/org/eehouse/android/xw4/WiDirService.java   | 2 ++
 xwords4/android/jni/utilwrapper.c                             | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index 693647426..e7695401e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -214,6 +214,8 @@ public class WiDirService extends XWService {
             sHavePermission = false;
         } catch ( SecurityException se ) {               // perm not in manifest
             sHavePermission = false;
+        } catch ( NullPointerException npe ) { // Seeing this on Oreo emulator
+            sHavePermission = false;
         }
     }
 
diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index 4e948a906..03eab0bf4 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -702,10 +702,10 @@ and_dutil_deviceRegistered( XW_DUtilCtxt* duc, DevIDType typ,
                             const XP_UCHAR* idRelay )
 {
     DUTIL_CBK_HEADER( "deviceRegistered",
-                      "(L" PKG_PATH("jni/UtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
+                      "(L" PKG_PATH("jni/DUtilCtxt$DevIDType") ";Ljava/lang/String;)V" );
     jstring jstr = (*env)->NewStringUTF( env, idRelay );
     jobject jtyp = intToJEnum( env, typ, 
-                               PKG_PATH("jni/UtilCtxt$DevIDType") );
+                               PKG_PATH("jni/DUtilCtxt$DevIDType") );
     (*env)->CallVoidMethod( env, dutil->jdutil, mid, jtyp, jstr );
     deleteLocalRefs( env, jstr, jtyp, DELETE_NO_REF );
     DUTIL_CBK_TAIL();

From 0a0107dd7fdc5eaadc631141b10b3054fd8d10c5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 09:35:08 -0800
Subject: [PATCH 021/145] fix to contact relay in foreground on Oreo+

Background still needs a lot of work.
---
 .../org/eehouse/android/xw4/RelayService.java | 27 ++++++++++++++++++-
 .../java/org/eehouse/android/xw4/XWApp.java   |  2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 501891edd..ada0eeeb0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -192,7 +192,32 @@ public class RelayService extends XWService
 
     private static boolean inForeground()
     {
-        return sInForeground != null && sInForeground;
+        boolean result = sInForeground != null && sInForeground;
+        Log.d( TAG, "inForeground() => %b", result );
+        return result;
+    }
+
+    private static void onAppStateChange( Context context, boolean inForeground )
+    {
+        Log.d( TAG, "onAppStateChange(inForeground=%b)", inForeground );
+        if ( null == sInForeground || inForeground() != inForeground ) {
+            sInForeground = inForeground;
+            // Intent intent =
+            //     getIntentTo( context,
+            //                  inForeground ? BTAction.START_FOREGROUND
+            //                  : BTAction.START_BACKGROUND );
+            // startService( context, intent );
+        }
+    }
+
+    static void onAppToForeground( Context context )
+    {
+        onAppStateChange( context, true );
+    }
+
+    static void onAppToBackground( Context context )
+    {
+        onAppStateChange( context, false );
     }
 
     public static void startService( Context context )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 7927c4f65..cbbc2e1dc 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -106,9 +106,11 @@ public class XWApp extends Application implements LifecycleObserver {
         switch( event ) {
         case ON_RESUME:
             BTService.onAppToForeground( this );
+            RelayService.onAppToForeground( this );
             break;
         case ON_STOP:
             BTService.onAppToBackground( this );
+            RelayService.onAppToBackground( this );
             break;
         }
     }

From 813669fafb4273a1c88ed7ba7bad8841da55e7d0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 12:55:35 -0800
Subject: [PATCH 022/145] include X86 native library again

It's a pain to have to change code to run in Genymotion, and to have
upgrade not testable using Genymotion. Consider verting this change
before next release.
---
 xwords4/android/app/build.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index e49c1dab1..21bc531e4 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -231,7 +231,12 @@ task copyStrings(type: Exec) {
 task ndkSetup(type: Exec) {
     workingDir '../'
     // remove ', "--arm-only"' for Genymotion builds
-    commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
+
+    // I'm putting ARM back for a while. It's too much trouble having
+    // builds, including those built by travis, that don't run on the
+    // emulator. Maybe remove this change before each release?
+    commandLine "./scripts/ndksetup.sh", "--with-clang"
+    // commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
 }
 
 task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {

From 3fe1289a8db5850497909ff47da44c64d4ed4eb5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 17:07:14 -0800
Subject: [PATCH 023/145] include new permission to install third-party apks

Fixed upgrade of Dbg variant not working on Oreo.
---
 xwords4/android/app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index ccc7396e2..db24701c9 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
   <!-- Required for wifi-direct -->
   <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> -->

From af7b9fcba00d71c20034278c6dddcc491c888c2b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 18:02:06 -0800
Subject: [PATCH 024/145] Always call startForeground after
 startForegroundService

It's an error to e.g. stopSelf() without having called startForeground,
so do it even when about to exit.
---
 .../org/eehouse/android/xw4/BTService.java    | 63 ++++++++++++++-----
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index dc1f985b0..11234f7e4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -56,6 +56,25 @@ import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+// Notes on running under Oreo
+//
+// The goal is to be running only when useful: when user wants to play via
+// BT. Ideally we'd not run the foreground service when BT is turned off, but
+// there's no way to be notified of its being turned on without installing a
+// receiver. So *something* has to be running, whether it's listening on a BT
+// socket or hosting the receiver. Might as well be the socket listener. Users
+// who want the service not running when BT's off can turn it off via app
+// preferences. When they try to start a BT game we can note the preference
+// and suggest they change it. And when an invitation sent is not received the
+// sender can be told to suggest to his opponent to turn on the preference.
+//
+// When there's no BT adapter at all (Emulator case) there's no point in
+// starting the service. Let's catch that early.
+//
+// Note also that we need to be careful to NEVER call stopSelf() after calling
+// startForegroundService() until AFTER calling startForeground(). Doing so
+// will cause a crash.
+
 public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
@@ -169,6 +188,7 @@ public class BTService extends XWService {
     private BTMsgSink m_btMsgSink;
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
+    private Notification m_notification; // make once use many
     private static int s_errCount = 0;
 
     public static boolean BTAvailable()
@@ -388,6 +408,8 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        startForegroundIf();
+
         BluetoothAdapter adapter = XWApp.BTSUPPORTED
             ? BluetoothAdapter.getDefaultAdapter() : null;
         if ( null != adapter && adapter.isEnabled() ) {
@@ -406,11 +428,9 @@ public class BTService extends XWService {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
-        int result = handleCommand( intent );
+        startForegroundIf();
 
-        if ( Service.START_STICKY == result && ! inForeground() ) {
-            startForeground();
-        }
+        int result = handleCommand( intent );
 
         return result;
     }
@@ -510,21 +530,30 @@ public class BTService extends XWService {
         return result;
     } // handleCommand()
 
-    private void startForeground()
+    private void startForegroundIf()
     {
-        Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
-        PendingIntent pendIntent = PendingIntent
-            .getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
-        Notification notification =
-            new NotificationCompat.Builder( this, Utils.getChannelId(this) )
-            .setSmallIcon( R.drawable.notify_btservice )
-            .setContentTitle( BTService.class.getSimpleName() )
-            .setContentText("listening for bluetooth messages...")
-            .setContentIntent(pendIntent)
-            .build();
+        if ( ! inForeground() ) {
+            Log.d( TAG, "startForegroundIf(): starting" );
 
-        Log.d( TAG, "calling service.startForeground()" );
-        startForeground( 1337, notification );
+            if ( null == m_notification ) {
+                Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
+                PendingIntent pendIntent = PendingIntent
+                    .getActivity( this, Utils.nextRandomInt(), notifIntent,
+                                  PendingIntent.FLAG_ONE_SHOT );
+                m_notification =
+                    new NotificationCompat.Builder( this, Utils.getChannelId(this) )
+                    .setSmallIcon( R.drawable.notify_btservice )
+                    .setContentTitle( BTService.class.getSimpleName() )
+                    .setContentText("listening for bluetooth messages...")
+                    .setContentIntent(pendIntent)
+                    .build();
+            }
+
+            Log.d( TAG, "calling service.startForeground()" );
+            startForeground( R.string.app_name, m_notification );
+        } else {
+            Log.d( TAG, "startForegroundIf(): NOT starting" );
+        }
     }
 
     private class BTListenerThread extends Thread {

From 683bb384029d2d3b0d84c277a01806fef604d70b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 3 Dec 2018 08:26:47 -0800
Subject: [PATCH 025/145] replace junit's assert with my own

And have it log before throwing. Should be easier to track down asserts
coming from jni callbacks this way than in the C code.
---
 .../org/eehouse/android/xw4/AboutAlert.java   |  1 -
 .../java/org/eehouse/android/xw4/Assert.java  | 58 +++++++++++++++++++
 .../eehouse/android/xw4/BTInviteDelegate.java |  1 -
 .../org/eehouse/android/xw4/BTService.java    |  1 -
 .../org/eehouse/android/xw4/BiDiSockWrap.java |  1 -
 .../org/eehouse/android/xw4/BoardCanvas.java  |  1 -
 .../eehouse/android/xw4/BoardContainer.java   |  1 -
 .../eehouse/android/xw4/BoardDelegate.java    |  1 -
 .../org/eehouse/android/xw4/BoardView.java    |  1 -
 .../org/eehouse/android/xw4/ChatDelegate.java |  1 -
 .../eehouse/android/xw4/CommsTransport.java   |  1 -
 .../android/xw4/ConnStatusHandler.java        |  1 -
 .../android/xw4/ConnViaViewLayout.java        |  1 -
 .../java/org/eehouse/android/xw4/DBAlert.java |  1 -
 .../java/org/eehouse/android/xw4/DBUtils.java |  1 -
 .../org/eehouse/android/xw4/DbgUtils.java     |  1 -
 .../org/eehouse/android/xw4/DelegateBase.java |  1 -
 .../android/xw4/DictBrowseDelegate.java       |  1 -
 .../eehouse/android/xw4/DictLangCache.java    |  1 -
 .../org/eehouse/android/xw4/DictUtils.java    |  1 -
 .../eehouse/android/xw4/DictsDelegate.java    |  1 -
 .../org/eehouse/android/xw4/DisablesItem.java |  1 -
 .../org/eehouse/android/xw4/DlgDelegate.java  |  1 -
 .../eehouse/android/xw4/DlgDelegateAlert.java |  1 -
 .../org/eehouse/android/xw4/DlgState.java     |  1 -
 .../eehouse/android/xw4/DwnldDelegate.java    |  1 -
 .../eehouse/android/xw4/EnableSMSAlert.java   |  1 -
 .../eehouse/android/xw4/ExpiringDelegate.java |  1 -
 .../android/xw4/GameConfigDelegate.java       |  1 -
 .../org/eehouse/android/xw4/GameListItem.java |  1 -
 .../org/eehouse/android/xw4/GameLock.java     |  1 -
 .../org/eehouse/android/xw4/GameUtils.java    |  1 -
 .../android/xw4/GamesListDelegate.java        |  1 -
 .../android/xw4/HeaderWithExpander.java       |  1 -
 .../org/eehouse/android/xw4/HostDelegate.java |  1 -
 .../android/xw4/InviteChoicesAlert.java       |  1 -
 .../eehouse/android/xw4/InviteDelegate.java   |  1 -
 .../org/eehouse/android/xw4/LookupAlert.java  |  1 -
 .../eehouse/android/xw4/LookupAlertView.java  |  1 -
 .../org/eehouse/android/xw4/MainActivity.java |  1 -
 .../org/eehouse/android/xw4/MultiMsgSink.java |  1 -
 .../org/eehouse/android/xw4/MultiService.java |  1 -
 .../eehouse/android/xw4/NagTurnReceiver.java  |  1 -
 .../eehouse/android/xw4/NetLaunchInfo.java    |  1 -
 .../eehouse/android/xw4/NetStateCache.java    |  1 -
 .../org/eehouse/android/xw4/NetUtils.java     |  1 -
 .../eehouse/android/xw4/NotAgainAlert.java    |  1 -
 .../org/eehouse/android/xw4/OkOnlyAlert.java  |  1 -
 .../java/org/eehouse/android/xw4/Perms23.java |  1 -
 .../eehouse/android/xw4/PrefsActivity.java    |  1 -
 .../eehouse/android/xw4/PrefsDelegate.java    |  1 -
 .../android/xw4/RelayInviteDelegate.java      |  1 -
 .../org/eehouse/android/xw4/RelayService.java |  1 -
 .../android/xw4/SMSInviteDelegate.java        |  1 -
 .../org/eehouse/android/xw4/SMSService.java   |  1 -
 .../android/xw4/StudyListDelegate.java        |  1 -
 .../eehouse/android/xw4/TilePickAlert.java    |  1 -
 .../org/eehouse/android/xw4/TilePickView.java |  1 -
 .../java/org/eehouse/android/xw4/Toolbar.java |  1 -
 .../java/org/eehouse/android/xw4/Utils.java   |  1 -
 .../android/xw4/WiDirInviteDelegate.java      |  1 -
 .../org/eehouse/android/xw4/WiDirService.java |  1 -
 .../org/eehouse/android/xw4/XWActivity.java   |  1 -
 .../java/org/eehouse/android/xw4/XWApp.java   |  1 -
 .../android/xw4/XWConnAddrPreference.java     |  1 -
 .../eehouse/android/xw4/XWDialogFragment.java |  1 -
 .../eehouse/android/xw4/XWExpListAdapter.java |  1 -
 .../org/eehouse/android/xw4/XWFragment.java   |  1 -
 .../java/org/eehouse/android/xw4/XWPrefs.java |  1 -
 .../org/eehouse/android/xw4/XWService.java    |  1 -
 .../eehouse/android/xw4/jni/CommsAddrRec.java |  3 +-
 .../eehouse/android/xw4/jni/CurGameInfo.java  |  2 +-
 .../eehouse/android/xw4/jni/DUtilCtxt.java    |  3 +-
 .../eehouse/android/xw4/jni/GameSummary.java  |  3 +-
 .../eehouse/android/xw4/jni/JNIThread.java    |  3 +-
 .../eehouse/android/xw4/jni/JNIUtilsImpl.java |  3 +-
 .../eehouse/android/xw4/jni/LocalPlayer.java  |  3 +-
 .../eehouse/android/xw4/jni/UtilCtxtImpl.java |  1 -
 .../org/eehouse/android/xw4/jni/XwJNI.java    |  3 +-
 .../org/eehouse/android/xw4/loc/LocUtils.java |  2 +-
 .../eehouse/android/xw4/GCMIntentService.java |  1 -
 xwords4/android/scripts/mk_xml.py             |  2 +-
 82 files changed, 68 insertions(+), 88 deletions(-)
 create mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
index a64e659c0..da8820309 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
@@ -33,7 +33,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import java.util.Date;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
new file mode 100644
index 000000000..8f8a62d81
--- /dev/null
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
@@ -0,0 +1,58 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2012 by Eric House (xwords@eehouse.org).  All rights
+ * reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+public class Assert {
+    private static final String TAG = Assert.class.getSimpleName();
+
+    public static void fail() {
+        assertTrue(false);
+    }
+
+    public static void assertFalse(boolean val)
+    {
+        assertTrue(! val);
+    }
+    
+    public static void assertTrue(boolean val) {
+        if (! val) {
+            Log.e( TAG, "firing assert!" );
+            DbgUtils.printStack( TAG );
+            junit.framework.Assert.fail();
+        }
+    }
+
+    public static void assertNotNull( Object val )
+    {
+        assertTrue( val != null );
+    }
+
+    public static void assertNull( Object val )
+    {
+        assertTrue( val == null );
+    }
+
+    public static void assertEquals( Object obj1, Object obj2 )
+    {
+        assertTrue( (obj1 == null && obj2 == null)
+                    || (obj1 != null && obj1.equals(obj2)) );
+    }
+}
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index de9535a06..9a769cb8b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 11234f7e4..fedfe3f87 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -34,7 +34,6 @@ import android.content.Intent;
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
index e2744c9f5..a62fce31e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
@@ -27,7 +27,6 @@ import java.net.Socket;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 public class BiDiSockWrap {
     private static final String TAG = BiDiSockWrap.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
index f58412ae9..217986941 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
@@ -31,7 +31,6 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.CommonPrefs;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
index 19bb03e6c..e2b092f4b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.View.MeasureSpec;
 import android.graphics.Rect;
 
-import junit.framework.Assert;
 
 public class BoardContainer extends ViewGroup {
     private static final String TAG = BoardContainer.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index b2ed17c5d..ba5e64e8f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -49,7 +49,6 @@ import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
index fff413910..5d059fcf8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
@@ -31,7 +31,6 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.BoardHandler;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
index 1219b8d57..f3239e590 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
@@ -40,7 +40,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import android.text.format.DateUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIThread;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
index 4c51b9af5..b486b89fa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
index ac9d8dfeb..efe49c8b2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
@@ -32,7 +32,6 @@ import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
index 2e234e949..d90cbf290 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
@@ -30,7 +30,6 @@ import android.widget.LinearLayout;
 
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
index bdf5d0337..9a3724f54 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
@@ -34,7 +34,6 @@ import org.eehouse.android.xw4.loc.LocUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 public class DBAlert extends XWDialogFragment {
     private static final String TAG = DBAlert.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 035d107e2..700b918a8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -33,7 +33,6 @@ import android.graphics.BitmapFactory;
 import android.os.Environment;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictLoc;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify.InviteMeans;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index db5664334..e1b6f86c1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -33,7 +33,6 @@ import java.util.Formatter;
 import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 144c61b91..66932cfa1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -40,7 +40,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
index 5a165bcf1..05fc4c51e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
@@ -37,7 +37,6 @@ import android.widget.SectionIndexer;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
index b614446b2..9573533a5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
@@ -25,7 +25,6 @@ import android.content.res.Resources;
 import android.os.Handler;
 import android.widget.ArrayAdapter;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
index f354b1e29..cd46b0106 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
@@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.os.Environment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;
 import org.eehouse.android.xw4.jni.XwJNI;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
index 19ede5444..c02d61c19 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
@@ -45,7 +45,6 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
index 6cb9f16ad..9eebd7584 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
@@ -31,7 +31,6 @@ import android.widget.TextView;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
-import junit.framework.Assert;
 
 public class DisablesItem extends LinearLayout {
     private CommsConnType m_type;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index c805f4999..526e26107 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -34,7 +34,6 @@ import android.view.View;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
index f30ad2f1a..8c2266033 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
@@ -31,7 +31,6 @@ import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
index e3ce8f217..850971e10 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
@@ -32,7 +32,6 @@ import java.util.List;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 public class DlgState implements Parcelable {
     private static final String TAG = DlgState.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
index 858787047..df6e900fa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
@@ -34,7 +34,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
index 07548ab49..41760d3c1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
@@ -30,7 +30,6 @@ import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
index 3987291eb..d1c21ca91 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index 81fa89ca2..9c5f1d1ee 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -45,7 +45,6 @@ import android.widget.TextView;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictLangCache.LangsArrayAdapter;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
index ae98e4fab..cb3203c48 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
@@ -33,7 +33,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.GameSummary;
 import org.eehouse.android.xw4.jni.JNIThread;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
index 54b8e1643..85d66310b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
@@ -20,7 +20,6 @@
 
 package org.eehouse.android.xw4;
 
-import junit.framework.Assert;
 
 import java.util.HashMap;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 2d9963ed5..ba3d807d5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -31,7 +31,6 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.view.Display;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommonPrefs;
 import org.eehouse.android.xw4.jni.CommsAddrRec;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 73a6e9395..bae29f46e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -44,7 +44,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.GameChangeType;
 import org.eehouse.android.xw4.DBUtils.GameGroupInfo;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
index fd32744d5..153d01776 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
@@ -27,7 +27,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
index e93665297..f69bd5927 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
@@ -26,7 +26,6 @@ import android.content.Intent;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 class HostDelegate extends DelegateBase {
     private static final String ACTION = "ACTION";
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
index a9ed0250e..0b15bedd7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.util.ArrayList;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index c536cec93..d5c060d06 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -42,7 +42,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class InviteDelegate extends ListDelegateBase
     implements View.OnClickListener,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
index 45df88f55..f1ed332fb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
@@ -26,7 +26,6 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
index 3f48cba0d..e82b12322 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
@@ -36,7 +36,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index d4142fc47..8ea9949f3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -35,7 +35,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
index 0a08833e2..64197516c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
index 5aac018c5..91dbd8390 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
index ba4ea6d33..5327b6c90 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.NeedsNagInfo;
 import org.eehouse.android.xw4.jni.GameSummary;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
index ebc7a99f0..551a24cb5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
@@ -39,7 +39,6 @@ import java.util.Iterator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 101f52059..6c5ed36f5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -29,7 +29,6 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Handler;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
index acf6ac4be..1c07bf43b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
index d12a0cd4e..6e90fb9b3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
index 3a74feacf..317b2cb6f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index 2610d5146..f8b3be7bf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -38,7 +38,6 @@ import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
     
 public class Perms23 {
     private static final String TAG = Perms23.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
index 8c9787c32..816943179 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.v4.app.DialogFragment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
index a64e9dcda..faef1f88b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
@@ -36,7 +36,6 @@ import android.preference.PreferenceScreen;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.loc.LocUtils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
index f8b043aba..8d738b3c2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
@@ -52,7 +52,6 @@ import java.util.Set;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index ada0eeeb0..4934b75d5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -27,7 +27,6 @@ import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.GameUtils.BackMoveResult;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
index e80006550..23942077a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
@@ -36,7 +36,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index 49d26e588..610d1421a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -34,7 +34,6 @@ import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
index db51df1f4..bcf218584 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
@@ -36,7 +36,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.GameSummary;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
index d855a22a1..a45e350df 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
index 4469176f5..6a9d4fc7d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
@@ -38,7 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class TilePickView extends LinearLayout {
     private static final String TAG = TilePickView.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
index 4eded5deb..0ecefa929 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
@@ -35,7 +35,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate;
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 f80ff4018..848da6f3f 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
@@ -74,7 +74,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Perms23.Perm;
 import org.eehouse.android.xw4.jni.CommonPrefs;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
index a1d6343a6..6d39ffe53 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
@@ -30,7 +30,6 @@ import android.widget.TextView;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class WiDirInviteDelegate extends InviteDelegate
     implements WiDirService.DevSetListener {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index e7695401e..600c03770 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -69,7 +69,6 @@ import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
 
 public class WiDirService extends XWService {
     private static final String TAG = WiDirService.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
index 82a8dab89..df83b45fb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
@@ -40,7 +40,6 @@ import android.widget.ListView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 public class XWActivity extends FragmentActivity
     implements Delegator, DlgDelegate.DlgClickNotify {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index cbbc2e1dc..441e3d67b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -35,7 +35,6 @@ import org.eehouse.android.xw4.jni.XwJNI;
 
 import java.util.UUID;
 
-import junit.framework.Assert;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_ANY;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
index de57f1bef..3c63c41a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
@@ -27,7 +27,6 @@ import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
index 2ecd0bf7e..38eac8ea2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
@@ -30,7 +30,6 @@ import android.view.View;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 abstract class XWDialogFragment extends DialogFragment {
     private static final String TAG = XWDialogFragment.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
index 77fe2c807..b07b937ae 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.view.View;
 import android.view.ViewGroup;
 
-import junit.framework.Assert;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
index db4b076c7..7509d2fb5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
@@ -36,7 +36,6 @@ import android.widget.ListView;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class XWFragment extends Fragment implements Delegator {
     private static final String TAG = XWFragment.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index fafe5208e..3262b8fef 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -29,7 +29,6 @@ import android.text.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 62e680abf..524695feb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
index 3701610d9..512500082 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BTService;
 import org.eehouse.android.xw4.GameUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
index 4d9b2d8f1..ac898b2b5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.Random;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DictLangCache;
 import org.eehouse.android.xw4.DictUtils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
index 8192636f7..ae13ba97d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.telephony.PhoneNumberUtils;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DevID;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
index 654661e79..2c7c43247 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
@@ -28,8 +28,7 @@ import java.util.Arrays;
 
 import org.json.JSONObject;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index d6c9a6c37..91bc41ae8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -26,8 +26,7 @@ import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.CommsTransport;
 import org.eehouse.android.xw4.ConnStatusHandler;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
index 79743be24..5d8c6a060 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
@@ -22,8 +22,7 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
index 0a9109857..ca1106a5f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
@@ -25,8 +25,7 @@ import android.text.TextUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Utils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
index 6b3883086..2a1c30043 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
index 315b51c86..2b9f96110 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
@@ -24,8 +24,7 @@ import android.graphics.Rect;
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.NetLaunchInfo;
 import org.eehouse.android.xw4.Utils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
index af983d125..c63374251 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
@@ -42,8 +42,8 @@ import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DbgUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
index 5069dea57..bc2f8e4f4 100644
--- a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
+++ b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
@@ -29,7 +29,6 @@ import com.google.android.gcm.GCMRegistrar;
 
 import org.json.JSONArray;
 
-import junit.framework.Assert;
 
 public class GCMIntentService extends GCMBaseIntentService {
     private static final String TAG = GCMIntentService.class.getSimpleName();
diff --git a/xwords4/android/scripts/mk_xml.py b/xwords4/android/scripts/mk_xml.py
index 706b0e9b0..b71e01542 100755
--- a/xwords4/android/scripts/mk_xml.py
+++ b/xwords4/android/scripts/mk_xml.py
@@ -95,8 +95,8 @@ def printStrings( pairs, outfile, target ):
 package org.eehouse.android.xw4.loc;
 
 import android.content.Context;
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Log;
 

From ff51dd78309aef3e273f041466ce3b52847c1622 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 05:10:05 -0800
Subject: [PATCH 026/145] remove assert

Constructor is called from JNI code and so not on the UI thread.
---
 .../src/main/java/org/eehouse/android/xw4/NetStateCache.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 6c5ed36f5..373c88ce2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -181,7 +181,7 @@ public class NetStateCache {
 
         public PvtBroadcastReceiver()
         {
-            DbgUtils.assertOnUIThread();
+            // DbgUtils.assertOnUIThread(); // firing
             mHandler = new Handler();
             mLastStateSent = s_netAvail;
         }

From 4540f9c0778092b23add5ad7314ec8e10979bdd7 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 05:18:29 -0800
Subject: [PATCH 027/145] change foreground-service notification text

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index fedfe3f87..1bc51167a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -542,9 +542,8 @@ public class BTService extends XWService {
                 m_notification =
                     new NotificationCompat.Builder( this, Utils.getChannelId(this) )
                     .setSmallIcon( R.drawable.notify_btservice )
-                    .setContentTitle( BTService.class.getSimpleName() )
-                    .setContentText("listening for bluetooth messages...")
-                    .setContentIntent(pendIntent)
+                    .setContentText( getString(R.string.bkng_notify_text) )
+                    .setContentIntent( pendIntent )
                     .build();
             }
 
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 6ab747561..e5d84f35f 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2028,6 +2028,7 @@
 
     <string name="title_btback_enabled">Enable background Bluetooth</string>
     <string name="summary_btback_enabled">Always listen for Bluetooth messages</string>
+    <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
 
     <!--  -->
     <string name="confirm_sms_title">Confirm your SMS plan</string>

From 9537100399f120b2404bd0c525b11737908bb22d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 06:17:47 -0800
Subject: [PATCH 028/145] btinvite dlg shows results of scan not all paired
 devs

Moving toward a better BT invite experience: use BTService to scan for
ourselves on all paired devices, and only allow selecting from among
those on which we're running (and so likely to respond to an
invitation.)
---
 .../eehouse/android/xw4/BTInviteDelegate.java |  22 ++--
 .../org/eehouse/android/xw4/BTService.java    | 120 +++---------------
 .../app/src/main/res/layout/bt_buttons.xml    |   9 +-
 .../app/src/main/res/values/strings.xml       |  21 +--
 4 files changed, 42 insertions(+), 130 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 9a769cb8b..8ecd1a1ee 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -22,6 +22,7 @@ package org.eehouse.android.xw4;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -35,12 +36,13 @@ import java.util.Iterator;
 import java.util.Set;
 
 public class BTInviteDelegate extends InviteDelegate {
-    private static final int[] BUTTONIDS = { R.id.button_add,
+    private static final String TAG = BTInviteDelegate.class.getSimpleName();
+    private static final int[] BUTTONIDS = { R.id.button_scan,
                                              R.id.button_settings,
-                                             R.id.button_clear,
     };
     private Activity m_activity;
     private TwoStringPair[] m_pairs;
+    private ProgressDialog m_progress;
 
     public static void launchForResult( Activity activity, int nMissing,
                                         SentInvitesInfo info,
@@ -67,28 +69,25 @@ public class BTInviteDelegate extends InviteDelegate {
     @Override
     protected void init( Bundle savedInstanceState )
     {
-        String msg = getString( R.string.bt_pick_addall_button );
-        msg = getQuantityString( R.plurals.invite_bt_desc_fmt, m_nMissing,
-                                 m_nMissing, msg );
+        String msg = getQuantityString( R.plurals.invite_bt_desc_fmt_2, m_nMissing,
+                                        m_nMissing );
         super.init( msg, 0 );
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
         BTService.clearDevices( m_activity, null ); // will return names
+
+        scan();
     }
 
     @Override
     protected void onBarButtonClicked( int id )
     {
         switch( id ) {
-        case R.id.button_add:
+        case R.id.button_scan:
             scan();
             break;
         case R.id.button_settings:
             BTService.openBTSettings( m_activity );
             break;
-        case R.id.button_clear:
-            removeSelected();
-            clearChecked();
-            break;
         }
     }
 
@@ -101,6 +100,7 @@ public class BTInviteDelegate extends InviteDelegate {
             post( new Runnable() {
                     public void run() {
                         synchronized( BTInviteDelegate.this ) {
+                            m_progress.cancel();
 
                             m_pairs = null;
                             if ( 0 < args.length ) {
@@ -143,6 +143,8 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
+            String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
+            m_progress = ProgressDialog.show( m_activity, msg, null, true, true );
             BTService.scan( m_activity );
         } else {
             makeConfirmThenBuilder( R.string.bt_no_devs,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 1bc51167a..b6e384799 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -183,7 +183,6 @@ public class BTService extends XWService {
     }
 
     private BluetoothAdapter m_adapter;
-    private Set<String> m_addrs;
     private BTMsgSink m_btMsgSink;
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
@@ -415,7 +414,6 @@ public class BTService extends XWService {
             m_adapter = adapter;
             Log.i( TAG, "onCreate(); bt name = %s; bt addr = %s",
                    adapter.getName(), adapter.getAddress() );
-            initAddrs();
             startListener();
             startSender();
         } else {
@@ -456,8 +454,6 @@ public class BTService extends XWService {
 
                 case CLEAR:
                     String[] btAddrs = intent.getStringArrayExtra( CLEAR_KEY );
-                    clearDevs( btAddrs );
-                    sendNames();
                     break;
                 case SCAN:
                     m_sender.add( new BTQueueElem( BTCmd.SCAN ) );
@@ -572,7 +568,6 @@ public class BTService extends XWService {
             while ( null != m_serverSocket && m_adapter.isEnabled() ) {
                 try {
                     BluetoothSocket socket = m_serverSocket.accept(); // blocks
-                    addAddr( socket );
                     DataInputStream inStream =
                         new DataInputStream( socket.getInputStream() );
 
@@ -678,8 +673,6 @@ public class BTService extends XWService {
             }
 
             BluetoothDevice host = socket.getRemoteDevice();
-            addAddr( host );
-
             result = makeOrNotify( nli, host.getName(), host.getAddress() );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
@@ -699,7 +692,6 @@ public class BTService extends XWService {
                     byte[] buffer = new byte[dis.readShort()];
                     dis.readFully( buffer );
                     BluetoothDevice host = socket.getRemoteDevice();
-                    addAddr( host );
 
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
@@ -731,35 +723,6 @@ public class BTService extends XWService {
         } // receiveMessage
     } // class BTListenerThread
 
-    private void addAddr( BluetoothSocket socket )
-    {
-        addAddr( socket.getRemoteDevice() );
-    }
-
-    private void addAddr( BluetoothDevice dev )
-    {
-        addAddr( dev.getAddress(), dev.getName() );
-    }
-
-    private void addAddr( String btAddr, String btName )
-    {
-        boolean save = false;
-        synchronized( m_addrs ) {
-            save = !m_addrs.contains( btAddr );
-            if ( save ) {
-                m_addrs.add( btAddr );
-            }
-        }
-        if ( save ) {
-            saveAddrs();
-        }
-    }
-
-    private boolean haveAddr( String btAddr )
-    {
-        return m_addrs.contains( btAddr );
-    }
-
     private static Map<String, String> s_namesToAddrs;
     private static String getSafeAddr( CommsAddrRec addr )
     {
@@ -786,18 +749,6 @@ public class BTService extends XWService {
         return btAddr;
     }
 
-    private void clearDevs( String[] btAddrs )
-    {
-        if ( null != btAddrs ) {
-            synchronized( m_addrs ) {
-                for ( String btAddr : btAddrs ) {
-                    m_addrs.remove( btAddr );
-                }
-            }
-        }
-        saveAddrs();
-    }
-
     private class BTSenderThread extends Thread {
         private LinkedBlockingQueue<BTQueueElem> m_queue;
         private HashMap<String,LinkedList<BTQueueElem> > m_resends;
@@ -836,15 +787,15 @@ public class BTService extends XWService {
                     switch( elem.m_cmd ) {
                     case PING:
                         if ( null == elem.m_btAddr ) {
-                            sendPings( MultiEvent.HOST_PONGED );
+                            sendPings( MultiEvent.HOST_PONGED, null );
                         } else {
                             sendPing( elem.m_btAddr, elem.m_gameID );
                         }
                         break;
                     case SCAN:
-                        addAllToNames();
-                        sendNames();
-                        saveAddrs();
+                        Set<BluetoothDevice> devs = new HashSet<>();
+                        sendPings( null, devs );
+                        sendNames( devs );
                         break;
                     case INVITE:
                         sendInvite( elem );
@@ -870,18 +821,17 @@ public class BTService extends XWService {
             }
         } // run
 
-        private void sendPings( MultiEvent event )
+        private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs )
         {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             // DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
             for ( BluetoothDevice dev : pairedDevs ) {
                 String btAddr = dev.getAddress();
-                if ( haveAddr( btAddr ) ) {
-                    continue;
-                }
 
                 if ( sendPing( dev, 0 ) ) { // did we get a reply?
-                    addAddr( dev );
+                    if ( null != addrs ) {
+                        addrs.add( dev );
+                    }
                     if ( null != event ) {
                         postEvent( event, dev.getName() );
                     }
@@ -927,6 +877,7 @@ public class BTService extends XWService {
             }
             updateStatusOut( sendWorking );
             updateStatusIn( receiveWorking );
+            Log.d( TAG, "sendPing(%s) => %b", dev, gotReply );
             return gotReply;
         } // sendPing
 
@@ -1130,60 +1081,21 @@ public class BTService extends XWService {
             }
             return found;
         }
-
     } // class BTSenderThread
 
-    private void addAllToNames()
+    private void sendNames( Set<BluetoothDevice> devs )
     {
-        Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
-        synchronized( m_addrs ) {
-            for ( BluetoothDevice dev : pairedDevs ) {
-                int clazz = dev.getBluetoothClass().getMajorDeviceClass();
-                if ( Major.PHONE == clazz
-                     || (XWApp.BT_SCAN_COMPUTERS && Major.COMPUTER == clazz) ) {
-                    m_addrs.add( dev.getAddress() );
-                }
-            }
-        }
-    }
-
-    private void sendNames()
-    {
-        String[] btAddrs = getAddrs();
-        int size = btAddrs.length;
-        String[] btNames = new String[size];
-        for ( int ii = 0; ii < size; ++ii ) {
+        String[] btNames = new String[devs.size()];
+        String[] btAddrs = new String[devs.size()];
+        int ii = 0;
+        for ( BluetoothDevice dev : devs ) {
+            btAddrs[ii] = dev.getAddress();
             btNames[ii] = nameForAddr( m_adapter, btAddrs[ii] );
+            ++ii;
         }
         postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
     }
 
-    private void initAddrs()
-    {
-        m_addrs = new HashSet<String>();
-
-        String[] addrs = XWPrefs.getBTAddresses( this );
-        if ( null != addrs ) {
-            for ( String btAddr : addrs ) {
-                m_addrs.add( btAddr );
-            }
-        }
-    }
-
-    private String[] getAddrs()
-    {
-        String[] addrs;
-        synchronized( m_addrs ) {
-            addrs = m_addrs.toArray( new String[m_addrs.size()] );
-        }
-        return addrs;
-    }
-
-    private void saveAddrs()
-    {
-        XWPrefs.setBTAddresses( this, getAddrs() );
-    }
-
     private void startListener()
     {
         m_btMsgSink = new BTMsgSink();
diff --git a/xwords4/android/app/src/main/res/layout/bt_buttons.xml b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
index ea287c312..df6e78e69 100644
--- a/xwords4/android/app/src/main/res/layout/bt_buttons.xml
+++ b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
@@ -5,8 +5,8 @@
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               >
-  <Button android:id="@+id/button_add"
-          android:text="@string/bt_pick_addall_button"
+  <Button android:id="@+id/button_scan"
+          android:text="@string/button_scan"
           style="@style/evenly_spaced_horizontal"
           />
 
@@ -14,9 +14,4 @@
           android:text="@string/bt_pair_settings"
           style="@style/evenly_spaced_horizontal"
           />
-
-  <Button android:id="@+id/button_clear"
-          android:text="@string/bt_pick_clear_button"
-          style="@style/evenly_spaced_horizontal"
-          />
 </LinearLayout>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index e5d84f35f..64ea01e0b 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1814,11 +1814,11 @@
     <!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
 
       <!-- In the Bluetooth invite device dialog -->
-    <string name="bt_pick_addall_button">Add all Paired</string>
       <!--  -->
     <string name="bt_pick_clear_button">Remove checked</string>
     <!--  -->
     <string name="bt_pair_settings">Pair More</string>
+    <string name="button_scan">Rescan</string>
 
       <!--  -->
     <string name="invite_progress_title">Connecting...</string>
@@ -1837,7 +1837,6 @@
     <string name="new_bt_body_fmt">A player on the device %1$s wants to start a game</string>
     <string name="new_relay_body">Tap to open the new game</string>
 
-
       <!--  -->
     <string name="bt_bad_proto_fmt">The version of CrossWords on
     \"%1$s\" is incompatible with this one for play using
@@ -1850,13 +1849,17 @@
     continue.</string>
 
     <!--  -->
-    <plurals name="invite_bt_desc_fmt">
-      <item quantity="one">Please check the device
-      you want to include in this game.\n\nUse the \"%2$s\"
-      button if you don\'t see the device you expect.</item>
-      <item quantity="other">Please check up to %1$d device[s]
-      you want to include in this game.\n\nUse the \"%2$s\"
-      button if you don\'t see a device you expect.</item>
+    <plurals name="invite_bt_desc_fmt_2">
+      <item quantity="one">Please check the device you want to include
+      in this game.\n\n(The list is of devices you\'ve paired and on
+      which CrossWords is currently running.)</item>
+      <item quantity="other">Please check up to %1$d device[s] you
+      want to include in this game.\n\n(The list is of devices you\'ve
+      paired and on which CrossWords is currently running.)</item>
+    </plurals>
+    <plurals name="bt_scan_progress_fmt">
+      <item quantity="one">Scanning for CrossWords</item>
+      <item quantity="other">Scanning for CrossWords on %1$d paired devices.</item>
     </plurals>
     <!--  -->
     <string name="bt_resend_fmt">Bluetooth send to %1$s failed; retry

From 546e5416dc2ee1ccd0dedd13c49836f41b609f37 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Tue, 4 Dec 2018 06:37:44 -0800
Subject: [PATCH 029/145] remove option of disabling foreground service

Since it's not going to be running all the time any more.
---
 .../main/java/org/eehouse/android/xw4/BTService.java   |  4 +---
 .../main/java/org/eehouse/android/xw4/DlgDelegate.java |  1 -
 .../org/eehouse/android/xw4/GamesListDelegate.java     |  7 -------
 .../src/main/java/org/eehouse/android/xw4/XWPrefs.java | 10 ----------
 .../android/app/src/main/res/values/common_rsrc.xml    |  1 -
 xwords4/android/app/src/main/res/values/strings.xml    |  4 ----
 xwords4/android/app/src/main/res/xml/xwprefs.xml       |  5 -----
 7 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index b6e384799..18fa82be0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -376,9 +376,7 @@ public class BTService extends XWService {
         Log.d( TAG, "startService(%s); inForeground = %b", intent, inForeground );
 
         if ( ! inForeground && canRunForegroundService() ) {
-            if ( XWPrefs.getBTBackgroundEnabled( context ) ) {
-                context.startForegroundService( intent );
-            }
+            context.startForegroundService( intent );
         } else if ( inForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
             context.startService( intent );
         } else {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index 526e26107..09bba0785 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -56,7 +56,6 @@ public class DlgDelegate {
         SET_HIDE_NEWGAME_BUTTONS,
         DWNLD_LOC_DICT,
         NEW_GAME_DFLT_NAME,
-        DISABLE_BT_BACK,
 
         // BoardDelegate
         UNDO_LAST_ACTION,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index bae29f46e..1079a8afd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1359,10 +1359,6 @@ public class GamesListDelegate extends ListDelegateBase
                                      true );
             break;
 
-        case DISABLE_BT_BACK:
-            XWPrefs.setBTBackgroundEnabled( m_activity, false );
-            break;
-
         default:
             handled = super.onPosButton( action, params );
         }
@@ -2274,11 +2270,8 @@ public class GamesListDelegate extends ListDelegateBase
     private void tryBackgroundIntent( Intent intent )
     {
         if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) {
-            ActionPair pair = new ActionPair( Action.DISABLE_BT_BACK,
-                                              R.string.disable_bt_back );
             makeNotAgainBuilder( R.string.not_again_btservice,
                                  R.string.key_notagain_btservice )
-                .setActionPair( pair )
                 .show();
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 3262b8fef..55ba5abfe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -51,16 +51,6 @@ public class XWPrefs {
         setPrefsBoolean( context, R.string.key_enable_sms, enabled );
     }
 
-    public static void setBTBackgroundEnabled( Context context, boolean enabled )
-    {
-        setPrefsBoolean( context, R.string.key_btback_enabled, enabled );
-    }
-
-    public static boolean getBTBackgroundEnabled( Context context )
-    {
-        return getPrefsBoolean( context, R.string.key_btback_enabled, true );
-    }
-
     public static boolean getDebugEnabled( Context context )
     {
         return getPrefsBoolean( context, R.string.key_enable_debug, false );
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 5d8eef505..389e79ddb 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -61,7 +61,6 @@
   <string name="key_notify_sound">key_notify_sound</string>
   <string name="key_disable_relay">key_disable_relay</string>
   <string name="key_notify_vibrate">key_notify_vibrate</string>
-  <string name="key_btback_enabled">key_btback_enabled</string>
   <string name="key_enable_sms">key_enable_sms</string>
   <string name="key_enable_p2p">key_enable_p2p</string>
   <string name="key_network_behavior">key_network_behavior</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 64ea01e0b..448076ff7 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2029,8 +2029,6 @@
     <string name="title_enable_p2p">Enable WiFi Direct</string>
     <string name="summary_enable_p2p">Experimental, uses lots of battery</string>
 
-    <string name="title_btback_enabled">Enable background Bluetooth</string>
-    <string name="summary_btback_enabled">Always listen for Bluetooth messages</string>
     <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
 
     <!--  -->
@@ -2656,8 +2654,6 @@
   Bluetooth moves and invitations while in the foreground, but any
   sent while it\'s in the background will be lost.</string>
 
-  <string name="disable_bt_back">Disable Background</string>
-
   <string name="no_invites">This game has sent no invitations</string>
 
   <string name="disable_dualpane">Disable side-by-side</string>
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index fdb679770..8d6204d6d 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -335,11 +335,6 @@
                         android:summary="@string/notify_other_summary"
                         android:defaultValue="false"
                         />
-    <CheckBoxPreference android:key="@string/key_btback_enabled"
-                        android:title="@string/title_btback_enabled"
-                        android:summary="@string/summary_btback_enabled"
-                        android:defaultValue="true"
-                        />
     <CheckBoxPreference android:key="@string/key_enable_p2p"
                         android:title="@string/title_enable_p2p"
                         android:summary="@string/summary_enable_p2p"

From d87b81f6d7dfc43615fd2ede6c04e12d856af5bc Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 17:13:35 -0800
Subject: [PATCH 030/145] make listener thread static

remove relationship with BTService so it can be created independently.
---
 .../org/eehouse/android/xw4/BTService.java    | 45 +++++++++++--------
 .../org/eehouse/android/xw4/DelegateBase.java |  4 --
 .../org/eehouse/android/xw4/MultiService.java |  1 -
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 18fa82be0..307297ed0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -548,14 +548,24 @@ public class BTService extends XWService {
         }
     }
 
-    private class BTListenerThread extends Thread {
+    private static class BTListenerThread extends Thread {
         private BluetoothServerSocket m_serverSocket;
+        private Context mContext;
+        private BTService mService;
+
+        BTListenerThread( Context context, BTService service )
+        {
+            mContext = context;
+            mService = service;
+        }
 
         @Override
         public void run() {     // receive thread
+            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+            String appName = XWApp.getAppName( mContext );
+
             try {
-                String appName = XWApp.getAppName( BTService.this );
-                m_serverSocket = m_adapter.
+                m_serverSocket = adapter.
                     listenUsingRfcommWithServiceRecord( appName,
                                                         XWApp.getAppUUID() );
             } catch ( IOException ioe ) {
@@ -563,7 +573,7 @@ public class BTService extends XWService {
                 logIOE( ioe );
             }
 
-            while ( null != m_serverSocket && m_adapter.isEnabled() ) {
+            while ( null != m_serverSocket && adapter.isEnabled() ) {
                 try {
                     BluetoothSocket socket = m_serverSocket.accept(); // blocks
                     DataInputStream inStream =
@@ -591,7 +601,7 @@ public class BTService extends XWService {
                             Log.e( TAG, "unexpected msg %s", cmd.toString());
                             break;
                         }
-                        updateStatusIn( true );
+                        mService.updateStatusIn( true );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -599,7 +609,7 @@ public class BTService extends XWService {
                         os.flush();
                         socket.close();
 
-                        sendBadProto( socket );
+                        mService.sendBadProto( socket );
                     }
                 } catch ( IOException ioe ) {
                     Log.w( TAG, "trying again..." );
@@ -643,7 +653,7 @@ public class BTService extends XWService {
         {
             DataInputStream inStream = new DataInputStream( socket.getInputStream() );
             int gameID = inStream.readInt();
-            boolean deleted = 0 != gameID && !DBUtils.haveGame( BTService.this, gameID );
+            boolean deleted = 0 != gameID && !DBUtils.haveGame( mContext, gameID );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
             os.writeByte( BTCmd.PONG.ordinal() );
@@ -651,7 +661,7 @@ public class BTService extends XWService {
             os.flush();
 
             socket.close();
-            updateStatusOut( true );
+            mService.updateStatusOut( true );
         }
 
         private void receiveInvitation( byte proto, DataInputStream is,
@@ -662,7 +672,7 @@ public class BTService extends XWService {
             NetLaunchInfo nli;
             if ( BT_PROTO_JSONS == proto ) {
                 String asJson = is.readUTF();
-                nli = NetLaunchInfo.makeFrom( BTService.this, asJson );
+                nli = NetLaunchInfo.makeFrom( mContext, asJson );
             } else {
                 short len = is.readShort();
                 byte[] nliData = new byte[len];
@@ -671,7 +681,7 @@ public class BTService extends XWService {
             }
 
             BluetoothDevice host = socket.getRemoteDevice();
-            result = makeOrNotify( nli, host.getName(), host.getAddress() );
+            result = mService.makeOrNotify( nli, host.getName(), host.getAddress() );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
             os.writeByte( result.ordinal() );
@@ -694,15 +704,15 @@ public class BTService extends XWService {
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
                     ReceiveResult rslt
-                        = BTService.this.receiveMessage( BTService.this,
-                                                         gameID, m_btMsgSink,
-                                                         buffer, addr );
+                        = mService.receiveMessage( mContext,
+                                                   gameID, mService.m_btMsgSink,
+                                                   buffer, addr );
 
                     result = rslt == ReceiveResult.GAME_GONE ?
                         BTCmd.MESG_GAMEGONE : BTCmd.MESG_ACCPT;
                     break;
                 case MESG_GAMEGONE:
-                    postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                    mService.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                     result = BTCmd.MESG_ACCPT;
                     break;
                 default:
@@ -1097,7 +1107,7 @@ public class BTService extends XWService {
     private void startListener()
     {
         m_btMsgSink = new BTMsgSink();
-        m_listener = new BTListenerThread();
+        m_listener = new BTListenerThread( this, this );
         m_listener.start();
     }
 
@@ -1180,13 +1190,10 @@ public class BTService extends XWService {
         return dos;
     }
 
-    private void logIOE( IOException ioe )
+    private static void logIOE( IOException ioe )
     {
         Log.ex( TAG, ioe );
         ++s_errCount;
-        // if ( 0 == s_errCount % 10 ) {
-            postEvent( MultiEvent.BT_ERR_COUNT, s_errCount );
-            // }
     }
 
     private void sendBadProto( BluetoothSocket socket )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 66932cfa1..18564462b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -600,10 +600,6 @@ public class DelegateBase implements DlgClickNotify,
     {
         int fmtId = 0;
         switch( event ) {
-        case BT_ERR_COUNT:
-            int count = (Integer)args[0];
-            Log.i( TAG, "Bluetooth error count: %d", count );
-            break;
         case BAD_PROTO_BT:
             fmtId = R.string.bt_bad_proto_fmt;
             break;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
index 91dbd8390..6f14465ba 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
@@ -87,7 +87,6 @@ public class MultiService {
                              SMS_SEND_FAILED_NOPERMISSION,
 
                              BT_GAME_CREATED,
-                             BT_ERR_COUNT,
 
                              RELAY_ALERT,
     };

From 95cd6d084de1552b18c30326d4a6bd5db5419a07 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 19:58:19 -0800
Subject: [PATCH 031/145] kill foreground service on a timer

reset timer on receiving meaningful data and on moving app to
background. If it fires and we're in background, kill the service.
(There's currently no way to restart it except bringing the app into the
foreground. Fixing that's coming.)
---
 .../org/eehouse/android/xw4/BTService.java    | 60 ++++++++++++++++++-
 .../java/org/eehouse/android/xw4/DBUtils.java |  4 +-
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 307297ed0..530e658fe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -32,9 +32,10 @@ import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.os.Handler;
+import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
 
-
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
 import org.eehouse.android.xw4.jni.CommsAddrRec;
@@ -77,6 +78,8 @@ import java.util.concurrent.TimeUnit;
 public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
+    private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
+    private static int DEFAULT_KEEPALIVE_SECONDS = 60 * 1; // 1 minute for testing; maybe 15 on ship?
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -187,6 +190,8 @@ public class BTService extends XWService {
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
+    private Handler mHandler;
+
     private static int s_errCount = 0;
 
     public static boolean BTAvailable()
@@ -266,7 +271,9 @@ public class BTService extends XWService {
 
     private static boolean inForeground()
     {
-        return sInForeground != null && sInForeground;
+        boolean result = sInForeground != null && sInForeground;
+        // Log.d( TAG, "inForeground() => %b", result );
+        return result;
     }
 
     static void onAppToForeground( Context context )
@@ -404,6 +411,7 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        mHandler = new Handler();
         startForegroundIf();
 
         BluetoothAdapter adapter = XWApp.BTSUPPORTED
@@ -446,8 +454,10 @@ public class BTService extends XWService {
                 switch( cmd ) {
                 case START_FOREGROUND:
                     stopForeground( true ); // Kill the notification
-                    // FALLTHRU
+                    break;
                 case START_BACKGROUND:
+                    noteLastUsed( this );   // prevent timer from killing immediately
+                    setTimeoutTimer();
                     break;
 
                 case CLEAR:
@@ -581,6 +591,7 @@ public class BTService extends XWService {
 
                     byte proto = inStream.readByte();
                     BTCmd cmd = BTCmd.values()[inStream.readByte()];
+                    Log.d( TAG, "BTListenerThread() got %s", cmd );
                     if ( protoOK( proto, cmd ) ) {
                         switch( cmd ) {
                         case PING:
@@ -602,6 +613,7 @@ public class BTService extends XWService {
                             break;
                         }
                         mService.updateStatusIn( true );
+                        noteLastUsed( mContext );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -1190,6 +1202,48 @@ public class BTService extends XWService {
         return dos;
     }
 
+    private static void noteLastUsed( Context context )
+    {
+        Log.d( TAG, "noteLastUsed(" + context + ")" );
+        synchronized (BTService.class) {
+            int nowSecs = (int)(SystemClock.uptimeMillis() / 1000);
+            int newKeepSecs = nowSecs + DEFAULT_KEEPALIVE_SECONDS;
+            DBUtils.setIntFor( context, KEY_KEEPALIVE_UNTIL_SECS, newKeepSecs );
+        }
+    }
+
+    private void setTimeoutTimer()
+    {
+        DbgUtils.assertOnUIThread();
+
+        if ( inForeground() ) {
+            // Let the timer die if we're in the foreground!
+            Log.d( TAG, "setTimeoutTimer(): in foreground; not resetting timer" );
+        } else {
+            long dieTimeMillis;
+            synchronized (BTService.class) {
+                dieTimeMillis = 1000 * DBUtils.getIntFor( this, KEY_KEEPALIVE_UNTIL_SECS, 0 );
+            }
+            long nowMillis = SystemClock.uptimeMillis();
+
+            if ( dieTimeMillis <= nowMillis ) {
+                Log.d( TAG, "setTimeoutTimer(): killing the thing" );
+                stopListener();
+                stopForeground(true);
+            } else {
+                mHandler.removeCallbacksAndMessages( this );
+                mHandler.postAtTime( new Runnable() {
+                        @Override
+                        public void run() {
+                            Log.d( TAG, "timeout timer fired" );
+                            setTimeoutTimer();
+                        }
+                    }, this, dieTimeMillis );
+                Log.d( TAG, "setTimeoutTimer(): set for %dms from now", dieTimeMillis - nowMillis );
+            }
+        }
+    }
+
     private static void logIOE( IOException ioe )
     {
         Log.ex( TAG, ioe );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 700b918a8..173c0d05e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -2394,7 +2394,7 @@ public class DBUtils {
 
     public static void setIntFor( Context context, String key, int value )
     {
-        // Log.df( "DBUtils.setIntFor(key=%s, val=%d)", key, value );
+        // Log.d( TAG, "DBUtils.setIntFor(key=%s, val=%d)", key, value );
         String asStr = String.format( "%d", value );
         setStringFor( context, key, asStr );
     }
@@ -2405,7 +2405,7 @@ public class DBUtils {
         if ( null != asStr ) {
             dflt = Integer.parseInt( asStr );
         }
-        // Log.df( "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
+        // Log.d( TAG, "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
         return dflt;
     }
 

From 83d0914145e12d532f2790b6a887723fb37fd112 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 19:59:42 -0800
Subject: [PATCH 032/145] fix NPE

It happened when too many timers were firing, but I think this code's
better anyway.
---
 .../java/org/eehouse/android/xw4/BTService.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 530e658fe..ec463e3a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -1131,13 +1131,16 @@ public class BTService extends XWService {
 
     private void stopListener()
     {
-        m_listener.stopListening();
-        try {
-            m_listener.join( 100 );
-        } catch ( InterruptedException ie ) {
-            Log.ex( TAG, ie );
+        BTListenerThread listener = m_listener;
+        if ( listener != null ) {
+            m_listener = null;
+            listener.stopListening();
+            try {
+                listener.join( 100 );
+            } catch ( InterruptedException ie ) {
+                Log.ex( TAG, ie );
+            }
         }
-        m_listener = null;
     }
 
     private void stopSender()

From 390370c07a77e30f740c144be179b31278a4108c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:14:57 -0800
Subject: [PATCH 033/145] launch service from ACTION_ACL_CONNECTED

Fire up the receiver thread, and start the service, on receipt of this
ACTION (if they're not already running.) On start, the service takes
over the thread and begins dispatching messages. Works to launch the app
when it's not running and in most cases, though messages received before
the service launches are currently dropped, things seem to work.
---
 .../org/eehouse/android/xw4/BTReceiver.java   |   2 +-
 .../org/eehouse/android/xw4/BTService.java    | 210 ++++++++++++++----
 2 files changed, 166 insertions(+), 46 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
index 3912d0c82..19b21e6a9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
@@ -38,7 +38,7 @@ public class BTReceiver extends BroadcastReceiver {
                    action, intent.toString() );
 
             if ( action.equals( BluetoothDevice.ACTION_ACL_CONNECTED ) ) {
-                BTService.startService( context );
+                BTService.onACLConnected( context );
             } else if ( action.equals( BluetoothAdapter.ACTION_STATE_CHANGED ) ) {
                 int newState =
                     intent.getIntExtra( BluetoothAdapter.EXTRA_STATE, -1 );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index ec463e3a1..6a0cb9b67 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -79,7 +79,8 @@ public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
     private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
-    private static int DEFAULT_KEEPALIVE_SECONDS = 60 * 1; // 1 minute for testing; maybe 15 on ship?
+    // half minute for testing; maybe 15 on ship? Or make it a debug config.
+    private static int DEFAULT_KEEPALIVE_SECONDS = 30;
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -187,7 +188,6 @@ public class BTService extends XWService {
 
     private BluetoothAdapter m_adapter;
     private BTMsgSink m_btMsgSink;
-    private BTListenerThread m_listener;
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
     private Handler mHandler;
@@ -261,11 +261,10 @@ public class BTService extends XWService {
         if ( null == sInForeground || inForeground() != inForeground ) {
             sInForeground = inForeground;
 
-            Intent intent =
-                getIntentTo( context,
-                             inForeground ? BTAction.START_FOREGROUND
-                             : BTAction.START_BACKGROUND );
-            startService( context, intent );
+            startService( context,
+                          getIntentTo( context,
+                                       inForeground ? BTAction.START_FOREGROUND
+                                       : BTAction.START_BACKGROUND ) );;
         }
     }
 
@@ -293,6 +292,12 @@ public class BTService extends XWService {
         }
     }
 
+    public static void onACLConnected( Context context )
+    {
+        Log.d( TAG, "onACLConnected()" );
+        BTListenerThread.startYourself( context );
+    }
+
     public static void radioChanged( Context context, boolean cameOn )
     {
         Intent intent = getIntentTo( context, BTAction.RADIO );
@@ -309,8 +314,7 @@ public class BTService extends XWService {
 
     public static void scan( Context context )
     {
-        Intent intent = getIntentTo( context, BTAction.SCAN );
-        startService( context, intent );
+        startService( context, getIntentTo( context, BTAction.SCAN ) );
     }
 
     public static void pingHost( Context context, String hostAddr, int gameID )
@@ -411,6 +415,10 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        Log.d( TAG, "%s.onCreate()", this );
+        super.onCreate();
+
+        m_btMsgSink = new BTMsgSink();
         mHandler = new Handler();
         startForegroundIf();
 
@@ -438,24 +446,33 @@ public class BTService extends XWService {
         return result;
     }
 
+    @Override
+    public void onDestroy()
+    {
+        Log.d( TAG, "%s.onDestroy()", this );
+        super.onDestroy();
+    }
+
     private int handleCommand( Intent intent )
     {
         int result;
         if ( XWApp.BTSUPPORTED && null != intent ) {
             int ordinal = intent.getIntExtra( CMD_KEY, -1 );
             if ( -1 == ordinal ) {
+                Log.d( TAG, "handleCommand(): no ordinal!" );
                 // Drop it
             } else if ( null == m_sender ) {
                 Log.w( TAG, "exiting: m_queue is null" );
                 stopSelf();
             } else {
                 BTAction cmd = BTAction.values()[ordinal];
-                Log.i( TAG, "onStartCommand; cmd=%s", cmd.toString() );
+                Log.i( TAG, "handleCommand; cmd=%s", cmd.toString() );
                 switch( cmd ) {
                 case START_FOREGROUND:
                     stopForeground( true ); // Kill the notification
                     break;
                 case START_BACKGROUND:
+                    startListener();
                     noteLastUsed( this );   // prevent timer from killing immediately
                     setTimeoutTimer();
                     break;
@@ -469,7 +486,7 @@ public class BTService extends XWService {
                 case INVITE:
                     String jsonData = intent.getStringExtra( GAMEDATA_KEY );
                     NetLaunchInfo nli = NetLaunchInfo.makeFrom( this, jsonData );
-                    Log.i( TAG, "onStartCommand: nli: %s", nli.toString() );
+                    Log.i( TAG, "handleCommand: nli: %s", nli.toString() );
                     String btAddr = intent.getStringExtra( ADDR_KEY );
                     m_sender.add( new BTQueueElem( BTCmd.INVITE, nli, btAddr ) );
                     break;
@@ -559,14 +576,115 @@ public class BTService extends XWService {
     }
 
     private static class BTListenerThread extends Thread {
+        // Wrap so we can synchronize on the container
+        private static BTListenerThread[] s_listener = {null};
         private BluetoothServerSocket m_serverSocket;
         private Context mContext;
         private BTService mService;
+        private volatile Thread mTimerThread;
 
-        BTListenerThread( Context context, BTService service )
+        private BTListenerThread( Context context, BTService service )
         {
             mContext = context;
             mService = service;
+
+            // Started without a BTService instance? Run for only a little
+            // while
+            if ( null == service ) {
+                startKillTimer();
+            }
+        }
+
+        static void startYourself( Context context, BTService service )
+        {
+            Log.d( TAG, "startYourself(%s, %s)", context, service );
+            DbgUtils.assertOnUIThread();
+            synchronized ( s_listener ) {
+                if ( s_listener[0] == null ) {
+                    s_listener[0] = new BTListenerThread( context, service );
+                    s_listener[0].start();
+                } else if ( null != service ) {
+                    s_listener[0].setService( context, service );
+                }
+            }
+        }
+
+        static void startYourself( Context context )
+        {
+            DbgUtils.assertOnUIThread();
+            startYourself( context, null );
+        }
+
+        static void stopYourself( BTListenerThread self )
+        {
+            Log.d( TAG, "stopYourself()" );
+            BTListenerThread listener;
+            synchronized ( s_listener ) {
+                listener = s_listener[0];
+                s_listener[0] = null;
+            }
+            if ( null != listener ) {
+                Assert.assertTrue( self == null || self == listener );
+                listener.stopListening();
+                try {
+                    listener.join( 100 );
+                } catch ( InterruptedException ie ) {
+                    Log.ex( TAG, ie );
+                }
+            }
+        }
+
+        void setService( Context context, BTService service )
+        {
+            if ( null == mService ) {
+                Log.d( TAG, "setService(): we didn't have one before. Do something!!!" );
+                mService = service;
+                Assert.assertNotNull( context );
+                mContext = context; // Use Service instead of Receiver (possibly)
+            } else {
+                Assert.assertTrue( service == mService );
+            }
+        }
+
+        private void startTheService()
+        {
+            stopKillTimer();
+
+            if (! inForeground() ) {
+                startService( mContext,
+                              getIntentTo( mContext,
+                                           BTAction.START_BACKGROUND ) );
+            } else {
+                // Will be a race condition maybe?
+                Assert.assertFalse( BuildConfig.DEBUG );
+            }
+        }
+
+        private synchronized void startKillTimer()
+        {
+            Assert.assertNull( mTimerThread );
+            mTimerThread = new Thread( new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            // Give legitimate caller 10 seconds to retry with
+                            // a packet that we'll recognize.
+                            Thread.sleep( 10 * 1000 );
+                            stopYourself( BTListenerThread.this );
+                        } catch (InterruptedException ie) {
+                            Log.e( TAG, "timer thread interrupted; exiting" );
+                        }
+                    }
+                } );
+            mTimerThread.start();
+        }
+
+        private synchronized void stopKillTimer()
+        {
+            if ( mTimerThread != null ) {
+                mTimerThread.interrupt();
+                mTimerThread = null;
+            }
         }
 
         @Override
@@ -593,27 +711,32 @@ public class BTService extends XWService {
                     BTCmd cmd = BTCmd.values()[inStream.readByte()];
                     Log.d( TAG, "BTListenerThread() got %s", cmd );
                     if ( protoOK( proto, cmd ) ) {
-                        switch( cmd ) {
-                        case PING:
-                            receivePing( socket );
-                            break;
-                        case INVITE:
-                            receiveInvitation( proto, inStream, socket );
-                            break;
-                        case MESG_SEND:
-                            receiveMessage( cmd, inStream, socket );
-                            break;
+                        if ( null == mService ) {
+                            Log.d( TAG, "dropping packet; starting service" );
+                            startTheService();
+                        } else {
+                            switch( cmd ) {
+                            case PING:
+                                receivePing( socket );
+                                break;
+                            case INVITE:
+                                receiveInvitation( proto, inStream, socket );
+                                break;
+                            case MESG_SEND:
+                                receiveMessage( cmd, inStream, socket );
+                                break;
 
-                        case MESG_GAMEGONE:
-                            receiveMessage( cmd, inStream, socket );
-                            break;
+                            case MESG_GAMEGONE:
+                                receiveMessage( cmd, inStream, socket );
+                                break;
 
-                        default:
-                            Log.e( TAG, "unexpected msg %s", cmd.toString());
-                            break;
+                            default:
+                                Log.e( TAG, "unexpected msg %s", cmd.toString());
+                                break;
+                            }
+                            mService.updateStatusIn( true );
+                            noteLastUsed( mContext );
                         }
-                        mService.updateStatusIn( true );
-                        noteLastUsed( mContext );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -1118,9 +1241,7 @@ public class BTService extends XWService {
 
     private void startListener()
     {
-        m_btMsgSink = new BTMsgSink();
-        m_listener = new BTListenerThread( this, this );
-        m_listener.start();
+        BTListenerThread.startYourself( this, this );
     }
 
     private void startSender()
@@ -1131,16 +1252,7 @@ public class BTService extends XWService {
 
     private void stopListener()
     {
-        BTListenerThread listener = m_listener;
-        if ( listener != null ) {
-            m_listener = null;
-            listener.stopListening();
-            try {
-                listener.join( 100 );
-            } catch ( InterruptedException ie ) {
-                Log.ex( TAG, ie );
-            }
-        }
+        BTListenerThread.stopYourself( null );
     }
 
     private void stopSender()
@@ -1192,12 +1304,20 @@ public class BTService extends XWService {
 
         DataOutputStream dos;
         try {
-            socket.connect();
+            for ( int ii = 0; ii < 3; ++ii ) {
+                try {
+                    socket.connect();
+                    break;
+                } catch (IOException ioe) {
+                    Thread.sleep( 2000 );
+                    Log.d( TAG, "ioe on connect(); trying again" );
+                }
+            }
             dos = new DataOutputStream( socket.getOutputStream() );
             dos.writeByte( BT_PROTO );
             dos.writeByte( cmd.ordinal() );
             Log.i( TAG, "connect() to %s successful", name );
-        } catch ( IOException ioe ) {
+        } catch ( IOException | InterruptedException ioe ) {
             dos = null;
             Log.w( TAG, "BTService.connect() to %s failed", name );
             // logIOE( ioe );

From ba95432e44395ce8e997abc61bcb75b02a9da632 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:17:13 -0800
Subject: [PATCH 034/145] fix crash by not creating Handler until on UI thread

Receiver is created and installed by a non-UI thread sometimes so can't
create the Handler there. onReceive() is called on an ok thread however
so create it there on demand. Fixes crash that showed when receiving
relay messages in background.
---
 .../main/java/org/eehouse/android/xw4/NetStateCache.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 373c88ce2..198aa5c48 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -181,8 +181,6 @@ public class NetStateCache {
 
         public PvtBroadcastReceiver()
         {
-            // DbgUtils.assertOnUIThread(); // firing
-            mHandler = new Handler();
             mLastStateSent = s_netAvail;
         }
 
@@ -191,6 +189,11 @@ public class NetStateCache {
         {
             DbgUtils.assertOnUIThread();
 
+            if ( null == mHandler ) {
+                DbgUtils.assertOnUIThread();
+                mHandler = new Handler();
+            }
+
             if ( intent.getAction().
                  equals( ConnectivityManager.CONNECTIVITY_ACTION)) {
 

From fdf27e901a300770deab82fbfff05a7752c46b15 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:36:25 -0800
Subject: [PATCH 035/145] don't try to connect to non-phones

When a device is paired but not a phone (or computer, which is how
tablets identify), don't bother trying to scan it.
---
 .../org/eehouse/android/xw4/BTService.java    | 21 ++++++++++++-------
 .../java/org/eehouse/android/xw4/XWApp.java   |  2 --
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 6a0cb9b67..f0277f0c7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -969,15 +969,20 @@ public class BTService extends XWService {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             // DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
             for ( BluetoothDevice dev : pairedDevs ) {
-                String btAddr = dev.getAddress();
-
-                if ( sendPing( dev, 0 ) ) { // did we get a reply?
-                    if ( null != addrs ) {
-                        addrs.add( dev );
-                    }
-                    if ( null != event ) {
-                        postEvent( event, dev.getName() );
+                // Skip things that can't host an Android app
+                int clazz = dev.getBluetoothClass().getMajorDeviceClass();
+                if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
+                    if ( sendPing( dev, 0 ) ) { // did we get a reply?
+                        if ( null != addrs ) {
+                            addrs.add( dev );
+                        }
+                        if ( null != event ) {
+                            postEvent( event, dev.getName() );
+                        }
                     }
+                } else {
+                    Log.d( TAG, "skipping %s; not an android device!",
+                           dev.getName() );
                 }
             }
         }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 441e3d67b..253118efd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -50,8 +50,6 @@ public class XWApp extends Application implements LifecycleObserver {
     public static final boolean LOCUTILS_ENABLED = false;
     public static final boolean CONTEXT_MENUS_ENABLED = true;
     public static final boolean OFFER_DUALPANE = false;
-    // BT class "COMPUTERS" includes tablets like the Nexus 9
-    public static final boolean BT_SCAN_COMPUTERS = true;
 
     public static final String SMS_PUBLIC_HEADER = "-XW4";
     public static final int MAX_TRAY_TILES = 7; // comtypes.h

From c172a0aa0c3950ab858ad4acd498f9ca9f5bc64c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 6 Dec 2018 06:23:40 -0800
Subject: [PATCH 036/145] fix NPE (race condition around deletion?)

Check for null. Not sure how I got it there, but there's little harm in
failing silently.
---
 .../main/java/org/eehouse/android/xw4/GameUtils.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index ba3d807d5..2df7fd7f9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -274,9 +274,13 @@ public class GameUtils {
 
     public static void deleteGame( Context context, GameLock lock, boolean informNow )
     {
-        tellDied( context, lock, informNow );
-        Utils.cancelNotification( context, (int)lock.getRowid() );
-        DBUtils.deleteGame( context, lock );
+        if ( null != lock ) {
+            tellDied( context, lock, informNow );
+            Utils.cancelNotification( context, (int)lock.getRowid() );
+            DBUtils.deleteGame( context, lock );
+        } else {
+            Log.e( TAG, "deleteGame(): null lock; doing nothing" );
+        }
     }
 
     public static boolean deleteGame( Context context, long rowid,

From a86250ca36f497d4014f7d42ffafed6889829f7f Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Thu, 6 Dec 2018 19:12:32 -0800
Subject: [PATCH 037/145] don't drop potential duplicate invitations after 5
 seconds

Other code will take care of duplicates. This was meant to avoid a race
condition, for which 5 seconds is enough. Blocking forever complicates
testing.
---
 .../org/eehouse/android/xw4/XWService.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 524695feb..4e431f2c0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -33,15 +33,15 @@ import org.eehouse.android.xw4.jni.JNIThread;
 import org.eehouse.android.xw4.jni.UtilCtxt;
 import org.eehouse.android.xw4.jni.UtilCtxtImpl;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
 
 abstract class XWService extends Service {
     private static final String TAG = XWService.class.getSimpleName();
     public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
 
     protected static MultiService s_srcMgr = null;
-    private static Set<String> s_seen = new HashSet<String>();
+    private static Map<String, Long> s_seen = new HashMap<>();
 
     private UtilCtxt m_utilCtxt;
 
@@ -72,18 +72,20 @@ abstract class XWService extends Service {
 
     // Check that we aren't already processing an invitation with this
     // inviteID.
+    private static final long SEEN_INTERVAL_MS = 1000 * 5;
     private boolean checkNotDupe( NetLaunchInfo nli )
     {
         String inviteID = nli.inviteID();
-        boolean isDupe;
         synchronized( s_seen ) {
-            isDupe = s_seen.contains( inviteID );
-            if ( !isDupe ) {
-                s_seen.add( inviteID );
+            long now = System.currentTimeMillis();
+            Long lastSeen = s_seen.get( inviteID );
+            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
+            if ( !seen ) {
+                s_seen.put( inviteID, now );
             }
+            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
+            return !seen;
         }
-        Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !isDupe );
-        return !isDupe;
     }
 
     abstract void postNotification( String device, int gameID, long rowid );

From b58e121246a2941f093c021217ab7c6c440bec71 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 6 Dec 2018 18:54:23 -0800
Subject: [PATCH 038/145] include flavor in logged TAG

Tired of not being to tell variants' logs apart.
---
 .../src/main/java/org/eehouse/android/xw4/Log.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
index b12afe650..c96528b39 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
@@ -23,21 +23,23 @@ package org.eehouse.android.xw4;
 import java.util.Formatter;
 
 public class Log {
+    private static final String PRE_TAG = BuildConfig.FLAVOR + ":";
+
     public static void d( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.d( tag, str );
+        android.util.Log.d( PRE_TAG + tag, str );
     }
     public static void w( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.w( tag, str );
+        android.util.Log.w( PRE_TAG + tag, str );
     }
     public static void e( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.e( tag, str );
+        android.util.Log.e( PRE_TAG + tag, str );
     }
     public static void i( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.i( tag, str );
+        android.util.Log.i( PRE_TAG + tag, str );
     }
 
     public static void ex( String tag, Exception exception )
@@ -45,5 +47,4 @@ public class Log {
         w( tag, "Exception: %s", exception.toString() );
         DbgUtils.printStack( tag, exception.getStackTrace() );
     }
-
 }

From 2cdd50b5fd8f9e2199b55bafc02c1cbd5384333c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:03:08 -0800
Subject: [PATCH 039/145] use TAG format that doesn't break logcat filtering

---
 .../android/app/src/main/java/org/eehouse/android/xw4/Log.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
index c96528b39..c54fce834 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
@@ -23,7 +23,7 @@ package org.eehouse.android.xw4;
 import java.util.Formatter;
 
 public class Log {
-    private static final String PRE_TAG = BuildConfig.FLAVOR + ":";
+    private static final String PRE_TAG = BuildConfig.FLAVOR + "-";
 
     public static void d( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();

From b983b5abb669e171f153313fc45aba66ef776496 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:12:49 -0800
Subject: [PATCH 040/145] get RECEIVE_SMS permission with SEND_SMS

Apparently one of the newer Android SDK levels adds the requirement to
have RECEIVE_SMS permission in order for a broadcast receiver to get
called. Meaning receipt didn't work even if SEND_SMS had been
granted. Since they're both in the same group (for now) the OS will
grant the second silently if the first has been granted, but it still
has to be requested. So request both at the same time. This still leaves
the problem that a user who's never tried to create an SMS game won't
have been asked for either permission and so won't receive SMS
invitations, but fixing that is for a later release.
---
 .../eehouse/android/xw4/BoardDelegate.java    |  2 ++
 .../java/org/eehouse/android/xw4/Perms23.java | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index ba5e64e8f..3269eb9a3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1218,6 +1218,8 @@ public class BoardDelegate extends DelegateBase
             case SMS:
                 Perms23.tryGetPerms( this, Perm.SEND_SMS, R.string.sms_invite_rationale,
                                      Action.INVITE_SMS, m_mySIS.nMissing, info );
+                Perms23.tryGetPerms( this, Perm.RECEIVE_SMS, R.string.sms_invite_rationale,
+                                     Action.INVITE_SMS, m_mySIS.nMissing, info );
                 break;
             case RELAY:
                 RelayInviteDelegate.launchForResult( m_activity, m_mySIS.nMissing,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index f8b3be7bf..710809192 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -19,6 +19,7 @@
 
 package org.eehouse.android.xw4;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -43,14 +44,15 @@ public class Perms23 {
     private static final String TAG = Perms23.class.getSimpleName();
     
     public static enum Perm {
-        READ_PHONE_STATE("android.permission.READ_PHONE_STATE"),
-        STORAGE("android.permission.WRITE_EXTERNAL_STORAGE"),
-        SEND_SMS("android.permission.SEND_SMS"),
-        READ_CONTACTS("android.permission.READ_CONTACTS")
-        ;
+        READ_PHONE_STATE(Manifest.permission.READ_PHONE_STATE),
+        STORAGE(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+        SEND_SMS(Manifest.permission.SEND_SMS),
+        RECEIVE_SMS(Manifest.permission.RECEIVE_SMS),
+        READ_CONTACTS(Manifest.permission.READ_CONTACTS);
 
         private String m_str;
         private Perm(String str) { m_str = str; }
+
         public String getString() { return m_str; }
         public static Perm getFor( String str ) {
             Perm result = null;
@@ -261,6 +263,7 @@ public class Perms23 {
     {
         // Log.d( TAG, "gotPermissionResult(%s)", perms.toString() );
         Map<Perm, Boolean> result = new HashMap<Perm, Boolean>();
+        boolean shouldResend = false;
         for ( int ii = 0; ii < perms.length; ++ii ) {
             Perm perm = Perm.getFor( perms[ii] );
             boolean granted = PackageManager.PERMISSION_GRANTED == granteds[ii];
@@ -269,9 +272,8 @@ public class Perms23 {
             // Hack. If SMS has been granted, resend all moves. This should be
             // replaced with an api allowing listeners to register
             // Perm-by-Perm, but I'm in a hurry.
-            if ( granted && perm == Perm.SEND_SMS ) {
-                GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS,
-                                       true, true );
+            if ( granted && (perm == Perm.SEND_SMS || perm == Perm.RECEIVE_SMS) ) {
+                shouldResend = true;
             }
 
             // Log.d( TAG, "calling %s.onPermissionResult(%s, %b)",
@@ -279,6 +281,11 @@ public class Perms23 {
             //                granted );
         }
 
+        if ( shouldResend ) {
+            GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS,
+                                   true, true );
+        }
+
         PermCbck cbck = s_map.remove( code );
         if ( null != cbck ) {
             cbck.onPermissionResult( result );
@@ -290,6 +297,7 @@ public class Perms23 {
         String permString = perm.getString();
         boolean result = PackageManager.PERMISSION_GRANTED
             == ContextCompat.checkSelfPermission( XWApp.getContext(), permString );
+        // Log.d( TAG, "havePermission(%s) => %b", permString, result );
         return result;
     }
 

From e614ba697d183203f0079421b9db9bd7e2ca08a3 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:22:07 -0800
Subject: [PATCH 041/145] refactor a tiny bit

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index 610d1421a..eba26c22c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -174,7 +174,7 @@ public class SMSService extends XWService {
     public static void stopService( Context context )
     {
         Intent intent = getIntentTo( context, SMSAction.STOP_SELF );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     // NBS case
@@ -184,7 +184,7 @@ public class SMSService extends XWService {
         Intent intent = getIntentTo( context, SMSAction.HANDLEDATA );
         intent.putExtra( BUFFER, buffer );
         intent.putExtra( PHONE, phone );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void inviteRemote( Context context, String phone,
@@ -195,7 +195,7 @@ public class SMSService extends XWService {
         Log.w( TAG, "inviteRemote(%s, '%s')", phone, nli );
         byte[] data = nli.asByteArray();
         intent.putExtra( GAMEDATA_BA, data );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static int sendPacket( Context context, String phone,
@@ -207,7 +207,7 @@ public class SMSService extends XWService {
             intent.putExtra( PHONE, phone );
             intent.putExtra( MultiService.GAMEID, gameID );
             intent.putExtra( BINBUFFER, binmsg );
-            context.startService( intent );
+            startService( context, intent );
             nSent = binmsg.length;
         } else {
             Log.i( TAG, "sendPacket: dropping because SMS disabled" );
@@ -220,14 +220,14 @@ public class SMSService extends XWService {
         Intent intent = getIntentTo( context, SMSAction.REMOVE );
         intent.putExtra( PHONE, phone );
         intent.putExtra( MultiService.GAMEID, gameID );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void onGameDictDownload( Context context, Intent intentOld )
     {
         Intent intent = getIntentTo( context, SMSAction.ADDED_MISSING );
         intent.fillIn( intentOld, 0 );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static String fromPublicFmt( String msg )
@@ -255,6 +255,12 @@ public class SMSService extends XWService {
         return result;
     }
 
+    private static void startService( Context context, Intent intent )
+    {
+        Log.d( TAG, "startService(%s)", intent );
+        context.startService( intent );
+    }
+
     private static Intent getIntentTo( Context context, SMSAction cmd )
     {
         Intent intent = new Intent( context, SMSService.class );
@@ -311,6 +317,7 @@ public class SMSService extends XWService {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
+        // Log.d( TAG, "onStartCommand(%s)", intent );
         int result = Service.START_NOT_STICKY;
         if ( null != intent ) {
             int ordinal = intent.getIntExtra( CMD_STR, -1 );

From 18e29a74edcf6d07236d579806d120adab967acd Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 16:56:45 -0800
Subject: [PATCH 042/145] make RelayService descend from JobIntentService

Required moving most of XWService into a class to which all services
could delegate what they used to inherit.

squash me
---
 .../android/app/src/main/AndroidManifest.xml  |   2 +
 .../org/eehouse/android/xw4/BTService.java    | 104 ++++++----
 .../org/eehouse/android/xw4/DelegateBase.java |   4 +-
 .../org/eehouse/android/xw4/RelayService.java |  76 +++++---
 .../org/eehouse/android/xw4/SMSService.java   |  64 +++---
 .../org/eehouse/android/xw4/WiDirService.java |  44 +++--
 .../org/eehouse/android/xw4/XWService.java    | 155 +--------------
 .../eehouse/android/xw4/XWServiceHelper.java  | 182 ++++++++++++++++++
 8 files changed, 362 insertions(+), 269 deletions(-)
 create mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index db24701c9..ef8e0f2d7 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
 
   <!-- Required for wifi-direct -->
   <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> -->
@@ -189,6 +190,7 @@
              />
     <service android:name="RelayService"
              android:exported="false"
+             android:permission="android.permission.BIND_JOB_SERVICE"
              />
 
     <receiver android:name=".MountEventReceiver">
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index f0277f0c7..4b984958a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -191,6 +191,7 @@ public class BTService extends XWService {
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
     private Handler mHandler;
+    private BTServiceHelper mHelper;
 
     private static int s_errCount = 0;
 
@@ -418,6 +419,8 @@ public class BTService extends XWService {
         Log.d( TAG, "%s.onCreate()", this );
         super.onCreate();
 
+        mHelper = new BTServiceHelper( this );
+
         m_btMsgSink = new BTMsgSink();
         mHandler = new Handler();
         startForegroundIf();
@@ -522,7 +525,7 @@ public class BTService extends XWService {
                     boolean cameOn = intent.getBooleanExtra( RADIO_KEY, false );
                     MultiEvent evt = cameOn? MultiEvent.BT_ENABLED
                         : MultiEvent.BT_DISABLED;
-                    postEvent( evt );
+                    mHelper.postEvent( evt );
                     if ( cameOn ) {
                         GameUtils.resendAllIf( this, CommsConnType.COMMS_CONN_BT );
                     } else {
@@ -581,6 +584,7 @@ public class BTService extends XWService {
         private BluetoothServerSocket m_serverSocket;
         private Context mContext;
         private BTService mService;
+        private BTServiceHelper mHelper;
         private volatile Thread mTimerThread;
 
         private BTListenerThread( Context context, BTService service )
@@ -595,7 +599,8 @@ public class BTService extends XWService {
             }
         }
 
-        static void startYourself( Context context, BTService service )
+        static void startYourself( Context context, BTService service,
+                                   BTServiceHelper helper )
         {
             Log.d( TAG, "startYourself(%s, %s)", context, service );
             DbgUtils.assertOnUIThread();
@@ -604,7 +609,7 @@ public class BTService extends XWService {
                     s_listener[0] = new BTListenerThread( context, service );
                     s_listener[0].start();
                 } else if ( null != service ) {
-                    s_listener[0].setService( context, service );
+                    s_listener[0].setService( context, service, helper );
                 }
             }
         }
@@ -612,7 +617,7 @@ public class BTService extends XWService {
         static void startYourself( Context context )
         {
             DbgUtils.assertOnUIThread();
-            startYourself( context, null );
+            startYourself( context, null, null );
         }
 
         static void stopYourself( BTListenerThread self )
@@ -634,11 +639,12 @@ public class BTService extends XWService {
             }
         }
 
-        void setService( Context context, BTService service )
+        void setService( Context context, BTService service, BTServiceHelper helper )
         {
             if ( null == mService ) {
                 Log.d( TAG, "setService(): we didn't have one before. Do something!!!" );
                 mService = service;
+                mHelper = helper;
                 Assert.assertNotNull( context );
                 mContext = context; // Use Service instead of Receiver (possibly)
             } else {
@@ -838,16 +844,16 @@ public class BTService extends XWService {
 
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
-                    ReceiveResult rslt
-                        = mService.receiveMessage( mContext,
-                                                   gameID, mService.m_btMsgSink,
-                                                   buffer, addr );
+                    XWServiceHelper.ReceiveResult rslt
+                        = mHelper.receiveMessage( mContext,
+                                                  gameID, mService.m_btMsgSink,
+                                                  buffer, addr );
 
-                    result = rslt == ReceiveResult.GAME_GONE ?
+                    result = rslt == XWServiceHelper.ReceiveResult.GAME_GONE ?
                         BTCmd.MESG_GAMEGONE : BTCmd.MESG_ACCPT;
                     break;
                 case MESG_GAMEGONE:
-                    mService.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                    mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                     result = BTCmd.MESG_ACCPT;
                     break;
                 default:
@@ -977,7 +983,7 @@ public class BTService extends XWService {
                             addrs.add( dev );
                         }
                         if ( null != event ) {
-                            postEvent( event, dev.getName() );
+                            mHelper.postEvent( event, dev.getName() );
                         }
                     }
                 } else {
@@ -1010,7 +1016,7 @@ public class BTService extends XWService {
                         } else {
                             gotReply = BTCmd.PONG == reply;
                             if ( gotReply && is.readBoolean() ) {
-                                postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                                mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                             }
                         }
 
@@ -1064,20 +1070,24 @@ public class BTService extends XWService {
                     }
 
                     if ( null == reply ) {
-                        postEvent( MultiEvent.APP_NOT_FOUND_BT, dev.getName() );
+                        mHelper.postEvent( MultiEvent.APP_NOT_FOUND_BT,
+                                           dev.getName() );
                     } else {
                         switch ( reply ) {
                         case BAD_PROTO:
                             sendBadProto( socket );
                             break;
                         case INVITE_ACCPT:
-                            postEvent( MultiEvent.NEWGAME_SUCCESS, elem.m_gameID );
+                            mHelper.postEvent( MultiEvent.NEWGAME_SUCCESS,
+                                               elem.m_gameID );
                             break;
                         case INVITE_DUPID:
-                            postEvent( MultiEvent.NEWGAME_DUP_REJECTED, dev.getName() );
+                            mHelper.postEvent( MultiEvent.NEWGAME_DUP_REJECTED,
+                                               dev.getName() );
                             break;
                         default:
-                            postEvent( MultiEvent.NEWGAME_FAILURE, elem.m_gameID );
+                            mHelper.postEvent( MultiEvent.NEWGAME_FAILURE,
+                                               elem.m_gameID );
                             break;
                         }
                     }
@@ -1160,10 +1170,10 @@ public class BTService extends XWService {
 
             if ( null != evt ) {
                 String btName = nameForAddr( m_adapter, elem.m_btAddr );
-                postEvent( evt, elem.m_gameID, 0, btName );
+                mHelper.postEvent( evt, elem.m_gameID, 0, btName );
                 if ( ! success ) {
                     int failCount = elem.incrFailCount();
-                    postEvent( MultiEvent.MESSAGE_RESEND, btName,
+                    mHelper.postEvent( MultiEvent.MESSAGE_RESEND, btName,
                                 RESEND_TIMEOUT, failCount );
                 }
             }
@@ -1183,7 +1193,7 @@ public class BTService extends XWService {
                         iter.remove();
                     } else if ( elem.failCountExceeded() ) {
                         String btName = nameForAddr( m_adapter, elem.m_btAddr );
-                        postEvent( MultiEvent.MESSAGE_FAILOUT, btName );
+                        mHelper.postEvent( MultiEvent.MESSAGE_FAILOUT, btName );
                         iter.remove();
                     }
                 }
@@ -1241,12 +1251,13 @@ public class BTService extends XWService {
             btNames[ii] = nameForAddr( m_adapter, btAddrs[ii] );
             ++ii;
         }
-        postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
+        mHelper.postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
     }
 
     private void startListener()
     {
-        BTListenerThread.startYourself( this, this );
+        Assert.assertNotNull( mHelper );
+        BTListenerThread.startYourself( this, this, mHelper );
     }
 
     private void startSender()
@@ -1271,28 +1282,12 @@ public class BTService extends XWService {
         m_sender = null;
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        String body = LocUtils.getString( this, R.string.new_bt_body_fmt,
-                                          device );
-
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-
-        postEvent( MultiEvent.BT_GAME_CREATED, rowid );
-    }
-
-    @Override
-    MultiMsgSink getSink( long rowid )
-    {
-        return m_btMsgSink;
-    }
-
     private BTCmd makeOrNotify( NetLaunchInfo nli, String btName,
                                 String btAddr )
     {
         BTCmd result;
-        if ( handleInvitation( nli, btName, DictFetchOwner.OWNER_BT ) ) { // here
+        if ( mHelper.handleInvitation( nli, btName,
+                                       DictFetchOwner.OWNER_BT ) ) {
             result = BTCmd.INVITE_ACCPT;
         } else {
             result = BTCmd.INVITE_DUP_INVITE; // dupe of rematch
@@ -1380,7 +1375,8 @@ public class BTService extends XWService {
 
     private void sendBadProto( BluetoothSocket socket )
     {
-        postEvent( MultiEvent.BAD_PROTO_BT, socket.getRemoteDevice().getName() );
+        mHelper.postEvent( MultiEvent.BAD_PROTO_BT,
+                           socket.getRemoteDevice().getName() );
     }
 
     private void updateStatusOut( boolean success )
@@ -1446,4 +1442,30 @@ public class BTService extends XWService {
             return nSent;
         }
     }
+
+    private class BTServiceHelper extends XWServiceHelper {
+        private Service mService;
+
+        BTServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        MultiMsgSink getSink( long rowid )
+        {
+            return m_btMsgSink;
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            String body = LocUtils.getString( mService, R.string.new_bt_body_fmt,
+                                              device );
+
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+
+            postEvent( MultiEvent.BT_GAME_CREATED, rowid );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 18564462b..0bd011297 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -143,14 +143,14 @@ public class DelegateBase implements DlgClickNotify,
     protected void onResume()
     {
         m_isVisible = true;
-        XWService.setListener( this );
+        XWServiceHelper.setListener( this );
         runIfVisible();
     }
 
     protected void onPause()
     {
         m_isVisible = false;
-        XWService.setListener( null );
+        XWServiceHelper.setListener( null );
     }
 
     protected DelegateBase curThis()
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 4934b75d5..14e8a0b78 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -25,9 +25,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v4.app.JobIntentService;
 import android.text.TextUtils;
 
-
 import org.eehouse.android.xw4.GameUtils.BackMoveResult;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
@@ -62,7 +62,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class RelayService extends XWService
+public class RelayService extends JobIntentService
     implements NetStateCache.StateChangedIf {
     private static final String TAG = RelayService.class.getSimpleName();
     private static final int MAX_SEND = 1024;
@@ -121,6 +121,7 @@ public class RelayService extends XWService
     private long m_lastGamePacketReceived;
     private int m_nativeFailScore;
     private boolean m_skipUPDSet;
+    private RelayServiceHelper mHelper;
     private static DevIDType s_curType = DevIDType.ID_TYPE_NONE;
     private static long s_regStartTime = 0;
 
@@ -221,20 +222,17 @@ public class RelayService extends XWService
 
     public static void startService( Context context )
     {
-        Log.i( TAG, "startService()" );
         Intent intent = getIntentTo( context, MsgCmds.UDP_CHANGED );
         startService( context, intent );
     }
 
+    // Must use the same lobID for all work enqueued for the same class
+    private final static int sJobID = RelayService.class.hashCode();
+
     private static void startService( Context context, Intent intent )
     {
-        Log.d( TAG, "startService(%s)", intent );
-
-        if ( inForeground() || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
-            context.startService( intent );
-        } else {
-            Log.d( TAG, "startService(); not starting" );
-        }
+        Log.d( TAG, "startService(%s) (calling enqueueWork())", intent );
+        enqueueWork( context, RelayService.class, sJobID, intent );
     }
 
     private static void stopService( Context context )
@@ -308,18 +306,11 @@ public class RelayService extends XWService
     {
         Log.d( TAG, "receiveInvitation: got nli from %d: %s", srcDevID,
                nli.toString() );
-        if ( !handleInvitation( nli, null, DictFetchOwner.OWNER_RELAY ) ) {
+        if ( !mHelper.handleInvitation( nli, null, DictFetchOwner.OWNER_RELAY ) ) {
             Log.d( TAG, "handleInvitation() failed" );
         }
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        String body = LocUtils.getString( this, R.string.new_relay_body );
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-    }
-
     // Exists to get incoming data onto the main thread
     private static void postData( Context context, long rowid, byte[] msg )
     {
@@ -364,16 +355,12 @@ public class RelayService extends XWService
         return intent;
     }
 
-    @Override
-    protected MultiMsgSink getSink( long rowid )
-    {
-        return new RelayMsgSink().setRowID( rowid );
-    }
-
     @Override
     public void onCreate()
     {
+        Log.d( TAG, "onCreate()" );
         super.onCreate();
+        mHelper = new RelayServiceHelper( this );
         m_lastGamePacketReceived =
             XWPrefs.getPrefsLong( this, R.string.key_last_packet,
                                   Utils.getCurSeconds() );
@@ -398,6 +385,8 @@ public class RelayService extends XWService
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
+        Log.d( TAG, "onStartCommand(%s)", intent );
+        super.onStartCommand( intent, flags, startId );
         Integer result = handleCommand( intent );
 
         if ( null == result ) {
@@ -409,6 +398,13 @@ public class RelayService extends XWService
         return result;
     }
 
+    @Override
+    public void onHandleWork( Intent intent )
+    {
+        Log.d( TAG, "onHandleWork(%s)", intent );
+        /*void*/ handleCommand( intent );
+    }
+
     @Override
     public void onDestroy()
     {
@@ -436,7 +432,7 @@ public class RelayService extends XWService
             cmd = null;
         }
         if ( null != cmd ) {
-            // Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
+            Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
             case PROCESS_GAME_MSGS:
                 String[] relayIDs = new String[1];
@@ -483,7 +479,7 @@ public class RelayService extends XWService
                     String relayID = intent.getStringExtra( RELAY_ID );
                     sendNoConnMessage( rowid, relayID, msg );
                 } else {
-                    receiveMessage( this, rowid, null, msg, s_addr );
+                    mHelper.receiveMessage( this, rowid, null, msg, s_addr );
                 }
                 break;
             case INVITE:
@@ -621,8 +617,6 @@ public class RelayService extends XWService
 
     private void stopUDPThreadsIf()
     {
-        DbgUtils.assertOnUIThread();
-
         UDPThreads threads = m_UDPThreadsRef.getAndSet( null );
         if ( null != threads ) {
             threads.stop();
@@ -648,7 +642,7 @@ public class RelayService extends XWService
                     Log.i( TAG, "relay unvailable for another %d seconds",
                            unavail );
                     String str = getVLIString( dis );
-                    postEvent( MultiEvent.RELAY_ALERT, str );
+                    mHelper.postEvent( MultiEvent.RELAY_ALERT, str );
                     break;
                 case XWPDEV_ALERT:
                     str = getVLIString( dis );
@@ -999,7 +993,7 @@ public class RelayService extends XWService
                     long rowid = rowIDs[ii];
                     sink.setRowID( rowid );
                     for ( byte[] msg : forOne ) {
-                        receiveMessage( this, rowid, sink, msg, s_addr );
+                        mHelper.receiveMessage( this, rowid, sink, msg, s_addr );
                     }
                 }
             }
@@ -1728,6 +1722,28 @@ public class RelayService extends XWService
         }
     }
 
+    private class RelayServiceHelper extends XWServiceHelper {
+
+        private Service mService;
+        RelayServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        protected MultiMsgSink getSink( long rowid )
+        {
+            return new RelayMsgSink().setRowID( rowid );
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            String body = LocUtils.getString( mService, R.string.new_relay_body );
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+        }
+    }
+
     // Exits only to exist, so instanceof can distinguish
     private class EOQPacketData extends PacketData {}
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index eba26c22c..74500b81d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -86,6 +86,7 @@ public class SMSService extends XWService {
     private BroadcastReceiver m_sentReceiver;
     private BroadcastReceiver m_receiveReceiver;
     private OnSharedPreferenceChangeListener m_prefsListener;
+    private SMSServiceHelper mHelper;
 
     private int m_nReceived = 0;
     private static int s_nSent = 0;
@@ -277,15 +278,10 @@ public class SMSService extends XWService {
         return s_showToasts;
     }
 
-    @Override
-    protected MultiMsgSink getSink( long rowid )
-    {
-        return new SMSMsgSink( this );
-    }
-
     @Override
     public void onCreate()
     {
+        mHelper = new SMSServiceHelper( this );
         if ( Utils.deviceSupportsSMS( this ) ) {
             registerReceivers();
         } else {
@@ -469,10 +465,10 @@ public class SMSService extends XWService {
             }
             break;
         case DEATH:
-            postEvent( MultiEvent.MESSAGE_NOGAME, msg.gameID );
+            mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, msg.gameID );
             break;
         case ACK_INVITE:
-            postEvent( MultiEvent.NEWGAME_SUCCESS, msg.gameID );
+            mHelper.postEvent( MultiEvent.NEWGAME_SUCCESS, msg.gameID );
             break;
         default:
             Log.w( TAG, "unexpected cmd %s", msg.cmd );
@@ -489,26 +485,17 @@ public class SMSService extends XWService {
             for ( SMSProtoMsg msg : msgs ) {
                 receive( msg, senderPhone );
             }
-            postEvent( MultiEvent.SMS_RECEIVE_OK );
+            mHelper.postEvent( MultiEvent.SMS_RECEIVE_OK );
         } else {
             Log.d( TAG, "receiveBuffer(): bogus or incomplete message from %s",
                    senderPhone );
         }
     }
 
-    @Override
-    protected void postNotification( String phone, int gameID, long rowid )
-    {
-        String owner = Utils.phoneToContact( this, phone, true );
-        String body = LocUtils.getString( this, R.string.new_name_body_fmt,
-                                          owner );
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-    }
-
     private void makeForInvite( String phone, NetLaunchInfo nli )
     {
         if ( nli != null ) {
-            handleInvitation( nli, phone, DictFetchOwner.OWNER_SMS );
+            mHelper.handleInvitation( nli, phone, DictFetchOwner.OWNER_SMS );
             ackInvite( phone, nli.gameID() );
         }
     }
@@ -554,7 +541,7 @@ public class SMSService extends XWService {
                 } catch ( NullPointerException npe ) {
                     Assert.fail();      // shouldn't be trying to do this!!!
                 } catch ( java.lang.SecurityException se ) {
-                    postEvent( MultiEvent.SMS_SEND_FAILED_NOPERMISSION );
+                    mHelper.postEvent( MultiEvent.SMS_SEND_FAILED_NOPERMISSION );
                 } catch ( Exception ee ) {
                     Log.ex( TAG, ee );
                 }
@@ -575,11 +562,12 @@ public class SMSService extends XWService {
 
     private boolean feedMessage( int gameID, byte[] msg, CommsAddrRec addr )
     {
-        ReceiveResult rslt = receiveMessage( this, gameID, null, msg, addr );
-        if ( ReceiveResult.GAME_GONE == rslt ) {
+        XWServiceHelper.ReceiveResult rslt = mHelper
+            .receiveMessage( this, gameID, null, msg, addr );
+        if ( XWServiceHelper.ReceiveResult.GAME_GONE == rslt ) {
             sendDiedPacket( addr.sms_phone, gameID );
         }
-        return rslt == ReceiveResult.OK;
+        return rslt == XWServiceHelper.ReceiveResult.OK;
     }
 
     private void registerReceivers()
@@ -590,15 +578,15 @@ public class SMSService extends XWService {
                 {
                     switch ( getResultCode() ) {
                     case Activity.RESULT_OK:
-                        postEvent( MultiEvent.SMS_SEND_OK );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_OK );
                         break;
                     case SmsManager.RESULT_ERROR_RADIO_OFF:
-                        postEvent( MultiEvent.SMS_SEND_FAILED_NORADIO );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_FAILED_NORADIO );
                         break;
                     case SmsManager.RESULT_ERROR_NO_SERVICE:
                     default:
                         Log.w( TAG, "FAILURE!!!" );
-                        postEvent( MultiEvent.SMS_SEND_FAILED );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_FAILED );
                         break;
                     }
                 }
@@ -655,4 +643,28 @@ public class SMSService extends XWService {
             return sendPacket( addr.sms_phone, gameID, buf );
         }
     }
+
+    private class SMSServiceHelper extends XWServiceHelper {
+        private Service mService;
+
+        SMSServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        protected MultiMsgSink getSink( long rowid )
+        {
+            return new SMSMsgSink( SMSService.this );
+        }
+
+        @Override
+        protected void postNotification( String phone, int gameID, long rowid )
+        {
+            String owner = Utils.phoneToContact( mService, phone, true );
+            String body = LocUtils.getString( mService, R.string.new_name_body_fmt,
+                                              owner );
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index 600c03770..432d191b9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -124,6 +124,7 @@ public class WiDirService extends XWService {
     private static Set<String> s_peersSet;
 
     private P2pMsgSink m_sink;
+    private WiDirServiceHelper mHelper;
 
     public interface DevSetListener {
         void setChanged( Map<String, String> macToName );
@@ -133,6 +134,7 @@ public class WiDirService extends XWService {
     public void onCreate()
     {
         m_sink = new P2pMsgSink();
+        mHelper = new WiDirServiceHelper(this);
     }
 
     @Override
@@ -751,8 +753,9 @@ public class WiDirService extends XWService {
         CommsAddrRec addr = new CommsAddrRec( CommsConnType.COMMS_CONN_P2P )
             .setP2PParams( macAddress );
 
-        ReceiveResult rslt = receiveMessage( this, gameID, m_sink, data, addr );
-        if ( ReceiveResult.GAME_GONE == rslt ) {
+        XWServiceHelper.ReceiveResult rslt = mHelper
+            .receiveMessage( this, gameID, m_sink, data, addr );
+        if ( XWServiceHelper.ReceiveResult.GAME_GONE == rslt ) {
             sendNoGame( null, macAddress, gameID );
         }
     }
@@ -764,27 +767,15 @@ public class WiDirService extends XWService {
         NetLaunchInfo nli = NetLaunchInfo.makeFrom( this, nliData );
         String returnMac = intent.getStringExtra( KEY_SRC );
 
-        if ( !handleInvitation( nli, returnMac, DictFetchOwner.OWNER_P2P ) ) {
+        if ( !mHelper.handleInvitation( nli, returnMac, DictFetchOwner.OWNER_P2P ) ) {
             Log.d( TAG, "handleInvitation() failed" );
         }
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        Log.e( TAG, "postNotification() doing nothing" );
-    }
-
-    @Override
-    MultiMsgSink getSink( long rowid )
-    {
-        return m_sink;
-    }
-
     private void handleGameGone( Intent intent )
     {
         int gameID = intent.getIntExtra( KEY_GAMEID, 0 );
-        postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+        mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
     }
 
     private void makeGame( NetLaunchInfo nli, String senderMac )
@@ -794,7 +785,7 @@ public class WiDirService extends XWService {
             CommsAddrRec addr = nli.makeAddrRec( this );
             long rowid = GameUtils.makeNewMultiGame( this, nli,
                                                      m_sink,
-                                                     getUtilCtxt() );
+                                                     mHelper.getUtilCtxt() );
             if ( DBUtils.ROWID_NOTFOUND != rowid ) {
                 if ( null != nli.gameName && 0 < nli.gameName.length() ) {
                     DBUtils.setName( this, rowid, nli.gameName );
@@ -1206,4 +1197,23 @@ public class WiDirService extends XWService {
     private class P2pMsgSink extends MultiMsgSink {
         public P2pMsgSink() { super( WiDirService.this ); }
     }
+
+    private class WiDirServiceHelper extends XWServiceHelper {
+
+        WiDirServiceHelper( Service service ) {
+            super( service );
+        }
+
+        @Override
+        MultiMsgSink getSink( long rowid )
+        {
+            return m_sink;
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            Log.e( TAG, "postNotification() doing nothing" );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 4e431f2c0..c995ba897 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -1,6 +1,6 @@
 /* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
 /*
- * Copyright 2010 - 2012 by Eric House (xwords@eehouse.org).  All
+ * Copyright 2010 - 2018 by Eric House (xwords@eehouse.org).  All
  * rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,166 +21,15 @@
 package org.eehouse.android.xw4;
 
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
-
-import org.eehouse.android.xw4.MultiService.DictFetchOwner;
-import org.eehouse.android.xw4.MultiService.MultiEvent;
-import org.eehouse.android.xw4.jni.CommsAddrRec;
-import org.eehouse.android.xw4.jni.JNIThread;
-import org.eehouse.android.xw4.jni.UtilCtxt;
-import org.eehouse.android.xw4.jni.UtilCtxtImpl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-abstract class XWService extends Service {
+class XWService extends Service {
     private static final String TAG = XWService.class.getSimpleName();
-    public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
-
-    protected static MultiService s_srcMgr = null;
-    private static Map<String, Long> s_seen = new HashMap<>();
-
-    private UtilCtxt m_utilCtxt;
 
     @Override
     public IBinder onBind( Intent intent )
     {
         return null;
     }
-
-    public final static void setListener( MultiService.MultiEventListener li )
-    {
-        if ( null == s_srcMgr ) {
-            // DbgUtils.logf( "XWService.setListener: registering %s", li.getClass().getName() );
-            s_srcMgr = new MultiService();
-        }
-        s_srcMgr.setListener( li );
-    }
-
-    protected void postEvent( MultiEvent event, Object ... args )
-    {
-        if ( null != s_srcMgr ) {
-            s_srcMgr.postEvent( event, args );
-        } else {
-            Log.d( TAG, "postEvent(): dropping %s event",
-                   event.toString() );
-        }
-    }
-
-    // Check that we aren't already processing an invitation with this
-    // inviteID.
-    private static final long SEEN_INTERVAL_MS = 1000 * 5;
-    private boolean checkNotDupe( NetLaunchInfo nli )
-    {
-        String inviteID = nli.inviteID();
-        synchronized( s_seen ) {
-            long now = System.currentTimeMillis();
-            Long lastSeen = s_seen.get( inviteID );
-            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
-            if ( !seen ) {
-                s_seen.put( inviteID, now );
-            }
-            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
-            return !seen;
-        }
-    }
-
-    abstract void postNotification( String device, int gameID, long rowid );
-
-    // Return true if able to start game only
-    protected boolean handleInvitation( NetLaunchInfo nli, String device,
-                                        DictFetchOwner dfo )
-    {
-        boolean success = false;
-        long[] rowids = DBUtils.getRowIDsFor( this, nli.gameID() );
-        if ( 0 == rowids.length
-             || ( rowids.length < nli.nPlayersT // will break for two-per-device game
-                  && XWPrefs.getSecondInviteAllowed( this ) ) ) {
-
-            if ( nli.isValid() && checkNotDupe( nli ) ) {
-
-                if ( DictLangCache.haveDict( this, nli.lang, nli.dict ) ) {
-                    long rowid = GameUtils.makeNewMultiGame( this, nli,
-                                                             getSink( 0 ),
-                                                             getUtilCtxt() );
-
-                    if ( null != nli.gameName && 0 < nli.gameName.length() ) {
-                        DBUtils.setName( this, rowid, nli.gameName );
-                    }
-
-                    postNotification( device, nli.gameID(), rowid );
-                    success = true;
-                } else {
-                    Intent intent = MultiService
-                        .makeMissingDictIntent( this, nli, dfo );
-                    MultiService.postMissingDictNotification( this, intent,
-                                                              nli.gameID() );
-                }
-            }
-        }
-        Log.d( TAG, "handleInvitation() => %b", success );
-        return success;
-    }
-
-    protected UtilCtxt getUtilCtxt()
-    {
-        if ( null == m_utilCtxt ) {
-            m_utilCtxt = new UtilCtxtImpl( this );
-        }
-        return m_utilCtxt;
-    }
-
-    // Meant to be overridden
-    abstract MultiMsgSink getSink( long rowid );
-
-    protected ReceiveResult receiveMessage( Context context, int gameID,
-                                            MultiMsgSink sink, byte[] msg,
-                                            CommsAddrRec addr )
-    {
-        ReceiveResult result;
-        long[] rowids = DBUtils.getRowIDsFor( context, gameID );
-        if ( null == rowids || 0 == rowids.length ) {
-            result = ReceiveResult.GAME_GONE;
-        } else {
-            result = ReceiveResult.UNCONSUMED;
-            for ( long rowid : rowids ) {
-                if ( receiveMessage( context, rowid, sink, msg, addr ) ) {
-                    result = ReceiveResult.OK;
-                }
-            }
-        }
-        return result;
-    }
-
-    protected boolean receiveMessage( Context context, long rowid,
-                                      MultiMsgSink sink, byte[] msg,
-                                      CommsAddrRec addr )
-    {
-        boolean allConsumed = true;
-        boolean[] isLocalP = new boolean[1];
-        JNIThread jniThread = JNIThread.getRetained( rowid, false );
-        boolean consumed = false;
-        if ( null != jniThread ) {
-            consumed = true;
-            jniThread.receive( msg, addr ).release();
-        } else {
-            GameUtils.BackMoveResult bmr = new GameUtils.BackMoveResult();
-            if ( null == sink ) {
-                sink = getSink( rowid );
-            }
-            if ( GameUtils.feedMessage( context, rowid, msg, addr,
-                                        sink, bmr, isLocalP ) ) {
-                consumed = true;
-                GameUtils.postMoveNotification( context, rowid, bmr,
-                                                isLocalP[0] );
-            }
-        }
-        if ( allConsumed && !consumed ) {
-            allConsumed = false;
-        }
-        return allConsumed;
-    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
new file mode 100644
index 000000000..e23a85349
--- /dev/null
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -0,0 +1,182 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2010 - 2018 by Eric House (xwords@eehouse.org).  All
+ * rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+
+import org.eehouse.android.xw4.MultiService.DictFetchOwner;
+import org.eehouse.android.xw4.MultiService.MultiEvent;
+import org.eehouse.android.xw4.jni.CommsAddrRec;
+import org.eehouse.android.xw4.jni.JNIThread;
+import org.eehouse.android.xw4.jni.UtilCtxt;
+import org.eehouse.android.xw4.jni.UtilCtxtImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+abstract class XWServiceHelper {
+    private static final String TAG = XWServiceHelper.class.getSimpleName();  
+    private Service mService;
+    private static MultiService s_srcMgr = null;
+
+    public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
+
+    XWServiceHelper( Service service )
+    {
+        mService = service;
+    }
+
+    abstract MultiMsgSink getSink( long rowid );
+    abstract void postNotification( String device, int gameID, long rowid );
+
+    protected ReceiveResult receiveMessage( Context context, int gameID,
+                                            MultiMsgSink sink, byte[] msg,
+                                            CommsAddrRec addr )
+    {
+        ReceiveResult result;
+        long[] rowids = DBUtils.getRowIDsFor( context, gameID );
+        if ( null == rowids || 0 == rowids.length ) {
+            result = ReceiveResult.GAME_GONE;
+        } else {
+            result = ReceiveResult.UNCONSUMED;
+            for ( long rowid : rowids ) {
+                if ( receiveMessage( context, rowid, sink, msg, addr ) ) {
+                    result = ReceiveResult.OK;
+                }
+            }
+        }
+        return result;
+    }
+
+    protected boolean receiveMessage( Context context, long rowid,
+                                      MultiMsgSink sink, byte[] msg,
+                                      CommsAddrRec addr )
+    {
+        boolean allConsumed = true;
+        boolean[] isLocalP = new boolean[1];
+        JNIThread jniThread = JNIThread.getRetained( rowid, false );
+        boolean consumed = false;
+        if ( null != jniThread ) {
+            consumed = true;
+            jniThread.receive( msg, addr ).release();
+        } else {
+            GameUtils.BackMoveResult bmr = new GameUtils.BackMoveResult();
+            if ( null == sink ) {
+                sink = getSink( rowid );
+            }
+            if ( GameUtils.feedMessage( context, rowid, msg, addr,
+                                        sink, bmr, isLocalP ) ) {
+                consumed = true;
+                GameUtils.postMoveNotification( context, rowid, bmr,
+                                                isLocalP[0] );
+            }
+        }
+        if ( allConsumed && !consumed ) {
+            allConsumed = false;
+        }
+        return allConsumed;
+    }
+
+    public final static void setListener( MultiService.MultiEventListener li )
+    {
+        if ( null == s_srcMgr ) {
+            // DbgUtils.logf( "XWService.setListener: registering %s",
+            // li.getClass().getName() );
+            s_srcMgr = new MultiService();
+        }
+        s_srcMgr.setListener( li );
+    }
+
+    protected void postEvent( MultiEvent event, Object ... args )
+    {
+        if ( null != s_srcMgr ) {
+            s_srcMgr.postEvent( event, args );
+        } else {
+            Log.d( TAG, "postEvent(): dropping %s event",
+                   event.toString() );
+        }
+    }
+
+    protected boolean handleInvitation( NetLaunchInfo nli, String device,
+                                        DictFetchOwner dfo )
+    {
+        boolean success = false;
+        long[] rowids = DBUtils.getRowIDsFor( mService, nli.gameID() );
+        if ( 0 == rowids.length
+             || ( rowids.length < nli.nPlayersT // will break for two-per-device game
+                  && XWPrefs.getSecondInviteAllowed( mService ) ) ) {
+
+            if ( nli.isValid() && checkNotDupe( nli ) ) {
+
+                if ( DictLangCache.haveDict( mService, nli.lang, nli.dict ) ) {
+                    long rowid = GameUtils.makeNewMultiGame( mService, nli,
+                                                             getSink( 0 ),
+                                                             getUtilCtxt() );
+
+                    if ( null != nli.gameName && 0 < nli.gameName.length() ) {
+                        DBUtils.setName( mService, rowid, nli.gameName );
+                    }
+
+                    postNotification( device, nli.gameID(), rowid );
+                    success = true;
+                } else {
+                    Intent intent = MultiService
+                        .makeMissingDictIntent( mService, nli, dfo );
+                    MultiService.postMissingDictNotification( mService, intent,
+                                                              nli.gameID() );
+                }
+            }
+        }
+        Log.d( TAG, "handleInvitation() => %b", success );
+        return success;
+    }
+
+    private UtilCtxt m_utilCtxt;
+    protected UtilCtxt getUtilCtxt()
+    {
+        if ( null == m_utilCtxt ) {
+            m_utilCtxt = new UtilCtxtImpl( mService );
+        }
+        return m_utilCtxt;
+    }
+    
+    // Check that we aren't already processing an invitation with this
+    // inviteID.
+    private static final long SEEN_INTERVAL_MS = 1000 * 5;
+    private static Map<String, Long> s_seen = new HashMap<>();
+    private boolean checkNotDupe( NetLaunchInfo nli )
+    {
+        String inviteID = nli.inviteID();
+        synchronized( s_seen ) {
+            long now = System.currentTimeMillis();
+            Long lastSeen = s_seen.get( inviteID );
+            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
+            if ( !seen ) {
+                s_seen.put( inviteID, now );
+            }
+            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
+            return !seen;
+        }
+    }
+}

From 450c39ed575b8c2c47fb17cf32b24524324657e0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 9 Dec 2018 17:11:38 -0800
Subject: [PATCH 043/145] new DebugUtils method

---
 .../src/main/java/org/eehouse/android/xw4/DbgUtils.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index e1b6f86c1..67d237f6a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -101,7 +101,12 @@ public class DbgUtils {
 
     public static void assertOnUIThread()
     {
-        Assert.assertTrue( Utils.isOnUIThread() );
+        assertOnUIThread( true );
+    }
+
+    public static void assertOnUIThread( boolean isOnThread )
+    {
+        Assert.assertTrue( isOnThread == Utils.isOnUIThread() );
     }
 
     public static void printStack( String tag, StackTraceElement[] trace )

From 5284dce9b8f601bee5af6532498bcf3e6e312b56 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 9 Dec 2018 18:21:30 -0800
Subject: [PATCH 044/145] decouple networking threads from RelayService

Oreo's creating a new service instance for every single intent passed to
enqueueWork, meaning a brand new set of threads with a new queue, empty
set of messages to be retried, etc. was created every time, and all
attempts to optimize and retry were broken. So: make the threads a
static singleton that are given a Service instance from onCreate() and
told to drop it from onDestroy(). The threads proceed until they need an
instance, then block until one's available. Seems to work on Oreo and an
older Android as well.
---
 .../org/eehouse/android/xw4/RelayService.java | 388 +++++++++++-------
 1 file changed, 250 insertions(+), 138 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 14e8a0b78..cee000858 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -114,13 +114,14 @@ public class RelayService extends JobIntentService
     static { resetBackoffTimer(); }
 
     private Thread m_fetchThread = null; // no longer used
-    private AtomicReference<UDPThreads> m_UDPThreadsRef = new AtomicReference<>();
+    private static final AtomicReference<UDPThreads> sUDPThreadsRef = new AtomicReference<>();
     private Handler m_handler;
+    private UDPThreads mThreads;
     private Runnable m_onInactivity;
     private int m_maxIntervalSeconds = 0;
     private long m_lastGamePacketReceived;
-    private int m_nativeFailScore;
-    private boolean m_skipUPDSet;
+    private static AtomicInteger sNativeFailScore = new AtomicInteger();;
+    private static boolean sSkipUPDSet;
     private RelayServiceHelper mHelper;
     private static DevIDType s_curType = DevIDType.ID_TYPE_NONE;
     private static long s_regStartTime = 0;
@@ -358,7 +359,7 @@ public class RelayService extends JobIntentService
     @Override
     public void onCreate()
     {
-        Log.d( TAG, "onCreate()" );
+        Log.d( TAG, "%s.onCreate()", this );
         super.onCreate();
         mHelper = new RelayServiceHelper( this );
         m_lastGamePacketReceived =
@@ -378,31 +379,20 @@ public class RelayService extends JobIntentService
                     }
                 }
             };
-
-        m_skipUPDSet = XWPrefs.getSkipToWebAPI( this );
-    }
-
-    @Override
-    public int onStartCommand( Intent intent, int flags, int startId )
-    {
-        Log.d( TAG, "onStartCommand(%s)", intent );
-        super.onStartCommand( intent, flags, startId );
-        Integer result = handleCommand( intent );
-
-        if ( null == result ) {
-            result = Service.START_STICKY_COMPATIBILITY;
+        mThreads = startUDPThreadsOnce();
+        if ( null == mThreads ) {
+            stopSelf();
         }
-
-        NetStateCache.register( this, this );
-        resetExitTimer();
-        return result;
+        sSkipUPDSet = XWPrefs.getSkipToWebAPI( this );
     }
 
     @Override
     public void onHandleWork( Intent intent )
     {
         Log.d( TAG, "onHandleWork(%s)", intent );
-        /*void*/ handleCommand( intent );
+        DbgUtils.assertOnUIThread( false );
+        handleCommand( intent );
+        resetExitTimer();
     }
 
     @Override
@@ -412,8 +402,11 @@ public class RelayService extends JobIntentService
             long interval_millis = getMaxIntervalSeconds() * 1000;
             RelayReceiver.setTimer( this, interval_millis );
         }
-        stopThreads();
+        if ( null != mThreads ) {
+            mThreads.unsetService();
+        }
         super.onDestroy();
+        Log.d( TAG, "%s.onDestroy() DONE", this );
     }
 
     // NetStateCache.StateChangedIf interface
@@ -422,9 +415,8 @@ public class RelayService extends JobIntentService
         startService( this ); // bad name: will *stop* threads too
     }
 
-    private Integer handleCommand( Intent intent )
+    private void handleCommand( Intent intent )
     {
-        Integer result = null;
         MsgCmds cmd;
         try {
             cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
@@ -432,7 +424,7 @@ public class RelayService extends JobIntentService
             cmd = null;
         }
         if ( null != cmd ) {
-            Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
+            Log.d( TAG, "handleCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
             case PROCESS_GAME_MSGS:
                 String[] relayIDs = new String[1];
@@ -470,7 +462,7 @@ public class RelayService extends JobIntentService
             case SEND:
             case RECEIVE:
             case SENDNOCONN:
-                startUDPThreadsIfNot();
+                startUDPThreadsOnce();
                 long rowid = intent.getLongExtra( ROWID, -1 );
                 byte[] msg = intent.getByteArrayExtra( BINBUFFER );
                 if ( MsgCmds.SEND == cmd ) {
@@ -483,7 +475,7 @@ public class RelayService extends JobIntentService
                 }
                 break;
             case INVITE:
-                startUDPThreadsIfNot();
+                startUDPThreadsOnce();
                 srcDevID = intent.getIntExtra( DEV_ID_SRC, 0 );
                 int destDevID = intent.getIntExtra( DEV_ID_DEST, 0 );
                 String relayID = intent.getStringExtra( RELAY_ID );
@@ -505,12 +497,9 @@ public class RelayService extends JobIntentService
                 stopSelf();
                 break;
             default:
-                Assert.fail();
+                Assert.assertFalse( BuildConfig.DEBUG );
             }
-
-            result = Service.START_STICKY;
         }
-        return result;
     }
 
     private void setupNotifications( String[] relayIDs, BackMoveResult[] bmrs,
@@ -553,6 +542,7 @@ public class RelayService extends JobIntentService
     {
         while ( null != m_fetchThread ) {
             Log.w( TAG, "2: m_fetchThread NOT NULL; WHAT TO DO???" );
+            Assert.assertFalse( BuildConfig.DEBUG );
             try {
                 Thread.sleep( 20 );
             } catch( java.lang.InterruptedException ie ) {
@@ -561,24 +551,38 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private void startUDPThreadsIfNot()
+    private UDPThreads startUDPThreadsOnce()
     {
+        UDPThreads threads = null;
         if ( XWApp.UDP_ENABLED && relayEnabled( this ) ) {
-            synchronized ( m_UDPThreadsRef ) {
-                if ( null == m_UDPThreadsRef.get() ) {
-                    UDPThreads threads = new UDPThreads();
-                    m_UDPThreadsRef.set( threads );
+            synchronized ( sUDPThreadsRef ) {
+                threads = sUDPThreadsRef.get();
+                if ( null == threads ) {
+                    threads = new UDPThreads();
+                    sUDPThreadsRef.set( threads );
                     threads.start();
                 }
+                threads.setService( this );
             }
         } else {
-            Log.i( TAG, "startUDPThreadsIfNot(): UDP disabled" );
+            Log.i( TAG, "startUDPThreadsOnce(): UDP disabled" );
         }
-    } // startUDPThreadsIfNot
+        return threads;
+    } // startUDPThreadsOnce
 
-    private boolean skipNativeSend()
+    private void stopUDPThreads()
     {
-        boolean skip = m_nativeFailScore > UDP_FAIL_LIMIT || m_skipUPDSet;
+        synchronized ( sUDPThreadsRef ) {
+            UDPThreads threads = sUDPThreadsRef.getAndSet( null );
+            if ( null != threads ) {
+                threads.stop();
+            }
+        }
+    }
+
+    private static boolean skipNativeSend()
+    {
+        boolean skip = sNativeFailScore.get() > UDP_FAIL_LIMIT || sSkipUPDSet;
         // Log.d( TAG, "skipNativeSend(score=%d)) => %b", m_nativeFailScore, skip );
         return skip;
     }
@@ -615,14 +619,6 @@ public class RelayService extends JobIntentService
         Log.d( TAG, "noteSent(fromUDP=%b): size after: %d", fromUDP, map.size() );
     }
 
-    private void stopUDPThreadsIf()
-    {
-        UDPThreads threads = m_UDPThreadsRef.getAndSet( null );
-        if ( null != threads ) {
-            threads.stop();
-        }
-    }
-
     // MIGHT BE Running on reader thread
     private void gotPacket( byte[] data, boolean skipAck, boolean fromUDP )
     {
@@ -687,7 +683,7 @@ public class RelayService extends JobIntentService
                     break;
                 case XWPDEV_UPGRADE:
                     intent = getIntentTo( this, MsgCmds.UPGRADE );
-                    startService( intent );
+                    startService( this, intent );
                     break;
                 case XWPDEV_GOTINVITE:
                     resetBackoff = true;
@@ -700,7 +696,7 @@ public class RelayService extends JobIntentService
                     String asStr = nli.toString();
                     Log.d( TAG, "got invitation: %s", asStr );
                     intent.putExtra( NLI_DATA, asStr );
-                    startService( intent );
+                    startService( this, intent );
                     break;
                 case XWPDEV_ACK:
                     noteAck( vli2un( dis ), fromUDP );
@@ -932,8 +928,7 @@ public class RelayService extends JobIntentService
 
     private void postPacket( ByteArrayOutputStream bas, XWRelayReg cmd )
     {
-        startUDPThreadsIfNot();
-        UDPThreads threads = m_UDPThreadsRef.get();
+        UDPThreads threads = startUDPThreadsOnce();
         if ( threads != null ) {
             threads.add( new PacketData( bas, cmd ) );
         }
@@ -1001,14 +996,111 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private class UDPThreads {
+    private static class UDPThreads {
         private DatagramSocket m_UDPSocket;
         private LinkedBlockingQueue<PacketData> m_queue =
             new LinkedBlockingQueue<PacketData>();
         private Thread m_UDPReadThread;
         private Thread m_UDPWriteThread;
+        private RelayService[] mServiceHolder = {null};
+        private AtomicInteger mHaveServiceCount = new AtomicInteger();
 
-        UDPThreads() {}
+        // Here's the problem: In the Oreo world, RelayService instances come
+        // and go, typically lasting only long enough to disptach a single
+        // onHandleWork() call. So the UDPThreads instance is now a static
+        // singleton that lasts a really long time, across the lives of
+        // hundreds of RelayService instances. It and its threads, however,
+        // have to make calls on RelayService instances. So I need a way to
+        // block them when there's no instance available AND to block
+        // onDestroy() returning until all references to the current instance
+        // have been forgotten.
+        //
+        // The solution is to set and clear the instance through
+        // [un]setService().  And to wrap the code inside that needs
+        // references in a AutoCloseable that when instantiated blocks when
+        // the instance is null. Thus when setService() is called with a new
+        // instance, all the requests for an instance are unblocked and each
+        // of them increments a counter. When the AutoCloseable's close() is
+        // called, the counter is decremented. unsetService() waits until that
+        // counter is 0 (and so the close() method calls notifyAll() when the
+        // counter's dropped to 0.)
+        //
+        // It works like this: the threads run. When they need a reference to
+        // the current RelayService they block until there's one
+        // available. They're able to get the reference as long as it's
+        // non-null, but once it's null they start to block again. Once the
+        // last that didn't block finishes with its instance unsetService()
+        // returns (and so onDestroy() can as well.) This clears it so the OS
+        // can create another RelayService instance that will eventually get
+        // passed to setService() again.
+
+        private class ServiceWrapper implements AutoCloseable {
+            private final RelayService mService;
+            ServiceWrapper( RelayService service ) { mService = service; }
+
+            RelayService get() { return mService; }
+
+            @Override
+            public void close()
+            {
+                synchronized ( mServiceHolder ) {
+                    int newVal = mHaveServiceCount.decrementAndGet();
+                    Log.d( TAG, "close(): count now %d", newVal );
+                    if ( 0 == newVal ) {
+                        mServiceHolder.notifyAll();
+                    }
+                }
+            }
+        }
+
+        void setService( RelayService service )
+        {
+            synchronized ( mServiceHolder ) {
+                mServiceHolder[0] = service;
+                mServiceHolder.notifyAll();
+            }
+        }
+
+        // When service is cleared, DO NOT RETURN until all threads using the
+        // old value of the service have relinquished it. This is called from
+        // onDestroy(), and once onDestroy() had returned nobody should
+        // reference its RelayService instance again.
+        void unsetService()
+        {
+            Log.d( TAG, "unsetService()" );
+            synchronized ( mServiceHolder ) {
+                mServiceHolder[0] = null;
+                // Now block until the used count drops to 0
+                while ( mHaveServiceCount.get() > 0 ) {
+                    try {
+                        mServiceHolder.wait();
+                    } catch (InterruptedException ie) {
+                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
+                        // Assert.assertFalse( BuildConfig.DEBUG );
+                    }
+                }
+            }
+            Log.d( TAG, "unsetService() DONE" );
+        }
+
+        // called by various threads that need to run
+        private ServiceWrapper acquireWrapper()
+        {
+            synchronized ( mServiceHolder ) {
+                while ( null == mServiceHolder[0] ) {
+                    try {
+                        mServiceHolder.wait();
+                    } catch (InterruptedException ie) {
+                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
+                        // InterruptedException is how we get unblocked!
+                        // Assert.assertFalse( BuildConfig.DEBUG );
+                    }
+                }
+                int newVal = mHaveServiceCount.incrementAndGet();
+                Log.d( TAG, "acquireWrapper(): count now %d", newVal );
+                return new ServiceWrapper( mServiceHolder[0] );
+            }
+        }
 
         void start()
         {
@@ -1025,8 +1117,10 @@ public class RelayService extends JobIntentService
                                 new DatagramPacket( buf, buf.length );
                             try {
                                 m_UDPSocket.receive( packet );
-                                resetExitTimer();
-                                gotPacket( packet );
+                                try (ServiceWrapper wrapper = acquireWrapper() ) {
+                                    wrapper.get().resetExitTimer();
+                                    wrapper.get().gotPacket( packet );
+                                }
                             } catch ( java.io.InterruptedIOException iioe ) {
                                 // DbgUtils.logf( "FYI: udp receive timeout" );
                             } catch( java.io.IOException ioe ) {
@@ -1052,8 +1146,12 @@ public class RelayService extends JobIntentService
         private void connectSocket()
         {
             if ( null == m_UDPSocket ) {
-                int port = XWPrefs.getDefaultRelayPort( RelayService.this );
-                String host = XWPrefs.getDefaultRelayHost( RelayService.this );
+                int port;
+                String host;
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    port = XWPrefs.getDefaultRelayPort( wrapper.get() );
+                    host = XWPrefs.getDefaultRelayHost( wrapper.get() );
+                }
                 try {
                     m_UDPSocket = new DatagramSocket();
                     m_UDPSocket.setSoTimeout(30 * 1000); // timeout so we can log
@@ -1108,7 +1206,9 @@ public class RelayService extends JobIntentService
                             sendViaWeb( dataListWeb );
                             sendViaUDP( dataListUDP );
 
-                            resetExitTimer();
+                            try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                                wrapper.get().resetExitTimer();
+                            }
                             runUDPAckTimer();
 
                             ConnStatusHandler.showSuccessOut();
@@ -1135,47 +1235,52 @@ public class RelayService extends JobIntentService
             Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
             int sentLen = 0;
             if ( packets.size() > 0 ) {
-                HttpURLConnection conn = NetUtils.makeHttpRelayConn( RelayService.this, "post" );
-                if ( null == conn ) {
-                    Log.e( TAG, "sendViaWeb(): null conn for POST" );
-                } else {
-                    try {
-                        JSONArray dataArray = new JSONArray();
-                        for ( PacketData packet : packets ) {
-                            Assert.assertFalse( packet instanceof EOQPacketData );
-                            byte[] datum = packet.assemble();
-                            dataArray.put( Utils.base64Encode(datum) );
-                            sentLen += datum.length;
-                        }
-                        JSONObject params = new JSONObject();
-                        params.put( "data", dataArray );
-
-                        String result = NetUtils.runConn( conn, params );
-                        boolean succeeded = null != result;
-                        if ( succeeded ) {
-                            Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
-                            JSONObject resultObj = new JSONObject( result );
-                            JSONArray resData = resultObj.getJSONArray( "data" );
-                            int nReplies = resData.length();
-                            // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
-
-                            noteSent( packets, false ); // before we process the acks below :-)
-
-                            for ( int ii = 0; ii < nReplies; ++ii ) {
-                                byte[] datum = Utils.base64Decode( resData.getString( ii ) );
-                                // PENDING: skip ack or not
-                                gotPacket( datum, false, false );
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    RelayService service = wrapper.get();
+                    HttpURLConnection conn = NetUtils
+                        .makeHttpRelayConn( service, "post" );
+                    if ( null == conn ) {
+                        Log.e( TAG, "sendViaWeb(): null conn for POST" );
+                    } else {
+                        try {
+                            JSONArray dataArray = new JSONArray();
+                            for ( PacketData packet : packets ) {
+                                Assert.assertFalse( packet instanceof EOQPacketData );
+                                byte[] datum = packet.assemble();
+                                dataArray.put( Utils.base64Encode(datum) );
+                                sentLen += datum.length;
                             }
-                        } else {
-                            Log.e( TAG, "sendViaWeb(): failed result for POST" );
+                            JSONObject params = new JSONObject();
+                            params.put( "data", dataArray );
 
+                            String result = NetUtils.runConn( conn, params );
+                            boolean succeeded = null != result;
+                            if ( succeeded ) {
+                                Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
+                                JSONObject resultObj = new JSONObject( result );
+                                JSONArray resData = resultObj.getJSONArray( "data" );
+                                int nReplies = resData.length();
+                                // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
+
+                                service
+                                    .noteSent( packets, false ); // before we process the acks below :-)
+
+                                for ( int ii = 0; ii < nReplies; ++ii ) {
+                                    byte[] datum = Utils.base64Decode( resData.getString( ii ) );
+                                    // PENDING: skip ack or not
+                                    service.gotPacket( datum, false, false );
+                                }
+                            } else {
+                                Log.e( TAG, "sendViaWeb(): failed result for POST" );
+
+                            }
+
+                            ConnStatusHandler.updateStatus( service, null,
+                                                            CommsConnType.COMMS_CONN_RELAY,
+                                                            succeeded );
+                        } catch ( JSONException ex ) {
+                            Assert.assertFalse( BuildConfig.DEBUG );
                         }
-
-                        ConnStatusHandler.updateStatus( RelayService.this, null,
-                                                        CommsConnType.COMMS_CONN_RELAY,
-                                                        succeeded );
-                    } catch ( JSONException ex ) {
-                        Assert.assertFalse( BuildConfig.DEBUG );
                     }
                 }
             }
@@ -1187,43 +1292,47 @@ public class RelayService extends JobIntentService
             int sentLen = 0;
 
             if ( packets.size() > 0 ) {
-                noteSent( packets, true );
-                for ( PacketData packet : packets ) {
-                    boolean getOut = true;
-                    byte[] data = packet.assemble();
-                    try {
-                        DatagramPacket udpPacket = new DatagramPacket( data, data.length );
-                        m_UDPSocket.send( udpPacket );
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    RelayService service = wrapper.get();
+                    service.noteSent( packets, true );
+                    for ( PacketData packet : packets ) {
+                        boolean getOut = true;
+                        byte[] data = packet.assemble();
+                        try {
+                            DatagramPacket udpPacket = new DatagramPacket( data, data.length );
+                            m_UDPSocket.send( udpPacket );
 
-                        sentLen += udpPacket.getLength();
-                        // packet.setSentMS( nowMS );
-                        getOut = false;
-                    } catch ( java.net.SocketException se ) {
-                        Log.ex( TAG, se );
-                        Log.i( TAG, "Restarting threads to force new socket" );
-                        ConnStatusHandler.updateStatusOut( RelayService.this, null,
-                                                           CommsConnType.COMMS_CONN_RELAY,
-                                                           true );
+                            sentLen += udpPacket.getLength();
+                            // packet.setSentMS( nowMS );
+                            getOut = false;
+                        } catch ( java.net.SocketException se ) {
+                            Log.ex( TAG, se );
+                            Log.i( TAG, "Restarting threads to force new socket" );
+                            ConnStatusHandler.updateStatusOut( service, null,
+                                                               CommsConnType.COMMS_CONN_RELAY,
+                                                               true );
 
-                        m_handler.post( new Runnable() {
-                                public void run() {
-                                    stopUDPThreadsIf();
-                                }
-                            } );
-                        break;
-                    } catch ( java.io.IOException ioe ) {
-                        Log.ex( TAG, ioe );
-                    } catch ( NullPointerException npe ) {
-                        Log.w( TAG, "network problem; dropping packet" );
-                    }
-                    if ( getOut ) {
-                        break;
+                            service.m_handler.post( new Runnable() {
+                                    public void run() {
+                                        Assert.assertFalse( BuildConfig.DEBUG );
+                                        // stopUDPThreadsIf();
+                                    }
+                                } );
+                            break;
+                        } catch ( java.io.IOException ioe ) {
+                            Log.ex( TAG, ioe );
+                        } catch ( NullPointerException npe ) {
+                            Log.w( TAG, "network problem; dropping packet" );
+                        }
+                        if ( getOut ) {
+                            break;
+                        }
                     }
+
+                    ConnStatusHandler.updateStatus( service, null,
+                                                    CommsConnType.COMMS_CONN_RELAY,
+                                                    sentLen > 0 );
                 }
-
-                ConnStatusHandler.updateStatus( RelayService.this, null,
-                                                CommsConnType.COMMS_CONN_RELAY,
-                                                sentLen > 0 );
             }
 
             return sentLen;
@@ -1256,7 +1365,7 @@ public class RelayService extends JobIntentService
                         forResend.add( packet );
                         if ( packet.m_cmd != XWRelayReg.XWPDEV_ACK ) {
                             foundNonAck = true;
-                            ++m_nativeFailScore;
+                            sNativeFailScore.incrementAndGet();
                         }
                         iter.remove();
                     }
@@ -1433,7 +1542,7 @@ public class RelayService extends JobIntentService
                 // Log.d( TAG, "noteAck(fromUDP=%b): removed for id %d: %s",
                 //        fromUDP, packetID, packet );
                 if ( fromUDP ) {
-                    --m_nativeFailScore;
+                    sNativeFailScore.decrementAndGet();
                 }
             } else {
                 Log.w( TAG, "Weird: got ack %d but never sent", packetID );
@@ -1462,6 +1571,7 @@ public class RelayService extends JobIntentService
     // Called from any thread
     private void resetExitTimer()
     {
+        Log.d( TAG, "resetExitTimer()" );
         m_handler.removeCallbacks( m_onInactivity );
 
         // UDP socket's no good as a return address after several
@@ -1477,10 +1587,11 @@ public class RelayService extends JobIntentService
             stopThreads();
         } else if ( XWApp.UDP_ENABLED ) {
             stopFetchThreadIf();
-            startUDPThreadsIfNot();
+            startUDPThreadsOnce();
             registerWithRelay();
         } else {
-            stopUDPThreadsIf();
+            Assert.assertFalse( BuildConfig.DEBUG );
+            stopUDPThreads();
             startFetchThreadIfNotUDP();
         }
     }
@@ -1489,7 +1600,7 @@ public class RelayService extends JobIntentService
     {
         Log.d( TAG, "stopThreads()" );
         stopFetchThreadIf();
-        stopUDPThreadsIf();
+        stopUDPThreads();
     }
 
     private static void un2vli( int nn, OutputStream os )
@@ -1656,7 +1767,7 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private class PacketData {
+    private static class PacketData {
         public ByteArrayOutputStream m_bas;
         public XWRelayReg m_cmd;
         public byte[] m_header;
@@ -1745,5 +1856,6 @@ public class RelayService extends JobIntentService
     }
 
     // Exits only to exist, so instanceof can distinguish
-    private class EOQPacketData extends PacketData {}
+    // Can this be replaced by a final Object tested with ==?
+    private static class EOQPacketData extends PacketData {}
 }

From ff2192f659e3cfaea5d7be89a87013ecd4489e5d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 09:30:14 -0800
Subject: [PATCH 045/145] fix path name string causing JNI crash on emulator

And catch NPE that also seems to be emulator-only
---
 .../app/src/main/java/org/eehouse/android/xw4/WiDirService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index 693647426..e7695401e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -214,6 +214,8 @@ public class WiDirService extends XWService {
             sHavePermission = false;
         } catch ( SecurityException se ) {               // perm not in manifest
             sHavePermission = false;
+        } catch ( NullPointerException npe ) { // Seeing this on Oreo emulator
+            sHavePermission = false;
         }
     }
 

From 50f448bb1fb99b939da3776f1a79ddb32b19c04f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 09:35:08 -0800
Subject: [PATCH 046/145] fix to contact relay in foreground on Oreo+

Background still needs a lot of work.
---
 .../org/eehouse/android/xw4/RelayService.java | 27 ++++++++++++++++++-
 .../java/org/eehouse/android/xw4/XWApp.java   |  2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 501891edd..ada0eeeb0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -192,7 +192,32 @@ public class RelayService extends XWService
 
     private static boolean inForeground()
     {
-        return sInForeground != null && sInForeground;
+        boolean result = sInForeground != null && sInForeground;
+        Log.d( TAG, "inForeground() => %b", result );
+        return result;
+    }
+
+    private static void onAppStateChange( Context context, boolean inForeground )
+    {
+        Log.d( TAG, "onAppStateChange(inForeground=%b)", inForeground );
+        if ( null == sInForeground || inForeground() != inForeground ) {
+            sInForeground = inForeground;
+            // Intent intent =
+            //     getIntentTo( context,
+            //                  inForeground ? BTAction.START_FOREGROUND
+            //                  : BTAction.START_BACKGROUND );
+            // startService( context, intent );
+        }
+    }
+
+    static void onAppToForeground( Context context )
+    {
+        onAppStateChange( context, true );
+    }
+
+    static void onAppToBackground( Context context )
+    {
+        onAppStateChange( context, false );
     }
 
     public static void startService( Context context )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 7927c4f65..cbbc2e1dc 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -106,9 +106,11 @@ public class XWApp extends Application implements LifecycleObserver {
         switch( event ) {
         case ON_RESUME:
             BTService.onAppToForeground( this );
+            RelayService.onAppToForeground( this );
             break;
         case ON_STOP:
             BTService.onAppToBackground( this );
+            RelayService.onAppToBackground( this );
             break;
         }
     }

From 8bd4613c2ae55a5b4e61e25c5b65622ae112b5b8 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 12:55:35 -0800
Subject: [PATCH 047/145] include X86 native library again

It's a pain to have to change code to run in Genymotion, and to have
upgrade not testable using Genymotion. Consider verting this change
before next release.
---
 xwords4/android/app/build.gradle | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index e49c1dab1..21bc531e4 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -231,7 +231,12 @@ task copyStrings(type: Exec) {
 task ndkSetup(type: Exec) {
     workingDir '../'
     // remove ', "--arm-only"' for Genymotion builds
-    commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
+
+    // I'm putting ARM back for a while. It's too much trouble having
+    // builds, including those built by travis, that don't run on the
+    // emulator. Maybe remove this change before each release?
+    commandLine "./scripts/ndksetup.sh", "--with-clang"
+    // commandLine "./scripts/ndksetup.sh", "--with-clang", "--arm-only"
 }
 
 task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) {

From 0a0bd54ec74389d1918e4f691f47796630b56b3c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 17:07:14 -0800
Subject: [PATCH 048/145] include new permission to install third-party apks

Fixed upgrade of Dbg variant not working on Oreo.
---
 xwords4/android/app/src/main/AndroidManifest.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index ccc7396e2..db24701c9 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,7 @@
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+  <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
   <!-- Required for wifi-direct -->
   <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> -->

From eaae9ed1c1ce6616c174030a9621ab6190d65796 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 29 Nov 2018 18:02:06 -0800
Subject: [PATCH 049/145] Always call startForeground after
 startForegroundService

It's an error to e.g. stopSelf() without having called startForeground,
so do it even when about to exit.
---
 .../org/eehouse/android/xw4/BTService.java    | 63 ++++++++++++++-----
 1 file changed, 46 insertions(+), 17 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index dc1f985b0..11234f7e4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -56,6 +56,25 @@ import java.util.Set;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
+// Notes on running under Oreo
+//
+// The goal is to be running only when useful: when user wants to play via
+// BT. Ideally we'd not run the foreground service when BT is turned off, but
+// there's no way to be notified of its being turned on without installing a
+// receiver. So *something* has to be running, whether it's listening on a BT
+// socket or hosting the receiver. Might as well be the socket listener. Users
+// who want the service not running when BT's off can turn it off via app
+// preferences. When they try to start a BT game we can note the preference
+// and suggest they change it. And when an invitation sent is not received the
+// sender can be told to suggest to his opponent to turn on the preference.
+//
+// When there's no BT adapter at all (Emulator case) there's no point in
+// starting the service. Let's catch that early.
+//
+// Note also that we need to be careful to NEVER call stopSelf() after calling
+// startForegroundService() until AFTER calling startForeground(). Doing so
+// will cause a crash.
+
 public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
@@ -169,6 +188,7 @@ public class BTService extends XWService {
     private BTMsgSink m_btMsgSink;
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
+    private Notification m_notification; // make once use many
     private static int s_errCount = 0;
 
     public static boolean BTAvailable()
@@ -388,6 +408,8 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        startForegroundIf();
+
         BluetoothAdapter adapter = XWApp.BTSUPPORTED
             ? BluetoothAdapter.getDefaultAdapter() : null;
         if ( null != adapter && adapter.isEnabled() ) {
@@ -406,11 +428,9 @@ public class BTService extends XWService {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
-        int result = handleCommand( intent );
+        startForegroundIf();
 
-        if ( Service.START_STICKY == result && ! inForeground() ) {
-            startForeground();
-        }
+        int result = handleCommand( intent );
 
         return result;
     }
@@ -510,21 +530,30 @@ public class BTService extends XWService {
         return result;
     } // handleCommand()
 
-    private void startForeground()
+    private void startForegroundIf()
     {
-        Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
-        PendingIntent pendIntent = PendingIntent
-            .getActivity(this, Utils.nextRandomInt(), notifIntent, PendingIntent.FLAG_ONE_SHOT);
-        Notification notification =
-            new NotificationCompat.Builder( this, Utils.getChannelId(this) )
-            .setSmallIcon( R.drawable.notify_btservice )
-            .setContentTitle( BTService.class.getSimpleName() )
-            .setContentText("listening for bluetooth messages...")
-            .setContentIntent(pendIntent)
-            .build();
+        if ( ! inForeground() ) {
+            Log.d( TAG, "startForegroundIf(): starting" );
 
-        Log.d( TAG, "calling service.startForeground()" );
-        startForeground( 1337, notification );
+            if ( null == m_notification ) {
+                Intent notifIntent = GamesListDelegate.makeBackgroundIntent( this );
+                PendingIntent pendIntent = PendingIntent
+                    .getActivity( this, Utils.nextRandomInt(), notifIntent,
+                                  PendingIntent.FLAG_ONE_SHOT );
+                m_notification =
+                    new NotificationCompat.Builder( this, Utils.getChannelId(this) )
+                    .setSmallIcon( R.drawable.notify_btservice )
+                    .setContentTitle( BTService.class.getSimpleName() )
+                    .setContentText("listening for bluetooth messages...")
+                    .setContentIntent(pendIntent)
+                    .build();
+            }
+
+            Log.d( TAG, "calling service.startForeground()" );
+            startForeground( R.string.app_name, m_notification );
+        } else {
+            Log.d( TAG, "startForegroundIf(): NOT starting" );
+        }
     }
 
     private class BTListenerThread extends Thread {

From faeaa60f87172551b59ba5151ba37dedbd4f1837 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 3 Dec 2018 08:26:47 -0800
Subject: [PATCH 050/145] replace junit's assert with my own

And have it log before throwing. Should be easier to track down asserts
coming from jni callbacks this way than in the C code.
---
 .../org/eehouse/android/xw4/AboutAlert.java   |  1 -
 .../java/org/eehouse/android/xw4/Assert.java  | 58 +++++++++++++++++++
 .../eehouse/android/xw4/BTInviteDelegate.java |  1 -
 .../org/eehouse/android/xw4/BTService.java    |  1 -
 .../org/eehouse/android/xw4/BiDiSockWrap.java |  1 -
 .../org/eehouse/android/xw4/BoardCanvas.java  |  1 -
 .../eehouse/android/xw4/BoardContainer.java   |  1 -
 .../eehouse/android/xw4/BoardDelegate.java    |  1 -
 .../org/eehouse/android/xw4/BoardView.java    |  1 -
 .../org/eehouse/android/xw4/ChatDelegate.java |  1 -
 .../eehouse/android/xw4/CommsTransport.java   |  1 -
 .../android/xw4/ConnStatusHandler.java        |  1 -
 .../android/xw4/ConnViaViewLayout.java        |  1 -
 .../java/org/eehouse/android/xw4/DBAlert.java |  1 -
 .../java/org/eehouse/android/xw4/DBUtils.java |  1 -
 .../org/eehouse/android/xw4/DbgUtils.java     |  1 -
 .../org/eehouse/android/xw4/DelegateBase.java |  1 -
 .../android/xw4/DictBrowseDelegate.java       |  1 -
 .../eehouse/android/xw4/DictLangCache.java    |  1 -
 .../org/eehouse/android/xw4/DictUtils.java    |  1 -
 .../eehouse/android/xw4/DictsDelegate.java    |  1 -
 .../org/eehouse/android/xw4/DisablesItem.java |  1 -
 .../org/eehouse/android/xw4/DlgDelegate.java  |  1 -
 .../eehouse/android/xw4/DlgDelegateAlert.java |  1 -
 .../org/eehouse/android/xw4/DlgState.java     |  1 -
 .../eehouse/android/xw4/DwnldDelegate.java    |  1 -
 .../eehouse/android/xw4/EnableSMSAlert.java   |  1 -
 .../eehouse/android/xw4/ExpiringDelegate.java |  1 -
 .../android/xw4/GameConfigDelegate.java       |  1 -
 .../org/eehouse/android/xw4/GameListItem.java |  1 -
 .../org/eehouse/android/xw4/GameLock.java     |  1 -
 .../org/eehouse/android/xw4/GameUtils.java    |  1 -
 .../android/xw4/GamesListDelegate.java        |  1 -
 .../android/xw4/HeaderWithExpander.java       |  1 -
 .../org/eehouse/android/xw4/HostDelegate.java |  1 -
 .../android/xw4/InviteChoicesAlert.java       |  1 -
 .../eehouse/android/xw4/InviteDelegate.java   |  1 -
 .../org/eehouse/android/xw4/LookupAlert.java  |  1 -
 .../eehouse/android/xw4/LookupAlertView.java  |  1 -
 .../org/eehouse/android/xw4/MainActivity.java |  1 -
 .../org/eehouse/android/xw4/MultiMsgSink.java |  1 -
 .../org/eehouse/android/xw4/MultiService.java |  1 -
 .../eehouse/android/xw4/NagTurnReceiver.java  |  1 -
 .../eehouse/android/xw4/NetLaunchInfo.java    |  1 -
 .../eehouse/android/xw4/NetStateCache.java    |  1 -
 .../org/eehouse/android/xw4/NetUtils.java     |  1 -
 .../eehouse/android/xw4/NotAgainAlert.java    |  1 -
 .../org/eehouse/android/xw4/OkOnlyAlert.java  |  1 -
 .../java/org/eehouse/android/xw4/Perms23.java |  1 -
 .../eehouse/android/xw4/PrefsActivity.java    |  1 -
 .../eehouse/android/xw4/PrefsDelegate.java    |  1 -
 .../android/xw4/RelayInviteDelegate.java      |  1 -
 .../org/eehouse/android/xw4/RelayService.java |  1 -
 .../android/xw4/SMSInviteDelegate.java        |  1 -
 .../org/eehouse/android/xw4/SMSService.java   |  1 -
 .../android/xw4/StudyListDelegate.java        |  1 -
 .../eehouse/android/xw4/TilePickAlert.java    |  1 -
 .../org/eehouse/android/xw4/TilePickView.java |  1 -
 .../java/org/eehouse/android/xw4/Toolbar.java |  1 -
 .../java/org/eehouse/android/xw4/Utils.java   |  1 -
 .../android/xw4/WiDirInviteDelegate.java      |  1 -
 .../org/eehouse/android/xw4/WiDirService.java |  1 -
 .../org/eehouse/android/xw4/XWActivity.java   |  1 -
 .../java/org/eehouse/android/xw4/XWApp.java   |  1 -
 .../android/xw4/XWConnAddrPreference.java     |  1 -
 .../eehouse/android/xw4/XWDialogFragment.java |  1 -
 .../eehouse/android/xw4/XWExpListAdapter.java |  1 -
 .../org/eehouse/android/xw4/XWFragment.java   |  1 -
 .../java/org/eehouse/android/xw4/XWPrefs.java |  1 -
 .../org/eehouse/android/xw4/XWService.java    |  1 -
 .../eehouse/android/xw4/jni/CommsAddrRec.java |  3 +-
 .../eehouse/android/xw4/jni/CurGameInfo.java  |  2 +-
 .../eehouse/android/xw4/jni/DUtilCtxt.java    |  3 +-
 .../eehouse/android/xw4/jni/GameSummary.java  |  3 +-
 .../eehouse/android/xw4/jni/JNIThread.java    |  3 +-
 .../eehouse/android/xw4/jni/JNIUtilsImpl.java |  3 +-
 .../eehouse/android/xw4/jni/LocalPlayer.java  |  3 +-
 .../eehouse/android/xw4/jni/UtilCtxtImpl.java |  1 -
 .../org/eehouse/android/xw4/jni/XwJNI.java    |  3 +-
 .../org/eehouse/android/xw4/loc/LocUtils.java |  2 +-
 .../eehouse/android/xw4/GCMIntentService.java |  1 -
 xwords4/android/scripts/mk_xml.py             |  2 +-
 82 files changed, 68 insertions(+), 88 deletions(-)
 create mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
index a64e659c0..da8820309 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/AboutAlert.java
@@ -33,7 +33,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import java.util.Date;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
new file mode 100644
index 000000000..8f8a62d81
--- /dev/null
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Assert.java
@@ -0,0 +1,58 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2012 by Eric House (xwords@eehouse.org).  All rights
+ * reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+public class Assert {
+    private static final String TAG = Assert.class.getSimpleName();
+
+    public static void fail() {
+        assertTrue(false);
+    }
+
+    public static void assertFalse(boolean val)
+    {
+        assertTrue(! val);
+    }
+    
+    public static void assertTrue(boolean val) {
+        if (! val) {
+            Log.e( TAG, "firing assert!" );
+            DbgUtils.printStack( TAG );
+            junit.framework.Assert.fail();
+        }
+    }
+
+    public static void assertNotNull( Object val )
+    {
+        assertTrue( val != null );
+    }
+
+    public static void assertNull( Object val )
+    {
+        assertTrue( val == null );
+    }
+
+    public static void assertEquals( Object obj1, Object obj2 )
+    {
+        assertTrue( (obj1 == null && obj2 == null)
+                    || (obj1 != null && obj1.equals(obj2)) );
+    }
+}
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index de9535a06..9a769cb8b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 11234f7e4..fedfe3f87 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -34,7 +34,6 @@ import android.content.Intent;
 import android.os.Build;
 import android.support.v4.app.NotificationCompat;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
index e2744c9f5..a62fce31e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BiDiSockWrap.java
@@ -27,7 +27,6 @@ import java.net.Socket;
 import java.util.concurrent.LinkedBlockingQueue;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 public class BiDiSockWrap {
     private static final String TAG = BiDiSockWrap.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
index f58412ae9..217986941 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardCanvas.java
@@ -31,7 +31,6 @@ import android.graphics.RectF;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.CommonPrefs;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
index 19bb03e6c..e2b092f4b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardContainer.java
@@ -29,7 +29,6 @@ import android.view.View;
 import android.view.View.MeasureSpec;
 import android.graphics.Rect;
 
-import junit.framework.Assert;
 
 public class BoardContainer extends ViewGroup {
     private static final String TAG = BoardContainer.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index b2ed17c5d..ba5e64e8f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -49,7 +49,6 @@ import java.util.Map;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
index fff413910..5d059fcf8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
@@ -31,7 +31,6 @@ import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.BoardDims;
 import org.eehouse.android.xw4.jni.BoardHandler;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
index 1219b8d57..f3239e590 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
@@ -40,7 +40,6 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import android.text.format.DateUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIThread;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
index 4c51b9af5..b486b89fa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/CommsTransport.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
index ac9d8dfeb..efe49c8b2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
@@ -32,7 +32,6 @@ import android.provider.Settings;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
index 2e234e949..d90cbf290 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnViaViewLayout.java
@@ -30,7 +30,6 @@ import android.widget.LinearLayout;
 
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
index bdf5d0337..9a3724f54 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBAlert.java
@@ -34,7 +34,6 @@ import org.eehouse.android.xw4.loc.LocUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 public class DBAlert extends XWDialogFragment {
     private static final String TAG = DBAlert.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 035d107e2..700b918a8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -33,7 +33,6 @@ import android.graphics.BitmapFactory;
 import android.os.Environment;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictLoc;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify.InviteMeans;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index db5664334..e1b6f86c1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -33,7 +33,6 @@ import java.util.Formatter;
 import java.util.Iterator;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 144c61b91..66932cfa1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -40,7 +40,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
index 5a165bcf1..05fc4c51e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictBrowseDelegate.java
@@ -37,7 +37,6 @@ import android.widget.SectionIndexer;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
index b614446b2..9573533a5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
@@ -25,7 +25,6 @@ import android.content.res.Resources;
 import android.os.Handler;
 import android.widget.ArrayAdapter;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
index f354b1e29..cd46b0106 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictUtils.java
@@ -24,7 +24,6 @@ import android.content.Context;
 import android.content.res.AssetManager;
 import android.os.Environment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.JNIUtilsImpl;
 import org.eehouse.android.xw4.jni.XwJNI;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
index 19ede5444..c02d61c19 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
@@ -45,7 +45,6 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictUtils.DictAndLoc;
 import org.eehouse.android.xw4.DictUtils.DictLoc;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
index 6cb9f16ad..9eebd7584 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DisablesItem.java
@@ -31,7 +31,6 @@ import android.widget.TextView;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
-import junit.framework.Assert;
 
 public class DisablesItem extends LinearLayout {
     private CommsConnType m_type;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index c805f4999..526e26107 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -34,7 +34,6 @@ import android.view.View;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
index f30ad2f1a..8c2266033 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegateAlert.java
@@ -31,7 +31,6 @@ import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
index e3ce8f217..850971e10 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgState.java
@@ -32,7 +32,6 @@ import java.util.List;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 public class DlgState implements Parcelable {
     private static final String TAG = DlgState.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
index 858787047..df6e900fa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DwnldDelegate.java
@@ -34,7 +34,6 @@ import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
index 07548ab49..41760d3c1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/EnableSMSAlert.java
@@ -30,7 +30,6 @@ import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
index 3987291eb..d1c21ca91 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ExpiringDelegate.java
@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index 81fa89ca2..9c5f1d1ee 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -45,7 +45,6 @@ import android.widget.TextView;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DictLangCache.LangsArrayAdapter;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
index ae98e4fab..cb3203c48 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameListItem.java
@@ -33,7 +33,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.GameSummary;
 import org.eehouse.android.xw4.jni.JNIThread;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
index 54b8e1643..85d66310b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
@@ -20,7 +20,6 @@
 
 package org.eehouse.android.xw4;
 
-import junit.framework.Assert;
 
 import java.util.HashMap;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 2d9963ed5..ba3d807d5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -31,7 +31,6 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.view.Display;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommonPrefs;
 import org.eehouse.android.xw4.jni.CommsAddrRec;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 73a6e9395..bae29f46e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -44,7 +44,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.GameChangeType;
 import org.eehouse.android.xw4.DBUtils.GameGroupInfo;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
index fd32744d5..153d01776 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HeaderWithExpander.java
@@ -27,7 +27,6 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
index e93665297..f69bd5927 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/HostDelegate.java
@@ -26,7 +26,6 @@ import android.content.Intent;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 class HostDelegate extends DelegateBase {
     private static final String ACTION = "ACTION";
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
index a9ed0250e..0b15bedd7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteChoicesAlert.java
@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.util.ArrayList;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index c536cec93..d5c060d06 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -42,7 +42,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class InviteDelegate extends ListDelegateBase
     implements View.OnClickListener,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
index 45df88f55..f1ed332fb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlert.java
@@ -26,7 +26,6 @@ import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
index 3f48cba0d..e82b12322 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/LookupAlertView.java
@@ -36,7 +36,6 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index d4142fc47..8ea9949f3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -35,7 +35,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.LinearLayout;
 
-import junit.framework.Assert;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
index 0a08833e2..64197516c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiMsgSink.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
index 5aac018c5..91dbd8390 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
@@ -26,7 +26,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.os.Bundle;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
index ba4ea6d33..5327b6c90 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NagTurnReceiver.java
@@ -27,7 +27,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.NeedsNagInfo;
 import org.eehouse.android.xw4.jni.GameSummary;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
index ebc7a99f0..551a24cb5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetLaunchInfo.java
@@ -39,7 +39,6 @@ import java.util.Iterator;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 101f52059..6c5ed36f5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -29,7 +29,6 @@ import android.net.NetworkInfo;
 import android.os.Build;
 import android.os.Handler;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
index acf6ac4be..1c07bf43b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.json.JSONArray;
 import org.json.JSONException;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
index d12a0cd4e..6e90fb9b3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NotAgainAlert.java
@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
index 3a74feacf..317b2cb6f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OkOnlyAlert.java
@@ -30,7 +30,6 @@ import android.support.v4.app.DialogFragment;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.loc.LocUtils;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index 2610d5146..f8b3be7bf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -38,7 +38,6 @@ import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
     
 public class Perms23 {
     private static final String TAG = Perms23.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
index 8c9787c32..816943179 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsActivity.java
@@ -27,7 +27,6 @@ import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.support.v4.app.DialogFragment;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
index a64e9dcda..faef1f88b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/PrefsDelegate.java
@@ -36,7 +36,6 @@ import android.preference.PreferenceScreen;
 import android.view.View;
 import android.widget.Button;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.loc.LocUtils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
index f8b043aba..8d738b3c2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
@@ -52,7 +52,6 @@ import java.util.Set;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index ada0eeeb0..4934b75d5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -27,7 +27,6 @@ import android.os.Build;
 import android.os.Handler;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.GameUtils.BackMoveResult;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
index e80006550..23942077a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
@@ -36,7 +36,6 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index 49d26e588..610d1421a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -34,7 +34,6 @@ import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
index db51df1f4..bcf218584 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/StudyListDelegate.java
@@ -36,7 +36,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Spinner;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.GameSummary;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
index d855a22a1..a45e350df 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickAlert.java
@@ -31,7 +31,6 @@ import android.widget.Button;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
index 4469176f5..6a9d4fc7d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/TilePickView.java
@@ -38,7 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class TilePickView extends LinearLayout {
     private static final String TAG = TilePickView.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
index 4eded5deb..0ecefa929 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Toolbar.java
@@ -35,7 +35,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.HasDlgDelegate;
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 f80ff4018..848da6f3f 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
@@ -74,7 +74,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Perms23.Perm;
 import org.eehouse.android.xw4.jni.CommonPrefs;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
index a1d6343a6..6d39ffe53 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
@@ -30,7 +30,6 @@ import android.widget.TextView;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 public class WiDirInviteDelegate extends InviteDelegate
     implements WiDirService.DevSetListener {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index e7695401e..600c03770 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -69,7 +69,6 @@ import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
-import junit.framework.Assert;
 
 public class WiDirService extends XWService {
     private static final String TAG = WiDirService.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
index 82a8dab89..df83b45fb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWActivity.java
@@ -40,7 +40,6 @@ import android.widget.ListView;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
-import junit.framework.Assert;
 
 public class XWActivity extends FragmentActivity
     implements Delegator, DlgDelegate.DlgClickNotify {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index cbbc2e1dc..441e3d67b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -35,7 +35,6 @@ import org.eehouse.android.xw4.jni.XwJNI;
 
 import java.util.UUID;
 
-import junit.framework.Assert;
 
 import static android.arch.lifecycle.Lifecycle.Event.ON_ANY;
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
index de57f1bef..3c63c41a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWConnAddrPreference.java
@@ -27,7 +27,6 @@ import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
index 2ecd0bf7e..38eac8ea2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWDialogFragment.java
@@ -30,7 +30,6 @@ import android.view.View;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
 
 abstract class XWDialogFragment extends DialogFragment {
     private static final String TAG = XWDialogFragment.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
index 77fe2c807..b07b937ae 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWExpListAdapter.java
@@ -23,7 +23,6 @@ package org.eehouse.android.xw4;
 import android.view.View;
 import android.view.ViewGroup;
 
-import junit.framework.Assert;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
index db4b076c7..7509d2fb5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWFragment.java
@@ -36,7 +36,6 @@ import android.widget.ListView;
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.Assert;
 
 abstract class XWFragment extends Fragment implements Delegator {
     private static final String TAG = XWFragment.class.getSimpleName();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index fafe5208e..3262b8fef 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -29,7 +29,6 @@ import android.text.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 62e680abf..524695feb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -25,7 +25,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
index 3701610d9..512500082 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CommsAddrRec.java
@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.text.TextUtils;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BTService;
 import org.eehouse.android.xw4.GameUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
index 4d9b2d8f1..ac898b2b5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/CurGameInfo.java
@@ -29,8 +29,8 @@ import java.util.HashSet;
 import java.util.Random;
 import org.json.JSONObject;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DictLangCache;
 import org.eehouse.android.xw4.DictUtils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
index 8192636f7..ae13ba97d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/DUtilCtxt.java
@@ -23,8 +23,7 @@ package org.eehouse.android.xw4.jni;
 import android.content.Context;
 import android.telephony.PhoneNumberUtils;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DevID;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
index 654661e79..2c7c43247 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/GameSummary.java
@@ -28,8 +28,7 @@ import java.util.Arrays;
 
 import org.json.JSONObject;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index d6c9a6c37..91bc41ae8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -26,8 +26,7 @@ import android.graphics.Bitmap;
 import android.os.Handler;
 import android.os.Message;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.CommsTransport;
 import org.eehouse.android.xw4.ConnStatusHandler;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
index 79743be24..5d8c6a060 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIUtilsImpl.java
@@ -22,8 +22,7 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.XWApp;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
index 0a9109857..ca1106a5f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/LocalPlayer.java
@@ -25,8 +25,7 @@ import android.text.TextUtils;
 
 import java.io.Serializable;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.BuildConfig;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Utils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
index 6b3883086..2a1c30043 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
@@ -22,7 +22,6 @@ package org.eehouse.android.xw4.jni;
 
 import android.content.Context;
 
-import junit.framework.Assert;
 
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
index 315b51c86..2b9f96110 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
@@ -24,8 +24,7 @@ import android.graphics.Rect;
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
-
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.NetLaunchInfo;
 import org.eehouse.android.xw4.Utils;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
index af983d125..c63374251 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/loc/LocUtils.java
@@ -42,8 +42,8 @@ import android.widget.Spinner;
 import android.widget.SpinnerAdapter;
 import android.widget.TextView;
 
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.DBUtils;
 import org.eehouse.android.xw4.DbgUtils;
 import org.eehouse.android.xw4.Log;
diff --git a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
index 5069dea57..bc2f8e4f4 100644
--- a/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
+++ b/xwords4/android/app/src/xw4/java/org/eehouse/android/xw4/GCMIntentService.java
@@ -29,7 +29,6 @@ import com.google.android.gcm.GCMRegistrar;
 
 import org.json.JSONArray;
 
-import junit.framework.Assert;
 
 public class GCMIntentService extends GCMBaseIntentService {
     private static final String TAG = GCMIntentService.class.getSimpleName();
diff --git a/xwords4/android/scripts/mk_xml.py b/xwords4/android/scripts/mk_xml.py
index 706b0e9b0..b71e01542 100755
--- a/xwords4/android/scripts/mk_xml.py
+++ b/xwords4/android/scripts/mk_xml.py
@@ -95,8 +95,8 @@ def printStrings( pairs, outfile, target ):
 package org.eehouse.android.xw4.loc;
 
 import android.content.Context;
-import junit.framework.Assert;
 
+import org.eehouse.android.xw4.Assert;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.Log;
 

From 1e42156f4a65bbef6403c405f3a5ae7e8d253f5d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 05:10:05 -0800
Subject: [PATCH 051/145] remove assert

Constructor is called from JNI code and so not on the UI thread.
---
 .../src/main/java/org/eehouse/android/xw4/NetStateCache.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 6c5ed36f5..373c88ce2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -181,7 +181,7 @@ public class NetStateCache {
 
         public PvtBroadcastReceiver()
         {
-            DbgUtils.assertOnUIThread();
+            // DbgUtils.assertOnUIThread(); // firing
             mHandler = new Handler();
             mLastStateSent = s_netAvail;
         }

From ece125c5dc36428b08f58260776350ea76d6e23f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 05:18:29 -0800
Subject: [PATCH 052/145] change foreground-service notification text

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index fedfe3f87..1bc51167a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -542,9 +542,8 @@ public class BTService extends XWService {
                 m_notification =
                     new NotificationCompat.Builder( this, Utils.getChannelId(this) )
                     .setSmallIcon( R.drawable.notify_btservice )
-                    .setContentTitle( BTService.class.getSimpleName() )
-                    .setContentText("listening for bluetooth messages...")
-                    .setContentIntent(pendIntent)
+                    .setContentText( getString(R.string.bkng_notify_text) )
+                    .setContentIntent( pendIntent )
                     .build();
             }
 
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 6ab747561..e5d84f35f 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2028,6 +2028,7 @@
 
     <string name="title_btback_enabled">Enable background Bluetooth</string>
     <string name="summary_btback_enabled">Always listen for Bluetooth messages</string>
+    <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
 
     <!--  -->
     <string name="confirm_sms_title">Confirm your SMS plan</string>

From d94821feb4920882c975d90121d149da2595f0c6 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 06:17:47 -0800
Subject: [PATCH 053/145] btinvite dlg shows results of scan not all paired
 devs

Moving toward a better BT invite experience: use BTService to scan for
ourselves on all paired devices, and only allow selecting from among
those on which we're running (and so likely to respond to an
invitation.)
---
 .../eehouse/android/xw4/BTInviteDelegate.java |  22 ++--
 .../org/eehouse/android/xw4/BTService.java    | 120 +++---------------
 .../app/src/main/res/layout/bt_buttons.xml    |   9 +-
 .../app/src/main/res/values/strings.xml       |  21 +--
 4 files changed, 42 insertions(+), 130 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 9a769cb8b..8ecd1a1ee 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -22,6 +22,7 @@ package org.eehouse.android.xw4;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -35,12 +36,13 @@ import java.util.Iterator;
 import java.util.Set;
 
 public class BTInviteDelegate extends InviteDelegate {
-    private static final int[] BUTTONIDS = { R.id.button_add,
+    private static final String TAG = BTInviteDelegate.class.getSimpleName();
+    private static final int[] BUTTONIDS = { R.id.button_scan,
                                              R.id.button_settings,
-                                             R.id.button_clear,
     };
     private Activity m_activity;
     private TwoStringPair[] m_pairs;
+    private ProgressDialog m_progress;
 
     public static void launchForResult( Activity activity, int nMissing,
                                         SentInvitesInfo info,
@@ -67,28 +69,25 @@ public class BTInviteDelegate extends InviteDelegate {
     @Override
     protected void init( Bundle savedInstanceState )
     {
-        String msg = getString( R.string.bt_pick_addall_button );
-        msg = getQuantityString( R.plurals.invite_bt_desc_fmt, m_nMissing,
-                                 m_nMissing, msg );
+        String msg = getQuantityString( R.plurals.invite_bt_desc_fmt_2, m_nMissing,
+                                        m_nMissing );
         super.init( msg, 0 );
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
         BTService.clearDevices( m_activity, null ); // will return names
+
+        scan();
     }
 
     @Override
     protected void onBarButtonClicked( int id )
     {
         switch( id ) {
-        case R.id.button_add:
+        case R.id.button_scan:
             scan();
             break;
         case R.id.button_settings:
             BTService.openBTSettings( m_activity );
             break;
-        case R.id.button_clear:
-            removeSelected();
-            clearChecked();
-            break;
         }
     }
 
@@ -101,6 +100,7 @@ public class BTInviteDelegate extends InviteDelegate {
             post( new Runnable() {
                     public void run() {
                         synchronized( BTInviteDelegate.this ) {
+                            m_progress.cancel();
 
                             m_pairs = null;
                             if ( 0 < args.length ) {
@@ -143,6 +143,8 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
+            String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
+            m_progress = ProgressDialog.show( m_activity, msg, null, true, true );
             BTService.scan( m_activity );
         } else {
             makeConfirmThenBuilder( R.string.bt_no_devs,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 1bc51167a..b6e384799 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -183,7 +183,6 @@ public class BTService extends XWService {
     }
 
     private BluetoothAdapter m_adapter;
-    private Set<String> m_addrs;
     private BTMsgSink m_btMsgSink;
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
@@ -415,7 +414,6 @@ public class BTService extends XWService {
             m_adapter = adapter;
             Log.i( TAG, "onCreate(); bt name = %s; bt addr = %s",
                    adapter.getName(), adapter.getAddress() );
-            initAddrs();
             startListener();
             startSender();
         } else {
@@ -456,8 +454,6 @@ public class BTService extends XWService {
 
                 case CLEAR:
                     String[] btAddrs = intent.getStringArrayExtra( CLEAR_KEY );
-                    clearDevs( btAddrs );
-                    sendNames();
                     break;
                 case SCAN:
                     m_sender.add( new BTQueueElem( BTCmd.SCAN ) );
@@ -572,7 +568,6 @@ public class BTService extends XWService {
             while ( null != m_serverSocket && m_adapter.isEnabled() ) {
                 try {
                     BluetoothSocket socket = m_serverSocket.accept(); // blocks
-                    addAddr( socket );
                     DataInputStream inStream =
                         new DataInputStream( socket.getInputStream() );
 
@@ -678,8 +673,6 @@ public class BTService extends XWService {
             }
 
             BluetoothDevice host = socket.getRemoteDevice();
-            addAddr( host );
-
             result = makeOrNotify( nli, host.getName(), host.getAddress() );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
@@ -699,7 +692,6 @@ public class BTService extends XWService {
                     byte[] buffer = new byte[dis.readShort()];
                     dis.readFully( buffer );
                     BluetoothDevice host = socket.getRemoteDevice();
-                    addAddr( host );
 
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
@@ -731,35 +723,6 @@ public class BTService extends XWService {
         } // receiveMessage
     } // class BTListenerThread
 
-    private void addAddr( BluetoothSocket socket )
-    {
-        addAddr( socket.getRemoteDevice() );
-    }
-
-    private void addAddr( BluetoothDevice dev )
-    {
-        addAddr( dev.getAddress(), dev.getName() );
-    }
-
-    private void addAddr( String btAddr, String btName )
-    {
-        boolean save = false;
-        synchronized( m_addrs ) {
-            save = !m_addrs.contains( btAddr );
-            if ( save ) {
-                m_addrs.add( btAddr );
-            }
-        }
-        if ( save ) {
-            saveAddrs();
-        }
-    }
-
-    private boolean haveAddr( String btAddr )
-    {
-        return m_addrs.contains( btAddr );
-    }
-
     private static Map<String, String> s_namesToAddrs;
     private static String getSafeAddr( CommsAddrRec addr )
     {
@@ -786,18 +749,6 @@ public class BTService extends XWService {
         return btAddr;
     }
 
-    private void clearDevs( String[] btAddrs )
-    {
-        if ( null != btAddrs ) {
-            synchronized( m_addrs ) {
-                for ( String btAddr : btAddrs ) {
-                    m_addrs.remove( btAddr );
-                }
-            }
-        }
-        saveAddrs();
-    }
-
     private class BTSenderThread extends Thread {
         private LinkedBlockingQueue<BTQueueElem> m_queue;
         private HashMap<String,LinkedList<BTQueueElem> > m_resends;
@@ -836,15 +787,15 @@ public class BTService extends XWService {
                     switch( elem.m_cmd ) {
                     case PING:
                         if ( null == elem.m_btAddr ) {
-                            sendPings( MultiEvent.HOST_PONGED );
+                            sendPings( MultiEvent.HOST_PONGED, null );
                         } else {
                             sendPing( elem.m_btAddr, elem.m_gameID );
                         }
                         break;
                     case SCAN:
-                        addAllToNames();
-                        sendNames();
-                        saveAddrs();
+                        Set<BluetoothDevice> devs = new HashSet<>();
+                        sendPings( null, devs );
+                        sendNames( devs );
                         break;
                     case INVITE:
                         sendInvite( elem );
@@ -870,18 +821,17 @@ public class BTService extends XWService {
             }
         } // run
 
-        private void sendPings( MultiEvent event )
+        private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs )
         {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             // DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
             for ( BluetoothDevice dev : pairedDevs ) {
                 String btAddr = dev.getAddress();
-                if ( haveAddr( btAddr ) ) {
-                    continue;
-                }
 
                 if ( sendPing( dev, 0 ) ) { // did we get a reply?
-                    addAddr( dev );
+                    if ( null != addrs ) {
+                        addrs.add( dev );
+                    }
                     if ( null != event ) {
                         postEvent( event, dev.getName() );
                     }
@@ -927,6 +877,7 @@ public class BTService extends XWService {
             }
             updateStatusOut( sendWorking );
             updateStatusIn( receiveWorking );
+            Log.d( TAG, "sendPing(%s) => %b", dev, gotReply );
             return gotReply;
         } // sendPing
 
@@ -1130,60 +1081,21 @@ public class BTService extends XWService {
             }
             return found;
         }
-
     } // class BTSenderThread
 
-    private void addAllToNames()
+    private void sendNames( Set<BluetoothDevice> devs )
     {
-        Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
-        synchronized( m_addrs ) {
-            for ( BluetoothDevice dev : pairedDevs ) {
-                int clazz = dev.getBluetoothClass().getMajorDeviceClass();
-                if ( Major.PHONE == clazz
-                     || (XWApp.BT_SCAN_COMPUTERS && Major.COMPUTER == clazz) ) {
-                    m_addrs.add( dev.getAddress() );
-                }
-            }
-        }
-    }
-
-    private void sendNames()
-    {
-        String[] btAddrs = getAddrs();
-        int size = btAddrs.length;
-        String[] btNames = new String[size];
-        for ( int ii = 0; ii < size; ++ii ) {
+        String[] btNames = new String[devs.size()];
+        String[] btAddrs = new String[devs.size()];
+        int ii = 0;
+        for ( BluetoothDevice dev : devs ) {
+            btAddrs[ii] = dev.getAddress();
             btNames[ii] = nameForAddr( m_adapter, btAddrs[ii] );
+            ++ii;
         }
         postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
     }
 
-    private void initAddrs()
-    {
-        m_addrs = new HashSet<String>();
-
-        String[] addrs = XWPrefs.getBTAddresses( this );
-        if ( null != addrs ) {
-            for ( String btAddr : addrs ) {
-                m_addrs.add( btAddr );
-            }
-        }
-    }
-
-    private String[] getAddrs()
-    {
-        String[] addrs;
-        synchronized( m_addrs ) {
-            addrs = m_addrs.toArray( new String[m_addrs.size()] );
-        }
-        return addrs;
-    }
-
-    private void saveAddrs()
-    {
-        XWPrefs.setBTAddresses( this, getAddrs() );
-    }
-
     private void startListener()
     {
         m_btMsgSink = new BTMsgSink();
diff --git a/xwords4/android/app/src/main/res/layout/bt_buttons.xml b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
index ea287c312..df6e78e69 100644
--- a/xwords4/android/app/src/main/res/layout/bt_buttons.xml
+++ b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
@@ -5,8 +5,8 @@
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
               >
-  <Button android:id="@+id/button_add"
-          android:text="@string/bt_pick_addall_button"
+  <Button android:id="@+id/button_scan"
+          android:text="@string/button_scan"
           style="@style/evenly_spaced_horizontal"
           />
 
@@ -14,9 +14,4 @@
           android:text="@string/bt_pair_settings"
           style="@style/evenly_spaced_horizontal"
           />
-
-  <Button android:id="@+id/button_clear"
-          android:text="@string/bt_pick_clear_button"
-          style="@style/evenly_spaced_horizontal"
-          />
 </LinearLayout>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index e5d84f35f..64ea01e0b 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1814,11 +1814,11 @@
     <!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
 
       <!-- In the Bluetooth invite device dialog -->
-    <string name="bt_pick_addall_button">Add all Paired</string>
       <!--  -->
     <string name="bt_pick_clear_button">Remove checked</string>
     <!--  -->
     <string name="bt_pair_settings">Pair More</string>
+    <string name="button_scan">Rescan</string>
 
       <!--  -->
     <string name="invite_progress_title">Connecting...</string>
@@ -1837,7 +1837,6 @@
     <string name="new_bt_body_fmt">A player on the device %1$s wants to start a game</string>
     <string name="new_relay_body">Tap to open the new game</string>
 
-
       <!--  -->
     <string name="bt_bad_proto_fmt">The version of CrossWords on
     \"%1$s\" is incompatible with this one for play using
@@ -1850,13 +1849,17 @@
     continue.</string>
 
     <!--  -->
-    <plurals name="invite_bt_desc_fmt">
-      <item quantity="one">Please check the device
-      you want to include in this game.\n\nUse the \"%2$s\"
-      button if you don\'t see the device you expect.</item>
-      <item quantity="other">Please check up to %1$d device[s]
-      you want to include in this game.\n\nUse the \"%2$s\"
-      button if you don\'t see a device you expect.</item>
+    <plurals name="invite_bt_desc_fmt_2">
+      <item quantity="one">Please check the device you want to include
+      in this game.\n\n(The list is of devices you\'ve paired and on
+      which CrossWords is currently running.)</item>
+      <item quantity="other">Please check up to %1$d device[s] you
+      want to include in this game.\n\n(The list is of devices you\'ve
+      paired and on which CrossWords is currently running.)</item>
+    </plurals>
+    <plurals name="bt_scan_progress_fmt">
+      <item quantity="one">Scanning for CrossWords</item>
+      <item quantity="other">Scanning for CrossWords on %1$d paired devices.</item>
     </plurals>
     <!--  -->
     <string name="bt_resend_fmt">Bluetooth send to %1$s failed; retry

From e984b10fea249f2781a25a0787c8369db1ee4585 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Tue, 4 Dec 2018 06:37:44 -0800
Subject: [PATCH 054/145] remove option of disabling foreground service

Since it's not going to be running all the time any more.
---
 .../main/java/org/eehouse/android/xw4/BTService.java   |  4 +---
 .../main/java/org/eehouse/android/xw4/DlgDelegate.java |  1 -
 .../org/eehouse/android/xw4/GamesListDelegate.java     |  7 -------
 .../src/main/java/org/eehouse/android/xw4/XWPrefs.java | 10 ----------
 .../android/app/src/main/res/values/common_rsrc.xml    |  1 -
 xwords4/android/app/src/main/res/values/strings.xml    |  4 ----
 xwords4/android/app/src/main/res/xml/xwprefs.xml       |  5 -----
 7 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index b6e384799..18fa82be0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -376,9 +376,7 @@ public class BTService extends XWService {
         Log.d( TAG, "startService(%s); inForeground = %b", intent, inForeground );
 
         if ( ! inForeground && canRunForegroundService() ) {
-            if ( XWPrefs.getBTBackgroundEnabled( context ) ) {
-                context.startForegroundService( intent );
-            }
+            context.startForegroundService( intent );
         } else if ( inForeground || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
             context.startService( intent );
         } else {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index 526e26107..09bba0785 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -56,7 +56,6 @@ public class DlgDelegate {
         SET_HIDE_NEWGAME_BUTTONS,
         DWNLD_LOC_DICT,
         NEW_GAME_DFLT_NAME,
-        DISABLE_BT_BACK,
 
         // BoardDelegate
         UNDO_LAST_ACTION,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index bae29f46e..1079a8afd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1359,10 +1359,6 @@ public class GamesListDelegate extends ListDelegateBase
                                      true );
             break;
 
-        case DISABLE_BT_BACK:
-            XWPrefs.setBTBackgroundEnabled( m_activity, false );
-            break;
-
         default:
             handled = super.onPosButton( action, params );
         }
@@ -2274,11 +2270,8 @@ public class GamesListDelegate extends ListDelegateBase
     private void tryBackgroundIntent( Intent intent )
     {
         if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) {
-            ActionPair pair = new ActionPair( Action.DISABLE_BT_BACK,
-                                              R.string.disable_bt_back );
             makeNotAgainBuilder( R.string.not_again_btservice,
                                  R.string.key_notagain_btservice )
-                .setActionPair( pair )
                 .show();
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
index 3262b8fef..55ba5abfe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWPrefs.java
@@ -51,16 +51,6 @@ public class XWPrefs {
         setPrefsBoolean( context, R.string.key_enable_sms, enabled );
     }
 
-    public static void setBTBackgroundEnabled( Context context, boolean enabled )
-    {
-        setPrefsBoolean( context, R.string.key_btback_enabled, enabled );
-    }
-
-    public static boolean getBTBackgroundEnabled( Context context )
-    {
-        return getPrefsBoolean( context, R.string.key_btback_enabled, true );
-    }
-
     public static boolean getDebugEnabled( Context context )
     {
         return getPrefsBoolean( context, R.string.key_enable_debug, false );
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 5d8eef505..389e79ddb 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -61,7 +61,6 @@
   <string name="key_notify_sound">key_notify_sound</string>
   <string name="key_disable_relay">key_disable_relay</string>
   <string name="key_notify_vibrate">key_notify_vibrate</string>
-  <string name="key_btback_enabled">key_btback_enabled</string>
   <string name="key_enable_sms">key_enable_sms</string>
   <string name="key_enable_p2p">key_enable_p2p</string>
   <string name="key_network_behavior">key_network_behavior</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 64ea01e0b..448076ff7 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2029,8 +2029,6 @@
     <string name="title_enable_p2p">Enable WiFi Direct</string>
     <string name="summary_enable_p2p">Experimental, uses lots of battery</string>
 
-    <string name="title_btback_enabled">Enable background Bluetooth</string>
-    <string name="summary_btback_enabled">Always listen for Bluetooth messages</string>
     <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
 
     <!--  -->
@@ -2656,8 +2654,6 @@
   Bluetooth moves and invitations while in the foreground, but any
   sent while it\'s in the background will be lost.</string>
 
-  <string name="disable_bt_back">Disable Background</string>
-
   <string name="no_invites">This game has sent no invitations</string>
 
   <string name="disable_dualpane">Disable side-by-side</string>
diff --git a/xwords4/android/app/src/main/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml
index fdb679770..8d6204d6d 100644
--- a/xwords4/android/app/src/main/res/xml/xwprefs.xml
+++ b/xwords4/android/app/src/main/res/xml/xwprefs.xml
@@ -335,11 +335,6 @@
                         android:summary="@string/notify_other_summary"
                         android:defaultValue="false"
                         />
-    <CheckBoxPreference android:key="@string/key_btback_enabled"
-                        android:title="@string/title_btback_enabled"
-                        android:summary="@string/summary_btback_enabled"
-                        android:defaultValue="true"
-                        />
     <CheckBoxPreference android:key="@string/key_enable_p2p"
                         android:title="@string/title_enable_p2p"
                         android:summary="@string/summary_enable_p2p"

From c8fe57cc784d9619bcee8b68c71bb380e297af6d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 17:13:35 -0800
Subject: [PATCH 055/145] make listener thread static

remove relationship with BTService so it can be created independently.
---
 .../org/eehouse/android/xw4/BTService.java    | 45 +++++++++++--------
 .../org/eehouse/android/xw4/DelegateBase.java |  4 --
 .../org/eehouse/android/xw4/MultiService.java |  1 -
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 18fa82be0..307297ed0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -548,14 +548,24 @@ public class BTService extends XWService {
         }
     }
 
-    private class BTListenerThread extends Thread {
+    private static class BTListenerThread extends Thread {
         private BluetoothServerSocket m_serverSocket;
+        private Context mContext;
+        private BTService mService;
+
+        BTListenerThread( Context context, BTService service )
+        {
+            mContext = context;
+            mService = service;
+        }
 
         @Override
         public void run() {     // receive thread
+            BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
+            String appName = XWApp.getAppName( mContext );
+
             try {
-                String appName = XWApp.getAppName( BTService.this );
-                m_serverSocket = m_adapter.
+                m_serverSocket = adapter.
                     listenUsingRfcommWithServiceRecord( appName,
                                                         XWApp.getAppUUID() );
             } catch ( IOException ioe ) {
@@ -563,7 +573,7 @@ public class BTService extends XWService {
                 logIOE( ioe );
             }
 
-            while ( null != m_serverSocket && m_adapter.isEnabled() ) {
+            while ( null != m_serverSocket && adapter.isEnabled() ) {
                 try {
                     BluetoothSocket socket = m_serverSocket.accept(); // blocks
                     DataInputStream inStream =
@@ -591,7 +601,7 @@ public class BTService extends XWService {
                             Log.e( TAG, "unexpected msg %s", cmd.toString());
                             break;
                         }
-                        updateStatusIn( true );
+                        mService.updateStatusIn( true );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -599,7 +609,7 @@ public class BTService extends XWService {
                         os.flush();
                         socket.close();
 
-                        sendBadProto( socket );
+                        mService.sendBadProto( socket );
                     }
                 } catch ( IOException ioe ) {
                     Log.w( TAG, "trying again..." );
@@ -643,7 +653,7 @@ public class BTService extends XWService {
         {
             DataInputStream inStream = new DataInputStream( socket.getInputStream() );
             int gameID = inStream.readInt();
-            boolean deleted = 0 != gameID && !DBUtils.haveGame( BTService.this, gameID );
+            boolean deleted = 0 != gameID && !DBUtils.haveGame( mContext, gameID );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
             os.writeByte( BTCmd.PONG.ordinal() );
@@ -651,7 +661,7 @@ public class BTService extends XWService {
             os.flush();
 
             socket.close();
-            updateStatusOut( true );
+            mService.updateStatusOut( true );
         }
 
         private void receiveInvitation( byte proto, DataInputStream is,
@@ -662,7 +672,7 @@ public class BTService extends XWService {
             NetLaunchInfo nli;
             if ( BT_PROTO_JSONS == proto ) {
                 String asJson = is.readUTF();
-                nli = NetLaunchInfo.makeFrom( BTService.this, asJson );
+                nli = NetLaunchInfo.makeFrom( mContext, asJson );
             } else {
                 short len = is.readShort();
                 byte[] nliData = new byte[len];
@@ -671,7 +681,7 @@ public class BTService extends XWService {
             }
 
             BluetoothDevice host = socket.getRemoteDevice();
-            result = makeOrNotify( nli, host.getName(), host.getAddress() );
+            result = mService.makeOrNotify( nli, host.getName(), host.getAddress() );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
             os.writeByte( result.ordinal() );
@@ -694,15 +704,15 @@ public class BTService extends XWService {
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
                     ReceiveResult rslt
-                        = BTService.this.receiveMessage( BTService.this,
-                                                         gameID, m_btMsgSink,
-                                                         buffer, addr );
+                        = mService.receiveMessage( mContext,
+                                                   gameID, mService.m_btMsgSink,
+                                                   buffer, addr );
 
                     result = rslt == ReceiveResult.GAME_GONE ?
                         BTCmd.MESG_GAMEGONE : BTCmd.MESG_ACCPT;
                     break;
                 case MESG_GAMEGONE:
-                    postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                    mService.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                     result = BTCmd.MESG_ACCPT;
                     break;
                 default:
@@ -1097,7 +1107,7 @@ public class BTService extends XWService {
     private void startListener()
     {
         m_btMsgSink = new BTMsgSink();
-        m_listener = new BTListenerThread();
+        m_listener = new BTListenerThread( this, this );
         m_listener.start();
     }
 
@@ -1180,13 +1190,10 @@ public class BTService extends XWService {
         return dos;
     }
 
-    private void logIOE( IOException ioe )
+    private static void logIOE( IOException ioe )
     {
         Log.ex( TAG, ioe );
         ++s_errCount;
-        // if ( 0 == s_errCount % 10 ) {
-            postEvent( MultiEvent.BT_ERR_COUNT, s_errCount );
-            // }
     }
 
     private void sendBadProto( BluetoothSocket socket )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 66932cfa1..18564462b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -600,10 +600,6 @@ public class DelegateBase implements DlgClickNotify,
     {
         int fmtId = 0;
         switch( event ) {
-        case BT_ERR_COUNT:
-            int count = (Integer)args[0];
-            Log.i( TAG, "Bluetooth error count: %d", count );
-            break;
         case BAD_PROTO_BT:
             fmtId = R.string.bt_bad_proto_fmt;
             break;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
index 91dbd8390..6f14465ba 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MultiService.java
@@ -87,7 +87,6 @@ public class MultiService {
                              SMS_SEND_FAILED_NOPERMISSION,
 
                              BT_GAME_CREATED,
-                             BT_ERR_COUNT,
 
                              RELAY_ALERT,
     };

From 271d43808f85a421353fc01f27aa84339b3fa68b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 19:58:19 -0800
Subject: [PATCH 056/145] kill foreground service on a timer

reset timer on receiving meaningful data and on moving app to
background. If it fires and we're in background, kill the service.
(There's currently no way to restart it except bringing the app into the
foreground. Fixing that's coming.)
---
 .../org/eehouse/android/xw4/BTService.java    | 60 ++++++++++++++++++-
 .../java/org/eehouse/android/xw4/DBUtils.java |  4 +-
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 307297ed0..530e658fe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -32,9 +32,10 @@ import android.bluetooth.BluetoothSocket;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
+import android.os.Handler;
+import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
 
-
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
 import org.eehouse.android.xw4.jni.CommsAddrRec;
@@ -77,6 +78,8 @@ import java.util.concurrent.TimeUnit;
 public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
+    private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
+    private static int DEFAULT_KEEPALIVE_SECONDS = 60 * 1; // 1 minute for testing; maybe 15 on ship?
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -187,6 +190,8 @@ public class BTService extends XWService {
     private BTListenerThread m_listener;
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
+    private Handler mHandler;
+
     private static int s_errCount = 0;
 
     public static boolean BTAvailable()
@@ -266,7 +271,9 @@ public class BTService extends XWService {
 
     private static boolean inForeground()
     {
-        return sInForeground != null && sInForeground;
+        boolean result = sInForeground != null && sInForeground;
+        // Log.d( TAG, "inForeground() => %b", result );
+        return result;
     }
 
     static void onAppToForeground( Context context )
@@ -404,6 +411,7 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        mHandler = new Handler();
         startForegroundIf();
 
         BluetoothAdapter adapter = XWApp.BTSUPPORTED
@@ -446,8 +454,10 @@ public class BTService extends XWService {
                 switch( cmd ) {
                 case START_FOREGROUND:
                     stopForeground( true ); // Kill the notification
-                    // FALLTHRU
+                    break;
                 case START_BACKGROUND:
+                    noteLastUsed( this );   // prevent timer from killing immediately
+                    setTimeoutTimer();
                     break;
 
                 case CLEAR:
@@ -581,6 +591,7 @@ public class BTService extends XWService {
 
                     byte proto = inStream.readByte();
                     BTCmd cmd = BTCmd.values()[inStream.readByte()];
+                    Log.d( TAG, "BTListenerThread() got %s", cmd );
                     if ( protoOK( proto, cmd ) ) {
                         switch( cmd ) {
                         case PING:
@@ -602,6 +613,7 @@ public class BTService extends XWService {
                             break;
                         }
                         mService.updateStatusIn( true );
+                        noteLastUsed( mContext );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -1190,6 +1202,48 @@ public class BTService extends XWService {
         return dos;
     }
 
+    private static void noteLastUsed( Context context )
+    {
+        Log.d( TAG, "noteLastUsed(" + context + ")" );
+        synchronized (BTService.class) {
+            int nowSecs = (int)(SystemClock.uptimeMillis() / 1000);
+            int newKeepSecs = nowSecs + DEFAULT_KEEPALIVE_SECONDS;
+            DBUtils.setIntFor( context, KEY_KEEPALIVE_UNTIL_SECS, newKeepSecs );
+        }
+    }
+
+    private void setTimeoutTimer()
+    {
+        DbgUtils.assertOnUIThread();
+
+        if ( inForeground() ) {
+            // Let the timer die if we're in the foreground!
+            Log.d( TAG, "setTimeoutTimer(): in foreground; not resetting timer" );
+        } else {
+            long dieTimeMillis;
+            synchronized (BTService.class) {
+                dieTimeMillis = 1000 * DBUtils.getIntFor( this, KEY_KEEPALIVE_UNTIL_SECS, 0 );
+            }
+            long nowMillis = SystemClock.uptimeMillis();
+
+            if ( dieTimeMillis <= nowMillis ) {
+                Log.d( TAG, "setTimeoutTimer(): killing the thing" );
+                stopListener();
+                stopForeground(true);
+            } else {
+                mHandler.removeCallbacksAndMessages( this );
+                mHandler.postAtTime( new Runnable() {
+                        @Override
+                        public void run() {
+                            Log.d( TAG, "timeout timer fired" );
+                            setTimeoutTimer();
+                        }
+                    }, this, dieTimeMillis );
+                Log.d( TAG, "setTimeoutTimer(): set for %dms from now", dieTimeMillis - nowMillis );
+            }
+        }
+    }
+
     private static void logIOE( IOException ioe )
     {
         Log.ex( TAG, ioe );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 700b918a8..173c0d05e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -2394,7 +2394,7 @@ public class DBUtils {
 
     public static void setIntFor( Context context, String key, int value )
     {
-        // Log.df( "DBUtils.setIntFor(key=%s, val=%d)", key, value );
+        // Log.d( TAG, "DBUtils.setIntFor(key=%s, val=%d)", key, value );
         String asStr = String.format( "%d", value );
         setStringFor( context, key, asStr );
     }
@@ -2405,7 +2405,7 @@ public class DBUtils {
         if ( null != asStr ) {
             dflt = Integer.parseInt( asStr );
         }
-        // Log.df( "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
+        // Log.d( TAG, "DBUtils.getIntFor(key=%s)=>%d", key, dflt );
         return dflt;
     }
 

From 3dbec328af5222875e5936736cbde8c66238784e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 4 Dec 2018 19:59:42 -0800
Subject: [PATCH 057/145] fix NPE

It happened when too many timers were firing, but I think this code's
better anyway.
---
 .../java/org/eehouse/android/xw4/BTService.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 530e658fe..ec463e3a1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -1131,13 +1131,16 @@ public class BTService extends XWService {
 
     private void stopListener()
     {
-        m_listener.stopListening();
-        try {
-            m_listener.join( 100 );
-        } catch ( InterruptedException ie ) {
-            Log.ex( TAG, ie );
+        BTListenerThread listener = m_listener;
+        if ( listener != null ) {
+            m_listener = null;
+            listener.stopListening();
+            try {
+                listener.join( 100 );
+            } catch ( InterruptedException ie ) {
+                Log.ex( TAG, ie );
+            }
         }
-        m_listener = null;
     }
 
     private void stopSender()

From 68ae9790b4e55cb867533b85a2c818835073fd94 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:14:57 -0800
Subject: [PATCH 058/145] launch service from ACTION_ACL_CONNECTED

Fire up the receiver thread, and start the service, on receipt of this
ACTION (if they're not already running.) On start, the service takes
over the thread and begins dispatching messages. Works to launch the app
when it's not running and in most cases, though messages received before
the service launches are currently dropped, things seem to work.
---
 .../org/eehouse/android/xw4/BTReceiver.java   |   2 +-
 .../org/eehouse/android/xw4/BTService.java    | 210 ++++++++++++++----
 2 files changed, 166 insertions(+), 46 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
index 3912d0c82..19b21e6a9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
@@ -38,7 +38,7 @@ public class BTReceiver extends BroadcastReceiver {
                    action, intent.toString() );
 
             if ( action.equals( BluetoothDevice.ACTION_ACL_CONNECTED ) ) {
-                BTService.startService( context );
+                BTService.onACLConnected( context );
             } else if ( action.equals( BluetoothAdapter.ACTION_STATE_CHANGED ) ) {
                 int newState =
                     intent.getIntExtra( BluetoothAdapter.EXTRA_STATE, -1 );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index ec463e3a1..6a0cb9b67 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -79,7 +79,8 @@ public class BTService extends XWService {
     private static final String TAG = BTService.class.getSimpleName();
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
     private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
-    private static int DEFAULT_KEEPALIVE_SECONDS = 60 * 1; // 1 minute for testing; maybe 15 on ship?
+    // half minute for testing; maybe 15 on ship? Or make it a debug config.
+    private static int DEFAULT_KEEPALIVE_SECONDS = 30;
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -187,7 +188,6 @@ public class BTService extends XWService {
 
     private BluetoothAdapter m_adapter;
     private BTMsgSink m_btMsgSink;
-    private BTListenerThread m_listener;
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
     private Handler mHandler;
@@ -261,11 +261,10 @@ public class BTService extends XWService {
         if ( null == sInForeground || inForeground() != inForeground ) {
             sInForeground = inForeground;
 
-            Intent intent =
-                getIntentTo( context,
-                             inForeground ? BTAction.START_FOREGROUND
-                             : BTAction.START_BACKGROUND );
-            startService( context, intent );
+            startService( context,
+                          getIntentTo( context,
+                                       inForeground ? BTAction.START_FOREGROUND
+                                       : BTAction.START_BACKGROUND ) );;
         }
     }
 
@@ -293,6 +292,12 @@ public class BTService extends XWService {
         }
     }
 
+    public static void onACLConnected( Context context )
+    {
+        Log.d( TAG, "onACLConnected()" );
+        BTListenerThread.startYourself( context );
+    }
+
     public static void radioChanged( Context context, boolean cameOn )
     {
         Intent intent = getIntentTo( context, BTAction.RADIO );
@@ -309,8 +314,7 @@ public class BTService extends XWService {
 
     public static void scan( Context context )
     {
-        Intent intent = getIntentTo( context, BTAction.SCAN );
-        startService( context, intent );
+        startService( context, getIntentTo( context, BTAction.SCAN ) );
     }
 
     public static void pingHost( Context context, String hostAddr, int gameID )
@@ -411,6 +415,10 @@ public class BTService extends XWService {
     @Override
     public void onCreate()
     {
+        Log.d( TAG, "%s.onCreate()", this );
+        super.onCreate();
+
+        m_btMsgSink = new BTMsgSink();
         mHandler = new Handler();
         startForegroundIf();
 
@@ -438,24 +446,33 @@ public class BTService extends XWService {
         return result;
     }
 
+    @Override
+    public void onDestroy()
+    {
+        Log.d( TAG, "%s.onDestroy()", this );
+        super.onDestroy();
+    }
+
     private int handleCommand( Intent intent )
     {
         int result;
         if ( XWApp.BTSUPPORTED && null != intent ) {
             int ordinal = intent.getIntExtra( CMD_KEY, -1 );
             if ( -1 == ordinal ) {
+                Log.d( TAG, "handleCommand(): no ordinal!" );
                 // Drop it
             } else if ( null == m_sender ) {
                 Log.w( TAG, "exiting: m_queue is null" );
                 stopSelf();
             } else {
                 BTAction cmd = BTAction.values()[ordinal];
-                Log.i( TAG, "onStartCommand; cmd=%s", cmd.toString() );
+                Log.i( TAG, "handleCommand; cmd=%s", cmd.toString() );
                 switch( cmd ) {
                 case START_FOREGROUND:
                     stopForeground( true ); // Kill the notification
                     break;
                 case START_BACKGROUND:
+                    startListener();
                     noteLastUsed( this );   // prevent timer from killing immediately
                     setTimeoutTimer();
                     break;
@@ -469,7 +486,7 @@ public class BTService extends XWService {
                 case INVITE:
                     String jsonData = intent.getStringExtra( GAMEDATA_KEY );
                     NetLaunchInfo nli = NetLaunchInfo.makeFrom( this, jsonData );
-                    Log.i( TAG, "onStartCommand: nli: %s", nli.toString() );
+                    Log.i( TAG, "handleCommand: nli: %s", nli.toString() );
                     String btAddr = intent.getStringExtra( ADDR_KEY );
                     m_sender.add( new BTQueueElem( BTCmd.INVITE, nli, btAddr ) );
                     break;
@@ -559,14 +576,115 @@ public class BTService extends XWService {
     }
 
     private static class BTListenerThread extends Thread {
+        // Wrap so we can synchronize on the container
+        private static BTListenerThread[] s_listener = {null};
         private BluetoothServerSocket m_serverSocket;
         private Context mContext;
         private BTService mService;
+        private volatile Thread mTimerThread;
 
-        BTListenerThread( Context context, BTService service )
+        private BTListenerThread( Context context, BTService service )
         {
             mContext = context;
             mService = service;
+
+            // Started without a BTService instance? Run for only a little
+            // while
+            if ( null == service ) {
+                startKillTimer();
+            }
+        }
+
+        static void startYourself( Context context, BTService service )
+        {
+            Log.d( TAG, "startYourself(%s, %s)", context, service );
+            DbgUtils.assertOnUIThread();
+            synchronized ( s_listener ) {
+                if ( s_listener[0] == null ) {
+                    s_listener[0] = new BTListenerThread( context, service );
+                    s_listener[0].start();
+                } else if ( null != service ) {
+                    s_listener[0].setService( context, service );
+                }
+            }
+        }
+
+        static void startYourself( Context context )
+        {
+            DbgUtils.assertOnUIThread();
+            startYourself( context, null );
+        }
+
+        static void stopYourself( BTListenerThread self )
+        {
+            Log.d( TAG, "stopYourself()" );
+            BTListenerThread listener;
+            synchronized ( s_listener ) {
+                listener = s_listener[0];
+                s_listener[0] = null;
+            }
+            if ( null != listener ) {
+                Assert.assertTrue( self == null || self == listener );
+                listener.stopListening();
+                try {
+                    listener.join( 100 );
+                } catch ( InterruptedException ie ) {
+                    Log.ex( TAG, ie );
+                }
+            }
+        }
+
+        void setService( Context context, BTService service )
+        {
+            if ( null == mService ) {
+                Log.d( TAG, "setService(): we didn't have one before. Do something!!!" );
+                mService = service;
+                Assert.assertNotNull( context );
+                mContext = context; // Use Service instead of Receiver (possibly)
+            } else {
+                Assert.assertTrue( service == mService );
+            }
+        }
+
+        private void startTheService()
+        {
+            stopKillTimer();
+
+            if (! inForeground() ) {
+                startService( mContext,
+                              getIntentTo( mContext,
+                                           BTAction.START_BACKGROUND ) );
+            } else {
+                // Will be a race condition maybe?
+                Assert.assertFalse( BuildConfig.DEBUG );
+            }
+        }
+
+        private synchronized void startKillTimer()
+        {
+            Assert.assertNull( mTimerThread );
+            mTimerThread = new Thread( new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            // Give legitimate caller 10 seconds to retry with
+                            // a packet that we'll recognize.
+                            Thread.sleep( 10 * 1000 );
+                            stopYourself( BTListenerThread.this );
+                        } catch (InterruptedException ie) {
+                            Log.e( TAG, "timer thread interrupted; exiting" );
+                        }
+                    }
+                } );
+            mTimerThread.start();
+        }
+
+        private synchronized void stopKillTimer()
+        {
+            if ( mTimerThread != null ) {
+                mTimerThread.interrupt();
+                mTimerThread = null;
+            }
         }
 
         @Override
@@ -593,27 +711,32 @@ public class BTService extends XWService {
                     BTCmd cmd = BTCmd.values()[inStream.readByte()];
                     Log.d( TAG, "BTListenerThread() got %s", cmd );
                     if ( protoOK( proto, cmd ) ) {
-                        switch( cmd ) {
-                        case PING:
-                            receivePing( socket );
-                            break;
-                        case INVITE:
-                            receiveInvitation( proto, inStream, socket );
-                            break;
-                        case MESG_SEND:
-                            receiveMessage( cmd, inStream, socket );
-                            break;
+                        if ( null == mService ) {
+                            Log.d( TAG, "dropping packet; starting service" );
+                            startTheService();
+                        } else {
+                            switch( cmd ) {
+                            case PING:
+                                receivePing( socket );
+                                break;
+                            case INVITE:
+                                receiveInvitation( proto, inStream, socket );
+                                break;
+                            case MESG_SEND:
+                                receiveMessage( cmd, inStream, socket );
+                                break;
 
-                        case MESG_GAMEGONE:
-                            receiveMessage( cmd, inStream, socket );
-                            break;
+                            case MESG_GAMEGONE:
+                                receiveMessage( cmd, inStream, socket );
+                                break;
 
-                        default:
-                            Log.e( TAG, "unexpected msg %s", cmd.toString());
-                            break;
+                            default:
+                                Log.e( TAG, "unexpected msg %s", cmd.toString());
+                                break;
+                            }
+                            mService.updateStatusIn( true );
+                            noteLastUsed( mContext );
                         }
-                        mService.updateStatusIn( true );
-                        noteLastUsed( mContext );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
@@ -1118,9 +1241,7 @@ public class BTService extends XWService {
 
     private void startListener()
     {
-        m_btMsgSink = new BTMsgSink();
-        m_listener = new BTListenerThread( this, this );
-        m_listener.start();
+        BTListenerThread.startYourself( this, this );
     }
 
     private void startSender()
@@ -1131,16 +1252,7 @@ public class BTService extends XWService {
 
     private void stopListener()
     {
-        BTListenerThread listener = m_listener;
-        if ( listener != null ) {
-            m_listener = null;
-            listener.stopListening();
-            try {
-                listener.join( 100 );
-            } catch ( InterruptedException ie ) {
-                Log.ex( TAG, ie );
-            }
-        }
+        BTListenerThread.stopYourself( null );
     }
 
     private void stopSender()
@@ -1192,12 +1304,20 @@ public class BTService extends XWService {
 
         DataOutputStream dos;
         try {
-            socket.connect();
+            for ( int ii = 0; ii < 3; ++ii ) {
+                try {
+                    socket.connect();
+                    break;
+                } catch (IOException ioe) {
+                    Thread.sleep( 2000 );
+                    Log.d( TAG, "ioe on connect(); trying again" );
+                }
+            }
             dos = new DataOutputStream( socket.getOutputStream() );
             dos.writeByte( BT_PROTO );
             dos.writeByte( cmd.ordinal() );
             Log.i( TAG, "connect() to %s successful", name );
-        } catch ( IOException ioe ) {
+        } catch ( IOException | InterruptedException ioe ) {
             dos = null;
             Log.w( TAG, "BTService.connect() to %s failed", name );
             // logIOE( ioe );

From 051aeba57c9580af086dbd34da46728a5e05eb04 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:17:13 -0800
Subject: [PATCH 059/145] fix crash by not creating Handler until on UI thread

Receiver is created and installed by a non-UI thread sometimes so can't
create the Handler there. onReceive() is called on an ok thread however
so create it there on demand. Fixes crash that showed when receiving
relay messages in background.
---
 .../main/java/org/eehouse/android/xw4/NetStateCache.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
index 373c88ce2..198aa5c48 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetStateCache.java
@@ -181,8 +181,6 @@ public class NetStateCache {
 
         public PvtBroadcastReceiver()
         {
-            // DbgUtils.assertOnUIThread(); // firing
-            mHandler = new Handler();
             mLastStateSent = s_netAvail;
         }
 
@@ -191,6 +189,11 @@ public class NetStateCache {
         {
             DbgUtils.assertOnUIThread();
 
+            if ( null == mHandler ) {
+                DbgUtils.assertOnUIThread();
+                mHandler = new Handler();
+            }
+
             if ( intent.getAction().
                  equals( ConnectivityManager.CONNECTIVITY_ACTION)) {
 

From 95c11eec0769def89eb98455d4d4a9deb957bf38 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 5 Dec 2018 20:36:25 -0800
Subject: [PATCH 060/145] don't try to connect to non-phones

When a device is paired but not a phone (or computer, which is how
tablets identify), don't bother trying to scan it.
---
 .../org/eehouse/android/xw4/BTService.java    | 21 ++++++++++++-------
 .../java/org/eehouse/android/xw4/XWApp.java   |  2 --
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 6a0cb9b67..f0277f0c7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -969,15 +969,20 @@ public class BTService extends XWService {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             // DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
             for ( BluetoothDevice dev : pairedDevs ) {
-                String btAddr = dev.getAddress();
-
-                if ( sendPing( dev, 0 ) ) { // did we get a reply?
-                    if ( null != addrs ) {
-                        addrs.add( dev );
-                    }
-                    if ( null != event ) {
-                        postEvent( event, dev.getName() );
+                // Skip things that can't host an Android app
+                int clazz = dev.getBluetoothClass().getMajorDeviceClass();
+                if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
+                    if ( sendPing( dev, 0 ) ) { // did we get a reply?
+                        if ( null != addrs ) {
+                            addrs.add( dev );
+                        }
+                        if ( null != event ) {
+                            postEvent( event, dev.getName() );
+                        }
                     }
+                } else {
+                    Log.d( TAG, "skipping %s; not an android device!",
+                           dev.getName() );
                 }
             }
         }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 441e3d67b..253118efd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -50,8 +50,6 @@ public class XWApp extends Application implements LifecycleObserver {
     public static final boolean LOCUTILS_ENABLED = false;
     public static final boolean CONTEXT_MENUS_ENABLED = true;
     public static final boolean OFFER_DUALPANE = false;
-    // BT class "COMPUTERS" includes tablets like the Nexus 9
-    public static final boolean BT_SCAN_COMPUTERS = true;
 
     public static final String SMS_PUBLIC_HEADER = "-XW4";
     public static final int MAX_TRAY_TILES = 7; // comtypes.h

From c4ac96ede8cccbe0e8613f08724e5be80c04857f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 6 Dec 2018 06:23:40 -0800
Subject: [PATCH 061/145] fix NPE (race condition around deletion?)

Check for null. Not sure how I got it there, but there's little harm in
failing silently.
---
 .../main/java/org/eehouse/android/xw4/GameUtils.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index ba3d807d5..2df7fd7f9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -274,9 +274,13 @@ public class GameUtils {
 
     public static void deleteGame( Context context, GameLock lock, boolean informNow )
     {
-        tellDied( context, lock, informNow );
-        Utils.cancelNotification( context, (int)lock.getRowid() );
-        DBUtils.deleteGame( context, lock );
+        if ( null != lock ) {
+            tellDied( context, lock, informNow );
+            Utils.cancelNotification( context, (int)lock.getRowid() );
+            DBUtils.deleteGame( context, lock );
+        } else {
+            Log.e( TAG, "deleteGame(): null lock; doing nothing" );
+        }
     }
 
     public static boolean deleteGame( Context context, long rowid,

From 7c804b9aad23164a332b6eca4beda2a2fe813e87 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Thu, 6 Dec 2018 19:12:32 -0800
Subject: [PATCH 062/145] don't drop potential duplicate invitations after 5
 seconds

Other code will take care of duplicates. This was meant to avoid a race
condition, for which 5 seconds is enough. Blocking forever complicates
testing.
---
 .../org/eehouse/android/xw4/XWService.java    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 524695feb..4e431f2c0 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -33,15 +33,15 @@ import org.eehouse.android.xw4.jni.JNIThread;
 import org.eehouse.android.xw4.jni.UtilCtxt;
 import org.eehouse.android.xw4.jni.UtilCtxtImpl;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Map;
 
 abstract class XWService extends Service {
     private static final String TAG = XWService.class.getSimpleName();
     public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
 
     protected static MultiService s_srcMgr = null;
-    private static Set<String> s_seen = new HashSet<String>();
+    private static Map<String, Long> s_seen = new HashMap<>();
 
     private UtilCtxt m_utilCtxt;
 
@@ -72,18 +72,20 @@ abstract class XWService extends Service {
 
     // Check that we aren't already processing an invitation with this
     // inviteID.
+    private static final long SEEN_INTERVAL_MS = 1000 * 5;
     private boolean checkNotDupe( NetLaunchInfo nli )
     {
         String inviteID = nli.inviteID();
-        boolean isDupe;
         synchronized( s_seen ) {
-            isDupe = s_seen.contains( inviteID );
-            if ( !isDupe ) {
-                s_seen.add( inviteID );
+            long now = System.currentTimeMillis();
+            Long lastSeen = s_seen.get( inviteID );
+            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
+            if ( !seen ) {
+                s_seen.put( inviteID, now );
             }
+            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
+            return !seen;
         }
-        Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !isDupe );
-        return !isDupe;
     }
 
     abstract void postNotification( String device, int gameID, long rowid );

From e30466e096b9c3615ce8b1ed267b423cbda72520 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 6 Dec 2018 18:54:23 -0800
Subject: [PATCH 063/145] include flavor in logged TAG

Tired of not being to tell variants' logs apart.
---
 .../src/main/java/org/eehouse/android/xw4/Log.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
index b12afe650..c96528b39 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
@@ -23,21 +23,23 @@ package org.eehouse.android.xw4;
 import java.util.Formatter;
 
 public class Log {
+    private static final String PRE_TAG = BuildConfig.FLAVOR + ":";
+
     public static void d( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.d( tag, str );
+        android.util.Log.d( PRE_TAG + tag, str );
     }
     public static void w( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.w( tag, str );
+        android.util.Log.w( PRE_TAG + tag, str );
     }
     public static void e( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.e( tag, str );
+        android.util.Log.e( PRE_TAG + tag, str );
     }
     public static void i( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();
-        android.util.Log.i( tag, str );
+        android.util.Log.i( PRE_TAG + tag, str );
     }
 
     public static void ex( String tag, Exception exception )
@@ -45,5 +47,4 @@ public class Log {
         w( tag, "Exception: %s", exception.toString() );
         DbgUtils.printStack( tag, exception.getStackTrace() );
     }
-
 }

From 3c861166de4822d735e1275897fb5f09fcea6ed4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:03:08 -0800
Subject: [PATCH 064/145] use TAG format that doesn't break logcat filtering

---
 .../android/app/src/main/java/org/eehouse/android/xw4/Log.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
index c96528b39..c54fce834 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Log.java
@@ -23,7 +23,7 @@ package org.eehouse.android.xw4;
 import java.util.Formatter;
 
 public class Log {
-    private static final String PRE_TAG = BuildConfig.FLAVOR + ":";
+    private static final String PRE_TAG = BuildConfig.FLAVOR + "-";
 
     public static void d( String tag, String fmt, Object... args ) {
         String str = new Formatter().format( fmt, args ).toString();

From 9c501b19a89d512f2d2aed4f29cc31085f0a4004 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:12:49 -0800
Subject: [PATCH 065/145] get RECEIVE_SMS permission with SEND_SMS

Apparently one of the newer Android SDK levels adds the requirement to
have RECEIVE_SMS permission in order for a broadcast receiver to get
called. Meaning receipt didn't work even if SEND_SMS had been
granted. Since they're both in the same group (for now) the OS will
grant the second silently if the first has been granted, but it still
has to be requested. So request both at the same time. This still leaves
the problem that a user who's never tried to create an SMS game won't
have been asked for either permission and so won't receive SMS
invitations, but fixing that is for a later release.
---
 .../eehouse/android/xw4/BoardDelegate.java    |  2 ++
 .../java/org/eehouse/android/xw4/Perms23.java | 24 ++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index ba5e64e8f..3269eb9a3 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1218,6 +1218,8 @@ public class BoardDelegate extends DelegateBase
             case SMS:
                 Perms23.tryGetPerms( this, Perm.SEND_SMS, R.string.sms_invite_rationale,
                                      Action.INVITE_SMS, m_mySIS.nMissing, info );
+                Perms23.tryGetPerms( this, Perm.RECEIVE_SMS, R.string.sms_invite_rationale,
+                                     Action.INVITE_SMS, m_mySIS.nMissing, info );
                 break;
             case RELAY:
                 RelayInviteDelegate.launchForResult( m_activity, m_mySIS.nMissing,
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index f8b3be7bf..710809192 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -19,6 +19,7 @@
 
 package org.eehouse.android.xw4;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
@@ -43,14 +44,15 @@ public class Perms23 {
     private static final String TAG = Perms23.class.getSimpleName();
     
     public static enum Perm {
-        READ_PHONE_STATE("android.permission.READ_PHONE_STATE"),
-        STORAGE("android.permission.WRITE_EXTERNAL_STORAGE"),
-        SEND_SMS("android.permission.SEND_SMS"),
-        READ_CONTACTS("android.permission.READ_CONTACTS")
-        ;
+        READ_PHONE_STATE(Manifest.permission.READ_PHONE_STATE),
+        STORAGE(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+        SEND_SMS(Manifest.permission.SEND_SMS),
+        RECEIVE_SMS(Manifest.permission.RECEIVE_SMS),
+        READ_CONTACTS(Manifest.permission.READ_CONTACTS);
 
         private String m_str;
         private Perm(String str) { m_str = str; }
+
         public String getString() { return m_str; }
         public static Perm getFor( String str ) {
             Perm result = null;
@@ -261,6 +263,7 @@ public class Perms23 {
     {
         // Log.d( TAG, "gotPermissionResult(%s)", perms.toString() );
         Map<Perm, Boolean> result = new HashMap<Perm, Boolean>();
+        boolean shouldResend = false;
         for ( int ii = 0; ii < perms.length; ++ii ) {
             Perm perm = Perm.getFor( perms[ii] );
             boolean granted = PackageManager.PERMISSION_GRANTED == granteds[ii];
@@ -269,9 +272,8 @@ public class Perms23 {
             // Hack. If SMS has been granted, resend all moves. This should be
             // replaced with an api allowing listeners to register
             // Perm-by-Perm, but I'm in a hurry.
-            if ( granted && perm == Perm.SEND_SMS ) {
-                GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS,
-                                       true, true );
+            if ( granted && (perm == Perm.SEND_SMS || perm == Perm.RECEIVE_SMS) ) {
+                shouldResend = true;
             }
 
             // Log.d( TAG, "calling %s.onPermissionResult(%s, %b)",
@@ -279,6 +281,11 @@ public class Perms23 {
             //                granted );
         }
 
+        if ( shouldResend ) {
+            GameUtils.resendAllIf( context, CommsConnType.COMMS_CONN_SMS,
+                                   true, true );
+        }
+
         PermCbck cbck = s_map.remove( code );
         if ( null != cbck ) {
             cbck.onPermissionResult( result );
@@ -290,6 +297,7 @@ public class Perms23 {
         String permString = perm.getString();
         boolean result = PackageManager.PERMISSION_GRANTED
             == ContextCompat.checkSelfPermission( XWApp.getContext(), permString );
+        // Log.d( TAG, "havePermission(%s) => %b", permString, result );
         return result;
     }
 

From 5f7e4aa1b9070f00667d2fbc34ac692eff871d3c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 11:22:07 -0800
Subject: [PATCH 066/145] refactor a tiny bit

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index 610d1421a..eba26c22c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -174,7 +174,7 @@ public class SMSService extends XWService {
     public static void stopService( Context context )
     {
         Intent intent = getIntentTo( context, SMSAction.STOP_SELF );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     // NBS case
@@ -184,7 +184,7 @@ public class SMSService extends XWService {
         Intent intent = getIntentTo( context, SMSAction.HANDLEDATA );
         intent.putExtra( BUFFER, buffer );
         intent.putExtra( PHONE, phone );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void inviteRemote( Context context, String phone,
@@ -195,7 +195,7 @@ public class SMSService extends XWService {
         Log.w( TAG, "inviteRemote(%s, '%s')", phone, nli );
         byte[] data = nli.asByteArray();
         intent.putExtra( GAMEDATA_BA, data );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static int sendPacket( Context context, String phone,
@@ -207,7 +207,7 @@ public class SMSService extends XWService {
             intent.putExtra( PHONE, phone );
             intent.putExtra( MultiService.GAMEID, gameID );
             intent.putExtra( BINBUFFER, binmsg );
-            context.startService( intent );
+            startService( context, intent );
             nSent = binmsg.length;
         } else {
             Log.i( TAG, "sendPacket: dropping because SMS disabled" );
@@ -220,14 +220,14 @@ public class SMSService extends XWService {
         Intent intent = getIntentTo( context, SMSAction.REMOVE );
         intent.putExtra( PHONE, phone );
         intent.putExtra( MultiService.GAMEID, gameID );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static void onGameDictDownload( Context context, Intent intentOld )
     {
         Intent intent = getIntentTo( context, SMSAction.ADDED_MISSING );
         intent.fillIn( intentOld, 0 );
-        context.startService( intent );
+        startService( context, intent );
     }
 
     public static String fromPublicFmt( String msg )
@@ -255,6 +255,12 @@ public class SMSService extends XWService {
         return result;
     }
 
+    private static void startService( Context context, Intent intent )
+    {
+        Log.d( TAG, "startService(%s)", intent );
+        context.startService( intent );
+    }
+
     private static Intent getIntentTo( Context context, SMSAction cmd )
     {
         Intent intent = new Intent( context, SMSService.class );
@@ -311,6 +317,7 @@ public class SMSService extends XWService {
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
+        // Log.d( TAG, "onStartCommand(%s)", intent );
         int result = Service.START_NOT_STICKY;
         if ( null != intent ) {
             int ordinal = intent.getIntExtra( CMD_STR, -1 );

From c5c081e8bde0a14d2c74847bf162377c41d85585 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 7 Dec 2018 16:56:45 -0800
Subject: [PATCH 067/145] make RelayService descend from JobIntentService

Required moving most of XWService into a class to which all services
could delegate what they used to inherit.

squash me
---
 .../android/app/src/main/AndroidManifest.xml  |   2 +
 .../org/eehouse/android/xw4/BTService.java    | 104 ++++++----
 .../org/eehouse/android/xw4/DelegateBase.java |   4 +-
 .../org/eehouse/android/xw4/RelayService.java |  76 +++++---
 .../org/eehouse/android/xw4/SMSService.java   |  64 +++---
 .../org/eehouse/android/xw4/WiDirService.java |  44 +++--
 .../org/eehouse/android/xw4/XWService.java    | 155 +--------------
 .../eehouse/android/xw4/XWServiceHelper.java  | 182 ++++++++++++++++++
 8 files changed, 362 insertions(+), 269 deletions(-)
 create mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index db24701c9..ef8e0f2d7 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -25,6 +25,7 @@
   <uses-permission android:name="android.permission.READ_CONTACTS" />
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
   <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+  <uses-permission android:name="android.permission.WAKE_LOCK" />
 
   <!-- Required for wifi-direct -->
   <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> -->
@@ -189,6 +190,7 @@
              />
     <service android:name="RelayService"
              android:exported="false"
+             android:permission="android.permission.BIND_JOB_SERVICE"
              />
 
     <receiver android:name=".MountEventReceiver">
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index f0277f0c7..4b984958a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -191,6 +191,7 @@ public class BTService extends XWService {
     private BTSenderThread m_sender;
     private Notification m_notification; // make once use many
     private Handler mHandler;
+    private BTServiceHelper mHelper;
 
     private static int s_errCount = 0;
 
@@ -418,6 +419,8 @@ public class BTService extends XWService {
         Log.d( TAG, "%s.onCreate()", this );
         super.onCreate();
 
+        mHelper = new BTServiceHelper( this );
+
         m_btMsgSink = new BTMsgSink();
         mHandler = new Handler();
         startForegroundIf();
@@ -522,7 +525,7 @@ public class BTService extends XWService {
                     boolean cameOn = intent.getBooleanExtra( RADIO_KEY, false );
                     MultiEvent evt = cameOn? MultiEvent.BT_ENABLED
                         : MultiEvent.BT_DISABLED;
-                    postEvent( evt );
+                    mHelper.postEvent( evt );
                     if ( cameOn ) {
                         GameUtils.resendAllIf( this, CommsConnType.COMMS_CONN_BT );
                     } else {
@@ -581,6 +584,7 @@ public class BTService extends XWService {
         private BluetoothServerSocket m_serverSocket;
         private Context mContext;
         private BTService mService;
+        private BTServiceHelper mHelper;
         private volatile Thread mTimerThread;
 
         private BTListenerThread( Context context, BTService service )
@@ -595,7 +599,8 @@ public class BTService extends XWService {
             }
         }
 
-        static void startYourself( Context context, BTService service )
+        static void startYourself( Context context, BTService service,
+                                   BTServiceHelper helper )
         {
             Log.d( TAG, "startYourself(%s, %s)", context, service );
             DbgUtils.assertOnUIThread();
@@ -604,7 +609,7 @@ public class BTService extends XWService {
                     s_listener[0] = new BTListenerThread( context, service );
                     s_listener[0].start();
                 } else if ( null != service ) {
-                    s_listener[0].setService( context, service );
+                    s_listener[0].setService( context, service, helper );
                 }
             }
         }
@@ -612,7 +617,7 @@ public class BTService extends XWService {
         static void startYourself( Context context )
         {
             DbgUtils.assertOnUIThread();
-            startYourself( context, null );
+            startYourself( context, null, null );
         }
 
         static void stopYourself( BTListenerThread self )
@@ -634,11 +639,12 @@ public class BTService extends XWService {
             }
         }
 
-        void setService( Context context, BTService service )
+        void setService( Context context, BTService service, BTServiceHelper helper )
         {
             if ( null == mService ) {
                 Log.d( TAG, "setService(): we didn't have one before. Do something!!!" );
                 mService = service;
+                mHelper = helper;
                 Assert.assertNotNull( context );
                 mContext = context; // Use Service instead of Receiver (possibly)
             } else {
@@ -838,16 +844,16 @@ public class BTService extends XWService {
 
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
-                    ReceiveResult rslt
-                        = mService.receiveMessage( mContext,
-                                                   gameID, mService.m_btMsgSink,
-                                                   buffer, addr );
+                    XWServiceHelper.ReceiveResult rslt
+                        = mHelper.receiveMessage( mContext,
+                                                  gameID, mService.m_btMsgSink,
+                                                  buffer, addr );
 
-                    result = rslt == ReceiveResult.GAME_GONE ?
+                    result = rslt == XWServiceHelper.ReceiveResult.GAME_GONE ?
                         BTCmd.MESG_GAMEGONE : BTCmd.MESG_ACCPT;
                     break;
                 case MESG_GAMEGONE:
-                    mService.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                    mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                     result = BTCmd.MESG_ACCPT;
                     break;
                 default:
@@ -977,7 +983,7 @@ public class BTService extends XWService {
                             addrs.add( dev );
                         }
                         if ( null != event ) {
-                            postEvent( event, dev.getName() );
+                            mHelper.postEvent( event, dev.getName() );
                         }
                     }
                 } else {
@@ -1010,7 +1016,7 @@ public class BTService extends XWService {
                         } else {
                             gotReply = BTCmd.PONG == reply;
                             if ( gotReply && is.readBoolean() ) {
-                                postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                                mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                             }
                         }
 
@@ -1064,20 +1070,24 @@ public class BTService extends XWService {
                     }
 
                     if ( null == reply ) {
-                        postEvent( MultiEvent.APP_NOT_FOUND_BT, dev.getName() );
+                        mHelper.postEvent( MultiEvent.APP_NOT_FOUND_BT,
+                                           dev.getName() );
                     } else {
                         switch ( reply ) {
                         case BAD_PROTO:
                             sendBadProto( socket );
                             break;
                         case INVITE_ACCPT:
-                            postEvent( MultiEvent.NEWGAME_SUCCESS, elem.m_gameID );
+                            mHelper.postEvent( MultiEvent.NEWGAME_SUCCESS,
+                                               elem.m_gameID );
                             break;
                         case INVITE_DUPID:
-                            postEvent( MultiEvent.NEWGAME_DUP_REJECTED, dev.getName() );
+                            mHelper.postEvent( MultiEvent.NEWGAME_DUP_REJECTED,
+                                               dev.getName() );
                             break;
                         default:
-                            postEvent( MultiEvent.NEWGAME_FAILURE, elem.m_gameID );
+                            mHelper.postEvent( MultiEvent.NEWGAME_FAILURE,
+                                               elem.m_gameID );
                             break;
                         }
                     }
@@ -1160,10 +1170,10 @@ public class BTService extends XWService {
 
             if ( null != evt ) {
                 String btName = nameForAddr( m_adapter, elem.m_btAddr );
-                postEvent( evt, elem.m_gameID, 0, btName );
+                mHelper.postEvent( evt, elem.m_gameID, 0, btName );
                 if ( ! success ) {
                     int failCount = elem.incrFailCount();
-                    postEvent( MultiEvent.MESSAGE_RESEND, btName,
+                    mHelper.postEvent( MultiEvent.MESSAGE_RESEND, btName,
                                 RESEND_TIMEOUT, failCount );
                 }
             }
@@ -1183,7 +1193,7 @@ public class BTService extends XWService {
                         iter.remove();
                     } else if ( elem.failCountExceeded() ) {
                         String btName = nameForAddr( m_adapter, elem.m_btAddr );
-                        postEvent( MultiEvent.MESSAGE_FAILOUT, btName );
+                        mHelper.postEvent( MultiEvent.MESSAGE_FAILOUT, btName );
                         iter.remove();
                     }
                 }
@@ -1241,12 +1251,13 @@ public class BTService extends XWService {
             btNames[ii] = nameForAddr( m_adapter, btAddrs[ii] );
             ++ii;
         }
-        postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
+        mHelper.postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
     }
 
     private void startListener()
     {
-        BTListenerThread.startYourself( this, this );
+        Assert.assertNotNull( mHelper );
+        BTListenerThread.startYourself( this, this, mHelper );
     }
 
     private void startSender()
@@ -1271,28 +1282,12 @@ public class BTService extends XWService {
         m_sender = null;
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        String body = LocUtils.getString( this, R.string.new_bt_body_fmt,
-                                          device );
-
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-
-        postEvent( MultiEvent.BT_GAME_CREATED, rowid );
-    }
-
-    @Override
-    MultiMsgSink getSink( long rowid )
-    {
-        return m_btMsgSink;
-    }
-
     private BTCmd makeOrNotify( NetLaunchInfo nli, String btName,
                                 String btAddr )
     {
         BTCmd result;
-        if ( handleInvitation( nli, btName, DictFetchOwner.OWNER_BT ) ) { // here
+        if ( mHelper.handleInvitation( nli, btName,
+                                       DictFetchOwner.OWNER_BT ) ) {
             result = BTCmd.INVITE_ACCPT;
         } else {
             result = BTCmd.INVITE_DUP_INVITE; // dupe of rematch
@@ -1380,7 +1375,8 @@ public class BTService extends XWService {
 
     private void sendBadProto( BluetoothSocket socket )
     {
-        postEvent( MultiEvent.BAD_PROTO_BT, socket.getRemoteDevice().getName() );
+        mHelper.postEvent( MultiEvent.BAD_PROTO_BT,
+                           socket.getRemoteDevice().getName() );
     }
 
     private void updateStatusOut( boolean success )
@@ -1446,4 +1442,30 @@ public class BTService extends XWService {
             return nSent;
         }
     }
+
+    private class BTServiceHelper extends XWServiceHelper {
+        private Service mService;
+
+        BTServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        MultiMsgSink getSink( long rowid )
+        {
+            return m_btMsgSink;
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            String body = LocUtils.getString( mService, R.string.new_bt_body_fmt,
+                                              device );
+
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+
+            postEvent( MultiEvent.BT_GAME_CREATED, rowid );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 18564462b..0bd011297 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -143,14 +143,14 @@ public class DelegateBase implements DlgClickNotify,
     protected void onResume()
     {
         m_isVisible = true;
-        XWService.setListener( this );
+        XWServiceHelper.setListener( this );
         runIfVisible();
     }
 
     protected void onPause()
     {
         m_isVisible = false;
-        XWService.setListener( null );
+        XWServiceHelper.setListener( null );
     }
 
     protected DelegateBase curThis()
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 4934b75d5..14e8a0b78 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -25,9 +25,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
+import android.support.v4.app.JobIntentService;
 import android.text.TextUtils;
 
-
 import org.eehouse.android.xw4.GameUtils.BackMoveResult;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
@@ -62,7 +62,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class RelayService extends XWService
+public class RelayService extends JobIntentService
     implements NetStateCache.StateChangedIf {
     private static final String TAG = RelayService.class.getSimpleName();
     private static final int MAX_SEND = 1024;
@@ -121,6 +121,7 @@ public class RelayService extends XWService
     private long m_lastGamePacketReceived;
     private int m_nativeFailScore;
     private boolean m_skipUPDSet;
+    private RelayServiceHelper mHelper;
     private static DevIDType s_curType = DevIDType.ID_TYPE_NONE;
     private static long s_regStartTime = 0;
 
@@ -221,20 +222,17 @@ public class RelayService extends XWService
 
     public static void startService( Context context )
     {
-        Log.i( TAG, "startService()" );
         Intent intent = getIntentTo( context, MsgCmds.UDP_CHANGED );
         startService( context, intent );
     }
 
+    // Must use the same lobID for all work enqueued for the same class
+    private final static int sJobID = RelayService.class.hashCode();
+
     private static void startService( Context context, Intent intent )
     {
-        Log.d( TAG, "startService(%s)", intent );
-
-        if ( inForeground() || Build.VERSION.SDK_INT < Build.VERSION_CODES.O ) {
-            context.startService( intent );
-        } else {
-            Log.d( TAG, "startService(); not starting" );
-        }
+        Log.d( TAG, "startService(%s) (calling enqueueWork())", intent );
+        enqueueWork( context, RelayService.class, sJobID, intent );
     }
 
     private static void stopService( Context context )
@@ -308,18 +306,11 @@ public class RelayService extends XWService
     {
         Log.d( TAG, "receiveInvitation: got nli from %d: %s", srcDevID,
                nli.toString() );
-        if ( !handleInvitation( nli, null, DictFetchOwner.OWNER_RELAY ) ) {
+        if ( !mHelper.handleInvitation( nli, null, DictFetchOwner.OWNER_RELAY ) ) {
             Log.d( TAG, "handleInvitation() failed" );
         }
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        String body = LocUtils.getString( this, R.string.new_relay_body );
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-    }
-
     // Exists to get incoming data onto the main thread
     private static void postData( Context context, long rowid, byte[] msg )
     {
@@ -364,16 +355,12 @@ public class RelayService extends XWService
         return intent;
     }
 
-    @Override
-    protected MultiMsgSink getSink( long rowid )
-    {
-        return new RelayMsgSink().setRowID( rowid );
-    }
-
     @Override
     public void onCreate()
     {
+        Log.d( TAG, "onCreate()" );
         super.onCreate();
+        mHelper = new RelayServiceHelper( this );
         m_lastGamePacketReceived =
             XWPrefs.getPrefsLong( this, R.string.key_last_packet,
                                   Utils.getCurSeconds() );
@@ -398,6 +385,8 @@ public class RelayService extends XWService
     @Override
     public int onStartCommand( Intent intent, int flags, int startId )
     {
+        Log.d( TAG, "onStartCommand(%s)", intent );
+        super.onStartCommand( intent, flags, startId );
         Integer result = handleCommand( intent );
 
         if ( null == result ) {
@@ -409,6 +398,13 @@ public class RelayService extends XWService
         return result;
     }
 
+    @Override
+    public void onHandleWork( Intent intent )
+    {
+        Log.d( TAG, "onHandleWork(%s)", intent );
+        /*void*/ handleCommand( intent );
+    }
+
     @Override
     public void onDestroy()
     {
@@ -436,7 +432,7 @@ public class RelayService extends XWService
             cmd = null;
         }
         if ( null != cmd ) {
-            // Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
+            Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
             case PROCESS_GAME_MSGS:
                 String[] relayIDs = new String[1];
@@ -483,7 +479,7 @@ public class RelayService extends XWService
                     String relayID = intent.getStringExtra( RELAY_ID );
                     sendNoConnMessage( rowid, relayID, msg );
                 } else {
-                    receiveMessage( this, rowid, null, msg, s_addr );
+                    mHelper.receiveMessage( this, rowid, null, msg, s_addr );
                 }
                 break;
             case INVITE:
@@ -621,8 +617,6 @@ public class RelayService extends XWService
 
     private void stopUDPThreadsIf()
     {
-        DbgUtils.assertOnUIThread();
-
         UDPThreads threads = m_UDPThreadsRef.getAndSet( null );
         if ( null != threads ) {
             threads.stop();
@@ -648,7 +642,7 @@ public class RelayService extends XWService
                     Log.i( TAG, "relay unvailable for another %d seconds",
                            unavail );
                     String str = getVLIString( dis );
-                    postEvent( MultiEvent.RELAY_ALERT, str );
+                    mHelper.postEvent( MultiEvent.RELAY_ALERT, str );
                     break;
                 case XWPDEV_ALERT:
                     str = getVLIString( dis );
@@ -999,7 +993,7 @@ public class RelayService extends XWService
                     long rowid = rowIDs[ii];
                     sink.setRowID( rowid );
                     for ( byte[] msg : forOne ) {
-                        receiveMessage( this, rowid, sink, msg, s_addr );
+                        mHelper.receiveMessage( this, rowid, sink, msg, s_addr );
                     }
                 }
             }
@@ -1728,6 +1722,28 @@ public class RelayService extends XWService
         }
     }
 
+    private class RelayServiceHelper extends XWServiceHelper {
+
+        private Service mService;
+        RelayServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        protected MultiMsgSink getSink( long rowid )
+        {
+            return new RelayMsgSink().setRowID( rowid );
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            String body = LocUtils.getString( mService, R.string.new_relay_body );
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+        }
+    }
+
     // Exits only to exist, so instanceof can distinguish
     private class EOQPacketData extends PacketData {}
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index eba26c22c..74500b81d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -86,6 +86,7 @@ public class SMSService extends XWService {
     private BroadcastReceiver m_sentReceiver;
     private BroadcastReceiver m_receiveReceiver;
     private OnSharedPreferenceChangeListener m_prefsListener;
+    private SMSServiceHelper mHelper;
 
     private int m_nReceived = 0;
     private static int s_nSent = 0;
@@ -277,15 +278,10 @@ public class SMSService extends XWService {
         return s_showToasts;
     }
 
-    @Override
-    protected MultiMsgSink getSink( long rowid )
-    {
-        return new SMSMsgSink( this );
-    }
-
     @Override
     public void onCreate()
     {
+        mHelper = new SMSServiceHelper( this );
         if ( Utils.deviceSupportsSMS( this ) ) {
             registerReceivers();
         } else {
@@ -469,10 +465,10 @@ public class SMSService extends XWService {
             }
             break;
         case DEATH:
-            postEvent( MultiEvent.MESSAGE_NOGAME, msg.gameID );
+            mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, msg.gameID );
             break;
         case ACK_INVITE:
-            postEvent( MultiEvent.NEWGAME_SUCCESS, msg.gameID );
+            mHelper.postEvent( MultiEvent.NEWGAME_SUCCESS, msg.gameID );
             break;
         default:
             Log.w( TAG, "unexpected cmd %s", msg.cmd );
@@ -489,26 +485,17 @@ public class SMSService extends XWService {
             for ( SMSProtoMsg msg : msgs ) {
                 receive( msg, senderPhone );
             }
-            postEvent( MultiEvent.SMS_RECEIVE_OK );
+            mHelper.postEvent( MultiEvent.SMS_RECEIVE_OK );
         } else {
             Log.d( TAG, "receiveBuffer(): bogus or incomplete message from %s",
                    senderPhone );
         }
     }
 
-    @Override
-    protected void postNotification( String phone, int gameID, long rowid )
-    {
-        String owner = Utils.phoneToContact( this, phone, true );
-        String body = LocUtils.getString( this, R.string.new_name_body_fmt,
-                                          owner );
-        GameUtils.postInvitedNotification( this, gameID, body, rowid );
-    }
-
     private void makeForInvite( String phone, NetLaunchInfo nli )
     {
         if ( nli != null ) {
-            handleInvitation( nli, phone, DictFetchOwner.OWNER_SMS );
+            mHelper.handleInvitation( nli, phone, DictFetchOwner.OWNER_SMS );
             ackInvite( phone, nli.gameID() );
         }
     }
@@ -554,7 +541,7 @@ public class SMSService extends XWService {
                 } catch ( NullPointerException npe ) {
                     Assert.fail();      // shouldn't be trying to do this!!!
                 } catch ( java.lang.SecurityException se ) {
-                    postEvent( MultiEvent.SMS_SEND_FAILED_NOPERMISSION );
+                    mHelper.postEvent( MultiEvent.SMS_SEND_FAILED_NOPERMISSION );
                 } catch ( Exception ee ) {
                     Log.ex( TAG, ee );
                 }
@@ -575,11 +562,12 @@ public class SMSService extends XWService {
 
     private boolean feedMessage( int gameID, byte[] msg, CommsAddrRec addr )
     {
-        ReceiveResult rslt = receiveMessage( this, gameID, null, msg, addr );
-        if ( ReceiveResult.GAME_GONE == rslt ) {
+        XWServiceHelper.ReceiveResult rslt = mHelper
+            .receiveMessage( this, gameID, null, msg, addr );
+        if ( XWServiceHelper.ReceiveResult.GAME_GONE == rslt ) {
             sendDiedPacket( addr.sms_phone, gameID );
         }
-        return rslt == ReceiveResult.OK;
+        return rslt == XWServiceHelper.ReceiveResult.OK;
     }
 
     private void registerReceivers()
@@ -590,15 +578,15 @@ public class SMSService extends XWService {
                 {
                     switch ( getResultCode() ) {
                     case Activity.RESULT_OK:
-                        postEvent( MultiEvent.SMS_SEND_OK );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_OK );
                         break;
                     case SmsManager.RESULT_ERROR_RADIO_OFF:
-                        postEvent( MultiEvent.SMS_SEND_FAILED_NORADIO );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_FAILED_NORADIO );
                         break;
                     case SmsManager.RESULT_ERROR_NO_SERVICE:
                     default:
                         Log.w( TAG, "FAILURE!!!" );
-                        postEvent( MultiEvent.SMS_SEND_FAILED );
+                        mHelper.postEvent( MultiEvent.SMS_SEND_FAILED );
                         break;
                     }
                 }
@@ -655,4 +643,28 @@ public class SMSService extends XWService {
             return sendPacket( addr.sms_phone, gameID, buf );
         }
     }
+
+    private class SMSServiceHelper extends XWServiceHelper {
+        private Service mService;
+
+        SMSServiceHelper( Service service ) {
+            super( service );
+            mService = service;
+        }
+
+        @Override
+        protected MultiMsgSink getSink( long rowid )
+        {
+            return new SMSMsgSink( SMSService.this );
+        }
+
+        @Override
+        protected void postNotification( String phone, int gameID, long rowid )
+        {
+            String owner = Utils.phoneToContact( mService, phone, true );
+            String body = LocUtils.getString( mService, R.string.new_name_body_fmt,
+                                              owner );
+            GameUtils.postInvitedNotification( mService, gameID, body, rowid );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
index 600c03770..432d191b9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirService.java
@@ -124,6 +124,7 @@ public class WiDirService extends XWService {
     private static Set<String> s_peersSet;
 
     private P2pMsgSink m_sink;
+    private WiDirServiceHelper mHelper;
 
     public interface DevSetListener {
         void setChanged( Map<String, String> macToName );
@@ -133,6 +134,7 @@ public class WiDirService extends XWService {
     public void onCreate()
     {
         m_sink = new P2pMsgSink();
+        mHelper = new WiDirServiceHelper(this);
     }
 
     @Override
@@ -751,8 +753,9 @@ public class WiDirService extends XWService {
         CommsAddrRec addr = new CommsAddrRec( CommsConnType.COMMS_CONN_P2P )
             .setP2PParams( macAddress );
 
-        ReceiveResult rslt = receiveMessage( this, gameID, m_sink, data, addr );
-        if ( ReceiveResult.GAME_GONE == rslt ) {
+        XWServiceHelper.ReceiveResult rslt = mHelper
+            .receiveMessage( this, gameID, m_sink, data, addr );
+        if ( XWServiceHelper.ReceiveResult.GAME_GONE == rslt ) {
             sendNoGame( null, macAddress, gameID );
         }
     }
@@ -764,27 +767,15 @@ public class WiDirService extends XWService {
         NetLaunchInfo nli = NetLaunchInfo.makeFrom( this, nliData );
         String returnMac = intent.getStringExtra( KEY_SRC );
 
-        if ( !handleInvitation( nli, returnMac, DictFetchOwner.OWNER_P2P ) ) {
+        if ( !mHelper.handleInvitation( nli, returnMac, DictFetchOwner.OWNER_P2P ) ) {
             Log.d( TAG, "handleInvitation() failed" );
         }
     }
 
-    @Override
-    void postNotification( String device, int gameID, long rowid )
-    {
-        Log.e( TAG, "postNotification() doing nothing" );
-    }
-
-    @Override
-    MultiMsgSink getSink( long rowid )
-    {
-        return m_sink;
-    }
-
     private void handleGameGone( Intent intent )
     {
         int gameID = intent.getIntExtra( KEY_GAMEID, 0 );
-        postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+        mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
     }
 
     private void makeGame( NetLaunchInfo nli, String senderMac )
@@ -794,7 +785,7 @@ public class WiDirService extends XWService {
             CommsAddrRec addr = nli.makeAddrRec( this );
             long rowid = GameUtils.makeNewMultiGame( this, nli,
                                                      m_sink,
-                                                     getUtilCtxt() );
+                                                     mHelper.getUtilCtxt() );
             if ( DBUtils.ROWID_NOTFOUND != rowid ) {
                 if ( null != nli.gameName && 0 < nli.gameName.length() ) {
                     DBUtils.setName( this, rowid, nli.gameName );
@@ -1206,4 +1197,23 @@ public class WiDirService extends XWService {
     private class P2pMsgSink extends MultiMsgSink {
         public P2pMsgSink() { super( WiDirService.this ); }
     }
+
+    private class WiDirServiceHelper extends XWServiceHelper {
+
+        WiDirServiceHelper( Service service ) {
+            super( service );
+        }
+
+        @Override
+        MultiMsgSink getSink( long rowid )
+        {
+            return m_sink;
+        }
+
+        @Override
+        void postNotification( String device, int gameID, long rowid )
+        {
+            Log.e( TAG, "postNotification() doing nothing" );
+        }
+    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
index 4e431f2c0..c995ba897 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWService.java
@@ -1,6 +1,6 @@
 /* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
 /*
- * Copyright 2010 - 2012 by Eric House (xwords@eehouse.org).  All
+ * Copyright 2010 - 2018 by Eric House (xwords@eehouse.org).  All
  * rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -21,166 +21,15 @@
 package org.eehouse.android.xw4;
 
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
-
-import org.eehouse.android.xw4.MultiService.DictFetchOwner;
-import org.eehouse.android.xw4.MultiService.MultiEvent;
-import org.eehouse.android.xw4.jni.CommsAddrRec;
-import org.eehouse.android.xw4.jni.JNIThread;
-import org.eehouse.android.xw4.jni.UtilCtxt;
-import org.eehouse.android.xw4.jni.UtilCtxtImpl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-abstract class XWService extends Service {
+class XWService extends Service {
     private static final String TAG = XWService.class.getSimpleName();
-    public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
-
-    protected static MultiService s_srcMgr = null;
-    private static Map<String, Long> s_seen = new HashMap<>();
-
-    private UtilCtxt m_utilCtxt;
 
     @Override
     public IBinder onBind( Intent intent )
     {
         return null;
     }
-
-    public final static void setListener( MultiService.MultiEventListener li )
-    {
-        if ( null == s_srcMgr ) {
-            // DbgUtils.logf( "XWService.setListener: registering %s", li.getClass().getName() );
-            s_srcMgr = new MultiService();
-        }
-        s_srcMgr.setListener( li );
-    }
-
-    protected void postEvent( MultiEvent event, Object ... args )
-    {
-        if ( null != s_srcMgr ) {
-            s_srcMgr.postEvent( event, args );
-        } else {
-            Log.d( TAG, "postEvent(): dropping %s event",
-                   event.toString() );
-        }
-    }
-
-    // Check that we aren't already processing an invitation with this
-    // inviteID.
-    private static final long SEEN_INTERVAL_MS = 1000 * 5;
-    private boolean checkNotDupe( NetLaunchInfo nli )
-    {
-        String inviteID = nli.inviteID();
-        synchronized( s_seen ) {
-            long now = System.currentTimeMillis();
-            Long lastSeen = s_seen.get( inviteID );
-            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
-            if ( !seen ) {
-                s_seen.put( inviteID, now );
-            }
-            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
-            return !seen;
-        }
-    }
-
-    abstract void postNotification( String device, int gameID, long rowid );
-
-    // Return true if able to start game only
-    protected boolean handleInvitation( NetLaunchInfo nli, String device,
-                                        DictFetchOwner dfo )
-    {
-        boolean success = false;
-        long[] rowids = DBUtils.getRowIDsFor( this, nli.gameID() );
-        if ( 0 == rowids.length
-             || ( rowids.length < nli.nPlayersT // will break for two-per-device game
-                  && XWPrefs.getSecondInviteAllowed( this ) ) ) {
-
-            if ( nli.isValid() && checkNotDupe( nli ) ) {
-
-                if ( DictLangCache.haveDict( this, nli.lang, nli.dict ) ) {
-                    long rowid = GameUtils.makeNewMultiGame( this, nli,
-                                                             getSink( 0 ),
-                                                             getUtilCtxt() );
-
-                    if ( null != nli.gameName && 0 < nli.gameName.length() ) {
-                        DBUtils.setName( this, rowid, nli.gameName );
-                    }
-
-                    postNotification( device, nli.gameID(), rowid );
-                    success = true;
-                } else {
-                    Intent intent = MultiService
-                        .makeMissingDictIntent( this, nli, dfo );
-                    MultiService.postMissingDictNotification( this, intent,
-                                                              nli.gameID() );
-                }
-            }
-        }
-        Log.d( TAG, "handleInvitation() => %b", success );
-        return success;
-    }
-
-    protected UtilCtxt getUtilCtxt()
-    {
-        if ( null == m_utilCtxt ) {
-            m_utilCtxt = new UtilCtxtImpl( this );
-        }
-        return m_utilCtxt;
-    }
-
-    // Meant to be overridden
-    abstract MultiMsgSink getSink( long rowid );
-
-    protected ReceiveResult receiveMessage( Context context, int gameID,
-                                            MultiMsgSink sink, byte[] msg,
-                                            CommsAddrRec addr )
-    {
-        ReceiveResult result;
-        long[] rowids = DBUtils.getRowIDsFor( context, gameID );
-        if ( null == rowids || 0 == rowids.length ) {
-            result = ReceiveResult.GAME_GONE;
-        } else {
-            result = ReceiveResult.UNCONSUMED;
-            for ( long rowid : rowids ) {
-                if ( receiveMessage( context, rowid, sink, msg, addr ) ) {
-                    result = ReceiveResult.OK;
-                }
-            }
-        }
-        return result;
-    }
-
-    protected boolean receiveMessage( Context context, long rowid,
-                                      MultiMsgSink sink, byte[] msg,
-                                      CommsAddrRec addr )
-    {
-        boolean allConsumed = true;
-        boolean[] isLocalP = new boolean[1];
-        JNIThread jniThread = JNIThread.getRetained( rowid, false );
-        boolean consumed = false;
-        if ( null != jniThread ) {
-            consumed = true;
-            jniThread.receive( msg, addr ).release();
-        } else {
-            GameUtils.BackMoveResult bmr = new GameUtils.BackMoveResult();
-            if ( null == sink ) {
-                sink = getSink( rowid );
-            }
-            if ( GameUtils.feedMessage( context, rowid, msg, addr,
-                                        sink, bmr, isLocalP ) ) {
-                consumed = true;
-                GameUtils.postMoveNotification( context, rowid, bmr,
-                                                isLocalP[0] );
-            }
-        }
-        if ( allConsumed && !consumed ) {
-            allConsumed = false;
-        }
-        return allConsumed;
-    }
 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
new file mode 100644
index 000000000..e23a85349
--- /dev/null
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -0,0 +1,182 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2010 - 2018 by Eric House (xwords@eehouse.org).  All
+ * rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+
+import org.eehouse.android.xw4.MultiService.DictFetchOwner;
+import org.eehouse.android.xw4.MultiService.MultiEvent;
+import org.eehouse.android.xw4.jni.CommsAddrRec;
+import org.eehouse.android.xw4.jni.JNIThread;
+import org.eehouse.android.xw4.jni.UtilCtxt;
+import org.eehouse.android.xw4.jni.UtilCtxtImpl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+abstract class XWServiceHelper {
+    private static final String TAG = XWServiceHelper.class.getSimpleName();  
+    private Service mService;
+    private static MultiService s_srcMgr = null;
+
+    public static enum ReceiveResult { OK, GAME_GONE, UNCONSUMED };
+
+    XWServiceHelper( Service service )
+    {
+        mService = service;
+    }
+
+    abstract MultiMsgSink getSink( long rowid );
+    abstract void postNotification( String device, int gameID, long rowid );
+
+    protected ReceiveResult receiveMessage( Context context, int gameID,
+                                            MultiMsgSink sink, byte[] msg,
+                                            CommsAddrRec addr )
+    {
+        ReceiveResult result;
+        long[] rowids = DBUtils.getRowIDsFor( context, gameID );
+        if ( null == rowids || 0 == rowids.length ) {
+            result = ReceiveResult.GAME_GONE;
+        } else {
+            result = ReceiveResult.UNCONSUMED;
+            for ( long rowid : rowids ) {
+                if ( receiveMessage( context, rowid, sink, msg, addr ) ) {
+                    result = ReceiveResult.OK;
+                }
+            }
+        }
+        return result;
+    }
+
+    protected boolean receiveMessage( Context context, long rowid,
+                                      MultiMsgSink sink, byte[] msg,
+                                      CommsAddrRec addr )
+    {
+        boolean allConsumed = true;
+        boolean[] isLocalP = new boolean[1];
+        JNIThread jniThread = JNIThread.getRetained( rowid, false );
+        boolean consumed = false;
+        if ( null != jniThread ) {
+            consumed = true;
+            jniThread.receive( msg, addr ).release();
+        } else {
+            GameUtils.BackMoveResult bmr = new GameUtils.BackMoveResult();
+            if ( null == sink ) {
+                sink = getSink( rowid );
+            }
+            if ( GameUtils.feedMessage( context, rowid, msg, addr,
+                                        sink, bmr, isLocalP ) ) {
+                consumed = true;
+                GameUtils.postMoveNotification( context, rowid, bmr,
+                                                isLocalP[0] );
+            }
+        }
+        if ( allConsumed && !consumed ) {
+            allConsumed = false;
+        }
+        return allConsumed;
+    }
+
+    public final static void setListener( MultiService.MultiEventListener li )
+    {
+        if ( null == s_srcMgr ) {
+            // DbgUtils.logf( "XWService.setListener: registering %s",
+            // li.getClass().getName() );
+            s_srcMgr = new MultiService();
+        }
+        s_srcMgr.setListener( li );
+    }
+
+    protected void postEvent( MultiEvent event, Object ... args )
+    {
+        if ( null != s_srcMgr ) {
+            s_srcMgr.postEvent( event, args );
+        } else {
+            Log.d( TAG, "postEvent(): dropping %s event",
+                   event.toString() );
+        }
+    }
+
+    protected boolean handleInvitation( NetLaunchInfo nli, String device,
+                                        DictFetchOwner dfo )
+    {
+        boolean success = false;
+        long[] rowids = DBUtils.getRowIDsFor( mService, nli.gameID() );
+        if ( 0 == rowids.length
+             || ( rowids.length < nli.nPlayersT // will break for two-per-device game
+                  && XWPrefs.getSecondInviteAllowed( mService ) ) ) {
+
+            if ( nli.isValid() && checkNotDupe( nli ) ) {
+
+                if ( DictLangCache.haveDict( mService, nli.lang, nli.dict ) ) {
+                    long rowid = GameUtils.makeNewMultiGame( mService, nli,
+                                                             getSink( 0 ),
+                                                             getUtilCtxt() );
+
+                    if ( null != nli.gameName && 0 < nli.gameName.length() ) {
+                        DBUtils.setName( mService, rowid, nli.gameName );
+                    }
+
+                    postNotification( device, nli.gameID(), rowid );
+                    success = true;
+                } else {
+                    Intent intent = MultiService
+                        .makeMissingDictIntent( mService, nli, dfo );
+                    MultiService.postMissingDictNotification( mService, intent,
+                                                              nli.gameID() );
+                }
+            }
+        }
+        Log.d( TAG, "handleInvitation() => %b", success );
+        return success;
+    }
+
+    private UtilCtxt m_utilCtxt;
+    protected UtilCtxt getUtilCtxt()
+    {
+        if ( null == m_utilCtxt ) {
+            m_utilCtxt = new UtilCtxtImpl( mService );
+        }
+        return m_utilCtxt;
+    }
+    
+    // Check that we aren't already processing an invitation with this
+    // inviteID.
+    private static final long SEEN_INTERVAL_MS = 1000 * 5;
+    private static Map<String, Long> s_seen = new HashMap<>();
+    private boolean checkNotDupe( NetLaunchInfo nli )
+    {
+        String inviteID = nli.inviteID();
+        synchronized( s_seen ) {
+            long now = System.currentTimeMillis();
+            Long lastSeen = s_seen.get( inviteID );
+            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
+            if ( !seen ) {
+                s_seen.put( inviteID, now );
+            }
+            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
+            return !seen;
+        }
+    }
+}

From a2fa841947db3f54e28b5bf133c1877234792ec6 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 9 Dec 2018 17:11:38 -0800
Subject: [PATCH 068/145] new DebugUtils method

---
 .../src/main/java/org/eehouse/android/xw4/DbgUtils.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index e1b6f86c1..67d237f6a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -101,7 +101,12 @@ public class DbgUtils {
 
     public static void assertOnUIThread()
     {
-        Assert.assertTrue( Utils.isOnUIThread() );
+        assertOnUIThread( true );
+    }
+
+    public static void assertOnUIThread( boolean isOnThread )
+    {
+        Assert.assertTrue( isOnThread == Utils.isOnUIThread() );
     }
 
     public static void printStack( String tag, StackTraceElement[] trace )

From fe6996b663946243e23b4902b5ad05a386c8a428 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 9 Dec 2018 18:21:30 -0800
Subject: [PATCH 069/145] decouple networking threads from RelayService

Oreo's creating a new service instance for every single intent passed to
enqueueWork, meaning a brand new set of threads with a new queue, empty
set of messages to be retried, etc. was created every time, and all
attempts to optimize and retry were broken. So: make the threads a
static singleton that are given a Service instance from onCreate() and
told to drop it from onDestroy(). The threads proceed until they need an
instance, then block until one's available. Seems to work on Oreo and an
older Android as well.
---
 .../org/eehouse/android/xw4/RelayService.java | 388 +++++++++++-------
 1 file changed, 250 insertions(+), 138 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 14e8a0b78..cee000858 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -114,13 +114,14 @@ public class RelayService extends JobIntentService
     static { resetBackoffTimer(); }
 
     private Thread m_fetchThread = null; // no longer used
-    private AtomicReference<UDPThreads> m_UDPThreadsRef = new AtomicReference<>();
+    private static final AtomicReference<UDPThreads> sUDPThreadsRef = new AtomicReference<>();
     private Handler m_handler;
+    private UDPThreads mThreads;
     private Runnable m_onInactivity;
     private int m_maxIntervalSeconds = 0;
     private long m_lastGamePacketReceived;
-    private int m_nativeFailScore;
-    private boolean m_skipUPDSet;
+    private static AtomicInteger sNativeFailScore = new AtomicInteger();;
+    private static boolean sSkipUPDSet;
     private RelayServiceHelper mHelper;
     private static DevIDType s_curType = DevIDType.ID_TYPE_NONE;
     private static long s_regStartTime = 0;
@@ -358,7 +359,7 @@ public class RelayService extends JobIntentService
     @Override
     public void onCreate()
     {
-        Log.d( TAG, "onCreate()" );
+        Log.d( TAG, "%s.onCreate()", this );
         super.onCreate();
         mHelper = new RelayServiceHelper( this );
         m_lastGamePacketReceived =
@@ -378,31 +379,20 @@ public class RelayService extends JobIntentService
                     }
                 }
             };
-
-        m_skipUPDSet = XWPrefs.getSkipToWebAPI( this );
-    }
-
-    @Override
-    public int onStartCommand( Intent intent, int flags, int startId )
-    {
-        Log.d( TAG, "onStartCommand(%s)", intent );
-        super.onStartCommand( intent, flags, startId );
-        Integer result = handleCommand( intent );
-
-        if ( null == result ) {
-            result = Service.START_STICKY_COMPATIBILITY;
+        mThreads = startUDPThreadsOnce();
+        if ( null == mThreads ) {
+            stopSelf();
         }
-
-        NetStateCache.register( this, this );
-        resetExitTimer();
-        return result;
+        sSkipUPDSet = XWPrefs.getSkipToWebAPI( this );
     }
 
     @Override
     public void onHandleWork( Intent intent )
     {
         Log.d( TAG, "onHandleWork(%s)", intent );
-        /*void*/ handleCommand( intent );
+        DbgUtils.assertOnUIThread( false );
+        handleCommand( intent );
+        resetExitTimer();
     }
 
     @Override
@@ -412,8 +402,11 @@ public class RelayService extends JobIntentService
             long interval_millis = getMaxIntervalSeconds() * 1000;
             RelayReceiver.setTimer( this, interval_millis );
         }
-        stopThreads();
+        if ( null != mThreads ) {
+            mThreads.unsetService();
+        }
         super.onDestroy();
+        Log.d( TAG, "%s.onDestroy() DONE", this );
     }
 
     // NetStateCache.StateChangedIf interface
@@ -422,9 +415,8 @@ public class RelayService extends JobIntentService
         startService( this ); // bad name: will *stop* threads too
     }
 
-    private Integer handleCommand( Intent intent )
+    private void handleCommand( Intent intent )
     {
-        Integer result = null;
         MsgCmds cmd;
         try {
             cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
@@ -432,7 +424,7 @@ public class RelayService extends JobIntentService
             cmd = null;
         }
         if ( null != cmd ) {
-            Log.d( TAG, "onStartCommand(): cmd=%s", cmd.toString() );
+            Log.d( TAG, "handleCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
             case PROCESS_GAME_MSGS:
                 String[] relayIDs = new String[1];
@@ -470,7 +462,7 @@ public class RelayService extends JobIntentService
             case SEND:
             case RECEIVE:
             case SENDNOCONN:
-                startUDPThreadsIfNot();
+                startUDPThreadsOnce();
                 long rowid = intent.getLongExtra( ROWID, -1 );
                 byte[] msg = intent.getByteArrayExtra( BINBUFFER );
                 if ( MsgCmds.SEND == cmd ) {
@@ -483,7 +475,7 @@ public class RelayService extends JobIntentService
                 }
                 break;
             case INVITE:
-                startUDPThreadsIfNot();
+                startUDPThreadsOnce();
                 srcDevID = intent.getIntExtra( DEV_ID_SRC, 0 );
                 int destDevID = intent.getIntExtra( DEV_ID_DEST, 0 );
                 String relayID = intent.getStringExtra( RELAY_ID );
@@ -505,12 +497,9 @@ public class RelayService extends JobIntentService
                 stopSelf();
                 break;
             default:
-                Assert.fail();
+                Assert.assertFalse( BuildConfig.DEBUG );
             }
-
-            result = Service.START_STICKY;
         }
-        return result;
     }
 
     private void setupNotifications( String[] relayIDs, BackMoveResult[] bmrs,
@@ -553,6 +542,7 @@ public class RelayService extends JobIntentService
     {
         while ( null != m_fetchThread ) {
             Log.w( TAG, "2: m_fetchThread NOT NULL; WHAT TO DO???" );
+            Assert.assertFalse( BuildConfig.DEBUG );
             try {
                 Thread.sleep( 20 );
             } catch( java.lang.InterruptedException ie ) {
@@ -561,24 +551,38 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private void startUDPThreadsIfNot()
+    private UDPThreads startUDPThreadsOnce()
     {
+        UDPThreads threads = null;
         if ( XWApp.UDP_ENABLED && relayEnabled( this ) ) {
-            synchronized ( m_UDPThreadsRef ) {
-                if ( null == m_UDPThreadsRef.get() ) {
-                    UDPThreads threads = new UDPThreads();
-                    m_UDPThreadsRef.set( threads );
+            synchronized ( sUDPThreadsRef ) {
+                threads = sUDPThreadsRef.get();
+                if ( null == threads ) {
+                    threads = new UDPThreads();
+                    sUDPThreadsRef.set( threads );
                     threads.start();
                 }
+                threads.setService( this );
             }
         } else {
-            Log.i( TAG, "startUDPThreadsIfNot(): UDP disabled" );
+            Log.i( TAG, "startUDPThreadsOnce(): UDP disabled" );
         }
-    } // startUDPThreadsIfNot
+        return threads;
+    } // startUDPThreadsOnce
 
-    private boolean skipNativeSend()
+    private void stopUDPThreads()
     {
-        boolean skip = m_nativeFailScore > UDP_FAIL_LIMIT || m_skipUPDSet;
+        synchronized ( sUDPThreadsRef ) {
+            UDPThreads threads = sUDPThreadsRef.getAndSet( null );
+            if ( null != threads ) {
+                threads.stop();
+            }
+        }
+    }
+
+    private static boolean skipNativeSend()
+    {
+        boolean skip = sNativeFailScore.get() > UDP_FAIL_LIMIT || sSkipUPDSet;
         // Log.d( TAG, "skipNativeSend(score=%d)) => %b", m_nativeFailScore, skip );
         return skip;
     }
@@ -615,14 +619,6 @@ public class RelayService extends JobIntentService
         Log.d( TAG, "noteSent(fromUDP=%b): size after: %d", fromUDP, map.size() );
     }
 
-    private void stopUDPThreadsIf()
-    {
-        UDPThreads threads = m_UDPThreadsRef.getAndSet( null );
-        if ( null != threads ) {
-            threads.stop();
-        }
-    }
-
     // MIGHT BE Running on reader thread
     private void gotPacket( byte[] data, boolean skipAck, boolean fromUDP )
     {
@@ -687,7 +683,7 @@ public class RelayService extends JobIntentService
                     break;
                 case XWPDEV_UPGRADE:
                     intent = getIntentTo( this, MsgCmds.UPGRADE );
-                    startService( intent );
+                    startService( this, intent );
                     break;
                 case XWPDEV_GOTINVITE:
                     resetBackoff = true;
@@ -700,7 +696,7 @@ public class RelayService extends JobIntentService
                     String asStr = nli.toString();
                     Log.d( TAG, "got invitation: %s", asStr );
                     intent.putExtra( NLI_DATA, asStr );
-                    startService( intent );
+                    startService( this, intent );
                     break;
                 case XWPDEV_ACK:
                     noteAck( vli2un( dis ), fromUDP );
@@ -932,8 +928,7 @@ public class RelayService extends JobIntentService
 
     private void postPacket( ByteArrayOutputStream bas, XWRelayReg cmd )
     {
-        startUDPThreadsIfNot();
-        UDPThreads threads = m_UDPThreadsRef.get();
+        UDPThreads threads = startUDPThreadsOnce();
         if ( threads != null ) {
             threads.add( new PacketData( bas, cmd ) );
         }
@@ -1001,14 +996,111 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private class UDPThreads {
+    private static class UDPThreads {
         private DatagramSocket m_UDPSocket;
         private LinkedBlockingQueue<PacketData> m_queue =
             new LinkedBlockingQueue<PacketData>();
         private Thread m_UDPReadThread;
         private Thread m_UDPWriteThread;
+        private RelayService[] mServiceHolder = {null};
+        private AtomicInteger mHaveServiceCount = new AtomicInteger();
 
-        UDPThreads() {}
+        // Here's the problem: In the Oreo world, RelayService instances come
+        // and go, typically lasting only long enough to disptach a single
+        // onHandleWork() call. So the UDPThreads instance is now a static
+        // singleton that lasts a really long time, across the lives of
+        // hundreds of RelayService instances. It and its threads, however,
+        // have to make calls on RelayService instances. So I need a way to
+        // block them when there's no instance available AND to block
+        // onDestroy() returning until all references to the current instance
+        // have been forgotten.
+        //
+        // The solution is to set and clear the instance through
+        // [un]setService().  And to wrap the code inside that needs
+        // references in a AutoCloseable that when instantiated blocks when
+        // the instance is null. Thus when setService() is called with a new
+        // instance, all the requests for an instance are unblocked and each
+        // of them increments a counter. When the AutoCloseable's close() is
+        // called, the counter is decremented. unsetService() waits until that
+        // counter is 0 (and so the close() method calls notifyAll() when the
+        // counter's dropped to 0.)
+        //
+        // It works like this: the threads run. When they need a reference to
+        // the current RelayService they block until there's one
+        // available. They're able to get the reference as long as it's
+        // non-null, but once it's null they start to block again. Once the
+        // last that didn't block finishes with its instance unsetService()
+        // returns (and so onDestroy() can as well.) This clears it so the OS
+        // can create another RelayService instance that will eventually get
+        // passed to setService() again.
+
+        private class ServiceWrapper implements AutoCloseable {
+            private final RelayService mService;
+            ServiceWrapper( RelayService service ) { mService = service; }
+
+            RelayService get() { return mService; }
+
+            @Override
+            public void close()
+            {
+                synchronized ( mServiceHolder ) {
+                    int newVal = mHaveServiceCount.decrementAndGet();
+                    Log.d( TAG, "close(): count now %d", newVal );
+                    if ( 0 == newVal ) {
+                        mServiceHolder.notifyAll();
+                    }
+                }
+            }
+        }
+
+        void setService( RelayService service )
+        {
+            synchronized ( mServiceHolder ) {
+                mServiceHolder[0] = service;
+                mServiceHolder.notifyAll();
+            }
+        }
+
+        // When service is cleared, DO NOT RETURN until all threads using the
+        // old value of the service have relinquished it. This is called from
+        // onDestroy(), and once onDestroy() had returned nobody should
+        // reference its RelayService instance again.
+        void unsetService()
+        {
+            Log.d( TAG, "unsetService()" );
+            synchronized ( mServiceHolder ) {
+                mServiceHolder[0] = null;
+                // Now block until the used count drops to 0
+                while ( mHaveServiceCount.get() > 0 ) {
+                    try {
+                        mServiceHolder.wait();
+                    } catch (InterruptedException ie) {
+                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
+                        // Assert.assertFalse( BuildConfig.DEBUG );
+                    }
+                }
+            }
+            Log.d( TAG, "unsetService() DONE" );
+        }
+
+        // called by various threads that need to run
+        private ServiceWrapper acquireWrapper()
+        {
+            synchronized ( mServiceHolder ) {
+                while ( null == mServiceHolder[0] ) {
+                    try {
+                        mServiceHolder.wait();
+                    } catch (InterruptedException ie) {
+                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
+                        // InterruptedException is how we get unblocked!
+                        // Assert.assertFalse( BuildConfig.DEBUG );
+                    }
+                }
+                int newVal = mHaveServiceCount.incrementAndGet();
+                Log.d( TAG, "acquireWrapper(): count now %d", newVal );
+                return new ServiceWrapper( mServiceHolder[0] );
+            }
+        }
 
         void start()
         {
@@ -1025,8 +1117,10 @@ public class RelayService extends JobIntentService
                                 new DatagramPacket( buf, buf.length );
                             try {
                                 m_UDPSocket.receive( packet );
-                                resetExitTimer();
-                                gotPacket( packet );
+                                try (ServiceWrapper wrapper = acquireWrapper() ) {
+                                    wrapper.get().resetExitTimer();
+                                    wrapper.get().gotPacket( packet );
+                                }
                             } catch ( java.io.InterruptedIOException iioe ) {
                                 // DbgUtils.logf( "FYI: udp receive timeout" );
                             } catch( java.io.IOException ioe ) {
@@ -1052,8 +1146,12 @@ public class RelayService extends JobIntentService
         private void connectSocket()
         {
             if ( null == m_UDPSocket ) {
-                int port = XWPrefs.getDefaultRelayPort( RelayService.this );
-                String host = XWPrefs.getDefaultRelayHost( RelayService.this );
+                int port;
+                String host;
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    port = XWPrefs.getDefaultRelayPort( wrapper.get() );
+                    host = XWPrefs.getDefaultRelayHost( wrapper.get() );
+                }
                 try {
                     m_UDPSocket = new DatagramSocket();
                     m_UDPSocket.setSoTimeout(30 * 1000); // timeout so we can log
@@ -1108,7 +1206,9 @@ public class RelayService extends JobIntentService
                             sendViaWeb( dataListWeb );
                             sendViaUDP( dataListUDP );
 
-                            resetExitTimer();
+                            try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                                wrapper.get().resetExitTimer();
+                            }
                             runUDPAckTimer();
 
                             ConnStatusHandler.showSuccessOut();
@@ -1135,47 +1235,52 @@ public class RelayService extends JobIntentService
             Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
             int sentLen = 0;
             if ( packets.size() > 0 ) {
-                HttpURLConnection conn = NetUtils.makeHttpRelayConn( RelayService.this, "post" );
-                if ( null == conn ) {
-                    Log.e( TAG, "sendViaWeb(): null conn for POST" );
-                } else {
-                    try {
-                        JSONArray dataArray = new JSONArray();
-                        for ( PacketData packet : packets ) {
-                            Assert.assertFalse( packet instanceof EOQPacketData );
-                            byte[] datum = packet.assemble();
-                            dataArray.put( Utils.base64Encode(datum) );
-                            sentLen += datum.length;
-                        }
-                        JSONObject params = new JSONObject();
-                        params.put( "data", dataArray );
-
-                        String result = NetUtils.runConn( conn, params );
-                        boolean succeeded = null != result;
-                        if ( succeeded ) {
-                            Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
-                            JSONObject resultObj = new JSONObject( result );
-                            JSONArray resData = resultObj.getJSONArray( "data" );
-                            int nReplies = resData.length();
-                            // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
-
-                            noteSent( packets, false ); // before we process the acks below :-)
-
-                            for ( int ii = 0; ii < nReplies; ++ii ) {
-                                byte[] datum = Utils.base64Decode( resData.getString( ii ) );
-                                // PENDING: skip ack or not
-                                gotPacket( datum, false, false );
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    RelayService service = wrapper.get();
+                    HttpURLConnection conn = NetUtils
+                        .makeHttpRelayConn( service, "post" );
+                    if ( null == conn ) {
+                        Log.e( TAG, "sendViaWeb(): null conn for POST" );
+                    } else {
+                        try {
+                            JSONArray dataArray = new JSONArray();
+                            for ( PacketData packet : packets ) {
+                                Assert.assertFalse( packet instanceof EOQPacketData );
+                                byte[] datum = packet.assemble();
+                                dataArray.put( Utils.base64Encode(datum) );
+                                sentLen += datum.length;
                             }
-                        } else {
-                            Log.e( TAG, "sendViaWeb(): failed result for POST" );
+                            JSONObject params = new JSONObject();
+                            params.put( "data", dataArray );
 
+                            String result = NetUtils.runConn( conn, params );
+                            boolean succeeded = null != result;
+                            if ( succeeded ) {
+                                Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
+                                JSONObject resultObj = new JSONObject( result );
+                                JSONArray resData = resultObj.getJSONArray( "data" );
+                                int nReplies = resData.length();
+                                // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
+
+                                service
+                                    .noteSent( packets, false ); // before we process the acks below :-)
+
+                                for ( int ii = 0; ii < nReplies; ++ii ) {
+                                    byte[] datum = Utils.base64Decode( resData.getString( ii ) );
+                                    // PENDING: skip ack or not
+                                    service.gotPacket( datum, false, false );
+                                }
+                            } else {
+                                Log.e( TAG, "sendViaWeb(): failed result for POST" );
+
+                            }
+
+                            ConnStatusHandler.updateStatus( service, null,
+                                                            CommsConnType.COMMS_CONN_RELAY,
+                                                            succeeded );
+                        } catch ( JSONException ex ) {
+                            Assert.assertFalse( BuildConfig.DEBUG );
                         }
-
-                        ConnStatusHandler.updateStatus( RelayService.this, null,
-                                                        CommsConnType.COMMS_CONN_RELAY,
-                                                        succeeded );
-                    } catch ( JSONException ex ) {
-                        Assert.assertFalse( BuildConfig.DEBUG );
                     }
                 }
             }
@@ -1187,43 +1292,47 @@ public class RelayService extends JobIntentService
             int sentLen = 0;
 
             if ( packets.size() > 0 ) {
-                noteSent( packets, true );
-                for ( PacketData packet : packets ) {
-                    boolean getOut = true;
-                    byte[] data = packet.assemble();
-                    try {
-                        DatagramPacket udpPacket = new DatagramPacket( data, data.length );
-                        m_UDPSocket.send( udpPacket );
+                try ( ServiceWrapper wrapper = acquireWrapper() ) {
+                    RelayService service = wrapper.get();
+                    service.noteSent( packets, true );
+                    for ( PacketData packet : packets ) {
+                        boolean getOut = true;
+                        byte[] data = packet.assemble();
+                        try {
+                            DatagramPacket udpPacket = new DatagramPacket( data, data.length );
+                            m_UDPSocket.send( udpPacket );
 
-                        sentLen += udpPacket.getLength();
-                        // packet.setSentMS( nowMS );
-                        getOut = false;
-                    } catch ( java.net.SocketException se ) {
-                        Log.ex( TAG, se );
-                        Log.i( TAG, "Restarting threads to force new socket" );
-                        ConnStatusHandler.updateStatusOut( RelayService.this, null,
-                                                           CommsConnType.COMMS_CONN_RELAY,
-                                                           true );
+                            sentLen += udpPacket.getLength();
+                            // packet.setSentMS( nowMS );
+                            getOut = false;
+                        } catch ( java.net.SocketException se ) {
+                            Log.ex( TAG, se );
+                            Log.i( TAG, "Restarting threads to force new socket" );
+                            ConnStatusHandler.updateStatusOut( service, null,
+                                                               CommsConnType.COMMS_CONN_RELAY,
+                                                               true );
 
-                        m_handler.post( new Runnable() {
-                                public void run() {
-                                    stopUDPThreadsIf();
-                                }
-                            } );
-                        break;
-                    } catch ( java.io.IOException ioe ) {
-                        Log.ex( TAG, ioe );
-                    } catch ( NullPointerException npe ) {
-                        Log.w( TAG, "network problem; dropping packet" );
-                    }
-                    if ( getOut ) {
-                        break;
+                            service.m_handler.post( new Runnable() {
+                                    public void run() {
+                                        Assert.assertFalse( BuildConfig.DEBUG );
+                                        // stopUDPThreadsIf();
+                                    }
+                                } );
+                            break;
+                        } catch ( java.io.IOException ioe ) {
+                            Log.ex( TAG, ioe );
+                        } catch ( NullPointerException npe ) {
+                            Log.w( TAG, "network problem; dropping packet" );
+                        }
+                        if ( getOut ) {
+                            break;
+                        }
                     }
+
+                    ConnStatusHandler.updateStatus( service, null,
+                                                    CommsConnType.COMMS_CONN_RELAY,
+                                                    sentLen > 0 );
                 }
-
-                ConnStatusHandler.updateStatus( RelayService.this, null,
-                                                CommsConnType.COMMS_CONN_RELAY,
-                                                sentLen > 0 );
             }
 
             return sentLen;
@@ -1256,7 +1365,7 @@ public class RelayService extends JobIntentService
                         forResend.add( packet );
                         if ( packet.m_cmd != XWRelayReg.XWPDEV_ACK ) {
                             foundNonAck = true;
-                            ++m_nativeFailScore;
+                            sNativeFailScore.incrementAndGet();
                         }
                         iter.remove();
                     }
@@ -1433,7 +1542,7 @@ public class RelayService extends JobIntentService
                 // Log.d( TAG, "noteAck(fromUDP=%b): removed for id %d: %s",
                 //        fromUDP, packetID, packet );
                 if ( fromUDP ) {
-                    --m_nativeFailScore;
+                    sNativeFailScore.decrementAndGet();
                 }
             } else {
                 Log.w( TAG, "Weird: got ack %d but never sent", packetID );
@@ -1462,6 +1571,7 @@ public class RelayService extends JobIntentService
     // Called from any thread
     private void resetExitTimer()
     {
+        Log.d( TAG, "resetExitTimer()" );
         m_handler.removeCallbacks( m_onInactivity );
 
         // UDP socket's no good as a return address after several
@@ -1477,10 +1587,11 @@ public class RelayService extends JobIntentService
             stopThreads();
         } else if ( XWApp.UDP_ENABLED ) {
             stopFetchThreadIf();
-            startUDPThreadsIfNot();
+            startUDPThreadsOnce();
             registerWithRelay();
         } else {
-            stopUDPThreadsIf();
+            Assert.assertFalse( BuildConfig.DEBUG );
+            stopUDPThreads();
             startFetchThreadIfNotUDP();
         }
     }
@@ -1489,7 +1600,7 @@ public class RelayService extends JobIntentService
     {
         Log.d( TAG, "stopThreads()" );
         stopFetchThreadIf();
-        stopUDPThreadsIf();
+        stopUDPThreads();
     }
 
     private static void un2vli( int nn, OutputStream os )
@@ -1656,7 +1767,7 @@ public class RelayService extends JobIntentService
         }
     }
 
-    private class PacketData {
+    private static class PacketData {
         public ByteArrayOutputStream m_bas;
         public XWRelayReg m_cmd;
         public byte[] m_header;
@@ -1745,5 +1856,6 @@ public class RelayService extends JobIntentService
     }
 
     // Exits only to exist, so instanceof can distinguish
-    private class EOQPacketData extends PacketData {}
+    // Can this be replaced by a final Object tested with ==?
+    private static class EOQPacketData extends PacketData {}
 }

From 0a4b8549cf5fc86f31399af84d06adb893d3ee1b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 10 Dec 2018 09:45:24 -0800
Subject: [PATCH 070/145] Don't block UI thread until service instances
 released

I thought I had to stop using a service instance before returning from
its onDestroy(), but that made the UI incredibly laggy AND appears not
to be necessary. At least in a bit of testing things still work.
---
 .../org/eehouse/android/xw4/RelayService.java | 257 +++++++-----------
 1 file changed, 94 insertions(+), 163 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index cee000858..8cec60d18 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -1003,88 +1003,28 @@ public class RelayService extends JobIntentService
         private Thread m_UDPReadThread;
         private Thread m_UDPWriteThread;
         private RelayService[] mServiceHolder = {null};
-        private AtomicInteger mHaveServiceCount = new AtomicInteger();
-
-        // Here's the problem: In the Oreo world, RelayService instances come
-        // and go, typically lasting only long enough to disptach a single
-        // onHandleWork() call. So the UDPThreads instance is now a static
-        // singleton that lasts a really long time, across the lives of
-        // hundreds of RelayService instances. It and its threads, however,
-        // have to make calls on RelayService instances. So I need a way to
-        // block them when there's no instance available AND to block
-        // onDestroy() returning until all references to the current instance
-        // have been forgotten.
-        //
-        // The solution is to set and clear the instance through
-        // [un]setService().  And to wrap the code inside that needs
-        // references in a AutoCloseable that when instantiated blocks when
-        // the instance is null. Thus when setService() is called with a new
-        // instance, all the requests for an instance are unblocked and each
-        // of them increments a counter. When the AutoCloseable's close() is
-        // called, the counter is decremented. unsetService() waits until that
-        // counter is 0 (and so the close() method calls notifyAll() when the
-        // counter's dropped to 0.)
-        //
-        // It works like this: the threads run. When they need a reference to
-        // the current RelayService they block until there's one
-        // available. They're able to get the reference as long as it's
-        // non-null, but once it's null they start to block again. Once the
-        // last that didn't block finishes with its instance unsetService()
-        // returns (and so onDestroy() can as well.) This clears it so the OS
-        // can create another RelayService instance that will eventually get
-        // passed to setService() again.
-
-        private class ServiceWrapper implements AutoCloseable {
-            private final RelayService mService;
-            ServiceWrapper( RelayService service ) { mService = service; }
-
-            RelayService get() { return mService; }
-
-            @Override
-            public void close()
-            {
-                synchronized ( mServiceHolder ) {
-                    int newVal = mHaveServiceCount.decrementAndGet();
-                    Log.d( TAG, "close(): count now %d", newVal );
-                    if ( 0 == newVal ) {
-                        mServiceHolder.notifyAll();
-                    }
-                }
-            }
-        }
 
         void setService( RelayService service )
         {
             synchronized ( mServiceHolder ) {
                 mServiceHolder[0] = service;
+                // unblock waiters for non-null Service
                 mServiceHolder.notifyAll();
             }
         }
 
-        // When service is cleared, DO NOT RETURN until all threads using the
-        // old value of the service have relinquished it. This is called from
-        // onDestroy(), and once onDestroy() had returned nobody should
-        // reference its RelayService instance again.
+        // It will be a few milliseconds before all threads using the current
+        // Service instance are done. Blocking the UI thread here until that
+        // happened make for a laggy UI, so I'm going to see if we can
+        // continue to use the instance for a short while after returning.
         void unsetService()
         {
-            Log.d( TAG, "unsetService()" );
             synchronized ( mServiceHolder ) {
                 mServiceHolder[0] = null;
-                // Now block until the used count drops to 0
-                while ( mHaveServiceCount.get() > 0 ) {
-                    try {
-                        mServiceHolder.wait();
-                    } catch (InterruptedException ie) {
-                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
-                        // Assert.assertFalse( BuildConfig.DEBUG );
-                    }
-                }
             }
-            Log.d( TAG, "unsetService() DONE" );
         }
 
-        // called by various threads that need to run
-        private ServiceWrapper acquireWrapper()
+        private RelayService getService()
         {
             synchronized ( mServiceHolder ) {
                 while ( null == mServiceHolder[0] ) {
@@ -1092,13 +1032,10 @@ public class RelayService extends JobIntentService
                         mServiceHolder.wait();
                     } catch (InterruptedException ie) {
                         Log.e( TAG, "wait() threw: %s", ie.getMessage() );
-                        // InterruptedException is how we get unblocked!
                         // Assert.assertFalse( BuildConfig.DEBUG );
                     }
                 }
-                int newVal = mHaveServiceCount.incrementAndGet();
-                Log.d( TAG, "acquireWrapper(): count now %d", newVal );
-                return new ServiceWrapper( mServiceHolder[0] );
+                return mServiceHolder[0];
             }
         }
 
@@ -1117,10 +1054,9 @@ public class RelayService extends JobIntentService
                                 new DatagramPacket( buf, buf.length );
                             try {
                                 m_UDPSocket.receive( packet );
-                                try (ServiceWrapper wrapper = acquireWrapper() ) {
-                                    wrapper.get().resetExitTimer();
-                                    wrapper.get().gotPacket( packet );
-                                }
+                                final RelayService service = getService();
+                                service.resetExitTimer();
+                                service.gotPacket( packet );
                             } catch ( java.io.InterruptedIOException iioe ) {
                                 // DbgUtils.logf( "FYI: udp receive timeout" );
                             } catch( java.io.IOException ioe ) {
@@ -1148,10 +1084,10 @@ public class RelayService extends JobIntentService
             if ( null == m_UDPSocket ) {
                 int port;
                 String host;
-                try ( ServiceWrapper wrapper = acquireWrapper() ) {
-                    port = XWPrefs.getDefaultRelayPort( wrapper.get() );
-                    host = XWPrefs.getDefaultRelayHost( wrapper.get() );
-                }
+                final RelayService service = getService();
+                port = XWPrefs.getDefaultRelayPort( service );
+                host = XWPrefs.getDefaultRelayHost( service );
+
                 try {
                     m_UDPSocket = new DatagramSocket();
                     m_UDPSocket.setSoTimeout(30 * 1000); // timeout so we can log
@@ -1206,9 +1142,8 @@ public class RelayService extends JobIntentService
                             sendViaWeb( dataListWeb );
                             sendViaUDP( dataListUDP );
 
-                            try ( ServiceWrapper wrapper = acquireWrapper() ) {
-                                wrapper.get().resetExitTimer();
-                            }
+                            getService().resetExitTimer();
+
                             runUDPAckTimer();
 
                             ConnStatusHandler.showSuccessOut();
@@ -1235,52 +1170,50 @@ public class RelayService extends JobIntentService
             Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
             int sentLen = 0;
             if ( packets.size() > 0 ) {
-                try ( ServiceWrapper wrapper = acquireWrapper() ) {
-                    RelayService service = wrapper.get();
-                    HttpURLConnection conn = NetUtils
-                        .makeHttpRelayConn( service, "post" );
-                    if ( null == conn ) {
-                        Log.e( TAG, "sendViaWeb(): null conn for POST" );
-                    } else {
-                        try {
-                            JSONArray dataArray = new JSONArray();
-                            for ( PacketData packet : packets ) {
-                                Assert.assertFalse( packet instanceof EOQPacketData );
-                                byte[] datum = packet.assemble();
-                                dataArray.put( Utils.base64Encode(datum) );
-                                sentLen += datum.length;
-                            }
-                            JSONObject params = new JSONObject();
-                            params.put( "data", dataArray );
-
-                            String result = NetUtils.runConn( conn, params );
-                            boolean succeeded = null != result;
-                            if ( succeeded ) {
-                                Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
-                                JSONObject resultObj = new JSONObject( result );
-                                JSONArray resData = resultObj.getJSONArray( "data" );
-                                int nReplies = resData.length();
-                                // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
-
-                                service
-                                    .noteSent( packets, false ); // before we process the acks below :-)
-
-                                for ( int ii = 0; ii < nReplies; ++ii ) {
-                                    byte[] datum = Utils.base64Decode( resData.getString( ii ) );
-                                    // PENDING: skip ack or not
-                                    service.gotPacket( datum, false, false );
-                                }
-                            } else {
-                                Log.e( TAG, "sendViaWeb(): failed result for POST" );
-
-                            }
-
-                            ConnStatusHandler.updateStatus( service, null,
-                                                            CommsConnType.COMMS_CONN_RELAY,
-                                                            succeeded );
-                        } catch ( JSONException ex ) {
-                            Assert.assertFalse( BuildConfig.DEBUG );
+                final RelayService service = getService();
+                HttpURLConnection conn = NetUtils
+                    .makeHttpRelayConn( service, "post" );
+                if ( null == conn ) {
+                    Log.e( TAG, "sendViaWeb(): null conn for POST" );
+                } else {
+                    try {
+                        JSONArray dataArray = new JSONArray();
+                        for ( PacketData packet : packets ) {
+                            Assert.assertFalse( packet instanceof EOQPacketData );
+                            byte[] datum = packet.assemble();
+                            dataArray.put( Utils.base64Encode(datum) );
+                            sentLen += datum.length;
                         }
+                        JSONObject params = new JSONObject();
+                        params.put( "data", dataArray );
+
+                        String result = NetUtils.runConn( conn, params );
+                        boolean succeeded = null != result;
+                        if ( succeeded ) {
+                            Log.d( TAG, "sendViaWeb(): POST(%s) => %s", params, result );
+                            JSONObject resultObj = new JSONObject( result );
+                            JSONArray resData = resultObj.getJSONArray( "data" );
+                            int nReplies = resData.length();
+                            // Log.d( TAG, "sendViaWeb(): got %d replies", nReplies );
+
+                            service
+                                .noteSent( packets, false ); // before we process the acks below :-)
+
+                            for ( int ii = 0; ii < nReplies; ++ii ) {
+                                byte[] datum = Utils.base64Decode( resData.getString( ii ) );
+                                // PENDING: skip ack or not
+                                service.gotPacket( datum, false, false );
+                            }
+                        } else {
+                            Log.e( TAG, "sendViaWeb(): failed result for POST" );
+
+                        }
+
+                        ConnStatusHandler.updateStatus( service, null,
+                                                        CommsConnType.COMMS_CONN_RELAY,
+                                                        succeeded );
+                    } catch ( JSONException ex ) {
+                        Assert.assertFalse( BuildConfig.DEBUG );
                     }
                 }
             }
@@ -1292,47 +1225,45 @@ public class RelayService extends JobIntentService
             int sentLen = 0;
 
             if ( packets.size() > 0 ) {
-                try ( ServiceWrapper wrapper = acquireWrapper() ) {
-                    RelayService service = wrapper.get();
-                    service.noteSent( packets, true );
-                    for ( PacketData packet : packets ) {
-                        boolean getOut = true;
-                        byte[] data = packet.assemble();
-                        try {
-                            DatagramPacket udpPacket = new DatagramPacket( data, data.length );
-                            m_UDPSocket.send( udpPacket );
+                final RelayService service = getService();
+                service.noteSent( packets, true );
+                for ( PacketData packet : packets ) {
+                    boolean getOut = true;
+                    byte[] data = packet.assemble();
+                    try {
+                        DatagramPacket udpPacket = new DatagramPacket( data, data.length );
+                        m_UDPSocket.send( udpPacket );
 
-                            sentLen += udpPacket.getLength();
-                            // packet.setSentMS( nowMS );
-                            getOut = false;
-                        } catch ( java.net.SocketException se ) {
-                            Log.ex( TAG, se );
-                            Log.i( TAG, "Restarting threads to force new socket" );
-                            ConnStatusHandler.updateStatusOut( service, null,
-                                                               CommsConnType.COMMS_CONN_RELAY,
-                                                               true );
+                        sentLen += udpPacket.getLength();
+                        // packet.setSentMS( nowMS );
+                        getOut = false;
+                    } catch ( java.net.SocketException se ) {
+                        Log.ex( TAG, se );
+                        Log.i( TAG, "Restarting threads to force new socket" );
+                        ConnStatusHandler.updateStatusOut( service, null,
+                                                           CommsConnType.COMMS_CONN_RELAY,
+                                                           true );
 
-                            service.m_handler.post( new Runnable() {
-                                    public void run() {
-                                        Assert.assertFalse( BuildConfig.DEBUG );
-                                        // stopUDPThreadsIf();
-                                    }
-                                } );
-                            break;
-                        } catch ( java.io.IOException ioe ) {
-                            Log.ex( TAG, ioe );
-                        } catch ( NullPointerException npe ) {
-                            Log.w( TAG, "network problem; dropping packet" );
-                        }
-                        if ( getOut ) {
-                            break;
-                        }
+                        service.m_handler.post( new Runnable() {
+                                public void run() {
+                                    Assert.assertFalse( BuildConfig.DEBUG );
+                                    // stopUDPThreadsIf();
+                                }
+                            } );
+                        break;
+                    } catch ( java.io.IOException ioe ) {
+                        Log.ex( TAG, ioe );
+                    } catch ( NullPointerException npe ) {
+                        Log.w( TAG, "network problem; dropping packet" );
+                    }
+                    if ( getOut ) {
+                        break;
                     }
-
-                    ConnStatusHandler.updateStatus( service, null,
-                                                    CommsConnType.COMMS_CONN_RELAY,
-                                                    sentLen > 0 );
                 }
+
+                ConnStatusHandler.updateStatus( service, null,
+                                                CommsConnType.COMMS_CONN_RELAY,
+                                                sentLen > 0 );
             }
 
             return sentLen;

From e797a28a6d4ba3fbbe10e64937ad3b4d5c60335c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 10 Dec 2018 10:14:17 -0800
Subject: [PATCH 071/145] cleanup: use marker instance rather than instanceof

---
 .../java/org/eehouse/android/xw4/RelayService.java    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 8cec60d18..9cdd7f55e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -104,6 +104,7 @@ public class RelayService extends JobIntentService
 
     private static List<PacketData> s_packetsSentUDP = new ArrayList<>();
     private static List<PacketData> s_packetsSentWeb = new ArrayList<>();
+    private static final PacketData sEOQPacket = new PacketData();
     private static AtomicInteger s_nextPacketID = new AtomicInteger();
     private static boolean s_gcmWorking = false;
     private static boolean s_registered = false;
@@ -1071,7 +1072,7 @@ public class RelayService extends JobIntentService
 
         void stop()
         {
-            m_queue.add( new EOQPacketData() ); // will kill the writer thread
+            m_queue.add( sEOQPacket ); // will kill the writer thread
         }
 
         void add( PacketData packet )
@@ -1125,7 +1126,7 @@ public class RelayService extends JobIntentService
                                 for ( outData = m_queue.poll(ts, TimeUnit.SECONDS);
                                       null != outData;
                                       outData = m_queue.poll() ) {         // doesn't block
-                                    if ( outData instanceof EOQPacketData ) {
+                                    if ( outData == sEOQPacket ) {
                                         gotEOQ = true;
                                         break;
                                     } else if ( skipNativeSend() || outData.getForWeb() ) {
@@ -1179,7 +1180,7 @@ public class RelayService extends JobIntentService
                     try {
                         JSONArray dataArray = new JSONArray();
                         for ( PacketData packet : packets ) {
-                            Assert.assertFalse( packet instanceof EOQPacketData );
+                            Assert.assertFalse( packet == sEOQPacket );
                             byte[] datum = packet.assemble();
                             dataArray.put( Utils.base64Encode(datum) );
                             sentLen += datum.length;
@@ -1785,8 +1786,4 @@ public class RelayService extends JobIntentService
             GameUtils.postInvitedNotification( mService, gameID, body, rowid );
         }
     }
-
-    // Exits only to exist, so instanceof can distinguish
-    // Can this be replaced by a final Object tested with ==?
-    private static class EOQPacketData extends PacketData {}
 }

From ea03c855e4e654303e4cd9900b1f4c50196dc572 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 10 Dec 2018 11:56:40 -0800
Subject: [PATCH 072/145] cleanup: remove logs and unneeded code

pull too much logging and stuff starting service on going into
background. RelayService isn't that type of Service.
---
 .../org/eehouse/android/xw4/RelayService.java | 116 +++++++-----------
 .../java/org/eehouse/android/xw4/XWApp.java   |   2 -
 2 files changed, 46 insertions(+), 72 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 9cdd7f55e..f019f936f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -76,8 +76,6 @@ public class RelayService extends JobIntentService
 
     private static final String CMD_STR = "CMD";
 
-    private static Boolean sInForeground;
-
     private static enum MsgCmds { INVALID,
                                   PROCESS_GAME_MSGS,
                                   PROCESS_DEV_MSGS,
@@ -192,55 +190,36 @@ public class RelayService extends JobIntentService
         enabledChanged( context );
     }
 
-    private static boolean inForeground()
-    {
-        boolean result = sInForeground != null && sInForeground;
-        Log.d( TAG, "inForeground() => %b", result );
-        return result;
-    }
-
-    private static void onAppStateChange( Context context, boolean inForeground )
-    {
-        Log.d( TAG, "onAppStateChange(inForeground=%b)", inForeground );
-        if ( null == sInForeground || inForeground() != inForeground ) {
-            sInForeground = inForeground;
-            // Intent intent =
-            //     getIntentTo( context,
-            //                  inForeground ? BTAction.START_FOREGROUND
-            //                  : BTAction.START_BACKGROUND );
-            // startService( context, intent );
-        }
-    }
-
-    static void onAppToForeground( Context context )
-    {
-        onAppStateChange( context, true );
-    }
-
-    static void onAppToBackground( Context context )
-    {
-        onAppStateChange( context, false );
-    }
-
     public static void startService( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.UDP_CHANGED );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     // Must use the same lobID for all work enqueued for the same class
     private final static int sJobID = RelayService.class.hashCode();
 
-    private static void startService( Context context, Intent intent )
+    private static void enqueueWork( Context context, Intent intent )
     {
-        Log.d( TAG, "startService(%s) (calling enqueueWork())", intent );
+        Log.d( TAG, "calling enqueueWork(cmd=%s)", cmdFrom( intent ) );
         enqueueWork( context, RelayService.class, sJobID, intent );
     }
 
+    private static MsgCmds cmdFrom( Intent intent )
+    {
+        MsgCmds cmd;
+        try {
+            cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
+        } catch (Exception ex) { // OOB most likely
+            cmd = null;
+        }
+        return cmd;
+    }
+
     private static void stopService( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.STOP );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     public static void inviteRemote( Context context, int destDevID,
@@ -248,7 +227,7 @@ public class RelayService extends JobIntentService
     {
         int myDevID = DevID.getRelayDevIDInt( context );
         if ( 0 != myDevID ) {
-            startService( context, getIntentTo( context, MsgCmds.INVITE )
+            enqueueWork( context, getIntentTo( context, MsgCmds.INVITE )
                                   .putExtra( DEV_ID_SRC, myDevID )
                                   .putExtra( DEV_ID_DEST, destDevID )
                                   .putExtra( RELAY_ID, relayID )
@@ -259,13 +238,13 @@ public class RelayService extends JobIntentService
     public static void reset( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.RESET );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     public static void timerFired( Context context )
     {
         Intent intent = getIntentTo( context, MsgCmds.TIMER_FIRED );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     public static int sendPacket( Context context, long rowid, byte[] msg )
@@ -276,7 +255,7 @@ public class RelayService extends JobIntentService
             Intent intent = getIntentTo( context, MsgCmds.SEND )
                 .putExtra( ROWID, rowid )
                 .putExtra( BINBUFFER, msg );
-            startService( context, intent );
+            enqueueWork( context, intent );
             result = msg.length;
         } else {
             Log.w( TAG, "sendPacket: network down" );
@@ -293,7 +272,7 @@ public class RelayService extends JobIntentService
                 .putExtra( ROWID, rowid )
                 .putExtra( RELAY_ID, relayID )
                 .putExtra( BINBUFFER, msg );
-            startService( context, intent );
+            enqueueWork( context, intent );
             result = msg.length;
         }
         return result;
@@ -322,7 +301,7 @@ public class RelayService extends JobIntentService
             Intent intent = getIntentTo( context, MsgCmds.RECEIVE )
                 .putExtra( ROWID, rowid )
                 .putExtra( BINBUFFER, msg );
-            startService( context, intent );
+            enqueueWork( context, intent );
         } else {
             Log.w( TAG, "postData(): Dropping message for rowid %d:"
                    + " not on device", rowid );
@@ -340,20 +319,20 @@ public class RelayService extends JobIntentService
         Intent intent = getIntentTo( context, MsgCmds.PROCESS_GAME_MSGS )
             .putExtra( MSGS_ARR, msgs64 )
             .putExtra( RELAY_ID, relayId );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     public static void processDevMsgs( Context context, String[] msgs64 )
     {
         Intent intent = getIntentTo( context, MsgCmds.PROCESS_DEV_MSGS )
             .putExtra( MSGS_ARR, msgs64 );
-        startService( context, intent );
+        enqueueWork( context, intent );
     }
 
     private static Intent getIntentTo( Context context, MsgCmds cmd )
     {
-        Intent intent = new Intent( context, RelayService.class );
-        intent.putExtra( CMD_STR, cmd.ordinal() );
+        Intent intent = new Intent( context, RelayService.class )
+            .putExtra( CMD_STR, cmd.ordinal() );
         return intent;
     }
 
@@ -370,7 +349,7 @@ public class RelayService extends JobIntentService
         m_handler = new Handler();
         m_onInactivity = new Runnable() {
                 public void run() {
-                    Log.d( TAG, "m_onInactivity fired" );
+                    // Log.d( TAG, "m_onInactivity fired" );
                     if ( !shouldMaintainConnection() ) {
                         NetStateCache.unregister( RelayService.this,
                                                   RelayService.this );
@@ -390,8 +369,8 @@ public class RelayService extends JobIntentService
     @Override
     public void onHandleWork( Intent intent )
     {
-        Log.d( TAG, "onHandleWork(%s)", intent );
         DbgUtils.assertOnUIThread( false );
+        Log.d( TAG, "%s.onHandleWork(cmd=%s)", this, cmdFrom( intent ) );
         handleCommand( intent );
         resetExitTimer();
     }
@@ -418,12 +397,7 @@ public class RelayService extends JobIntentService
 
     private void handleCommand( Intent intent )
     {
-        MsgCmds cmd;
-        try {
-            cmd = MsgCmds.values()[intent.getIntExtra( CMD_STR, -1 )];
-        } catch (Exception ex) { // OOB most likely
-            cmd = null;
-        }
+        MsgCmds cmd = cmdFrom( intent );
         if ( null != cmd ) {
             Log.d( TAG, "handleCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
@@ -595,8 +569,8 @@ public class RelayService extends JobIntentService
     
     private void noteSent( PacketData packet, boolean fromUDP )
     {
-        Log.d( TAG, "Sent (fromUDP=%b) packet: cmd=%s, id=%d",
-               fromUDP, packet.m_cmd.toString(), packet.m_packetID );
+        // Log.d( TAG, "Sent (fromUDP=%b) packet: cmd=%s, id=%d",
+        //        fromUDP, packet.m_cmd.toString(), packet.m_packetID );
         if ( fromUDP || packet.m_cmd != XWRelayReg.XWPDEV_ACK ) {
             List<PacketData> list = fromUDP ? s_packetsSentUDP : s_packetsSentWeb;
             synchronized( list ) {
@@ -609,15 +583,15 @@ public class RelayService extends JobIntentService
     {
         long nowMS = System.currentTimeMillis();
         List<PacketData> map = fromUDP ? s_packetsSentUDP : s_packetsSentWeb;
-        Log.d( TAG, "noteSent(fromUDP=%b): adding %d; size before: %d",
-               fromUDP, packets.size(), map.size() );
+        // Log.d( TAG, "noteSent(fromUDP=%b): adding %d; size before: %d",
+        //        fromUDP, packets.size(), map.size() );
         for ( PacketData packet : packets ) {
             if ( fromUDP ) {
                 packet.setSentMS( nowMS );
             }
             noteSent( packet, fromUDP );
         }
-        Log.d( TAG, "noteSent(fromUDP=%b): size after: %d", fromUDP, map.size() );
+        // Log.d( TAG, "noteSent(fromUDP=%b): size after: %d", fromUDP, map.size() );
     }
 
     // MIGHT BE Running on reader thread
@@ -684,20 +658,20 @@ public class RelayService extends JobIntentService
                     break;
                 case XWPDEV_UPGRADE:
                     intent = getIntentTo( this, MsgCmds.UPGRADE );
-                    startService( this, intent );
+                    enqueueWork( this, intent );
                     break;
                 case XWPDEV_GOTINVITE:
                     resetBackoff = true;
-                    intent = getIntentTo( this, MsgCmds.GOT_INVITE );
                     int srcDevID = dis.readInt();
                     byte[] nliData = new byte[dis.readShort()];
                     dis.readFully( nliData );
                     NetLaunchInfo nli = XwJNI.nliFromStream( nliData );
-                    intent.putExtra( INVITE_FROM, srcDevID );
                     String asStr = nli.toString();
                     Log.d( TAG, "got invitation: %s", asStr );
-                    intent.putExtra( NLI_DATA, asStr );
-                    startService( this, intent );
+                    intent = getIntentTo( this, MsgCmds.GOT_INVITE )
+                        .putExtra( INVITE_FROM, srcDevID )
+                        .putExtra( NLI_DATA, asStr );
+                    enqueueWork( this, intent );
                     break;
                 case XWPDEV_ACK:
                     noteAck( vli2un( dis ), fromUDP );
@@ -1168,9 +1142,10 @@ public class RelayService extends JobIntentService
 
         private int sendViaWeb( List<PacketData> packets )
         {
-            Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
             int sentLen = 0;
             if ( packets.size() > 0 ) {
+                Log.d( TAG, "sendViaWeb(): sending %d at once", packets.size() );
+
                 final RelayService service = getService();
                 HttpURLConnection conn = NetUtils
                     .makeHttpRelayConn( service, "post" );
@@ -1480,7 +1455,7 @@ public class RelayService extends JobIntentService
                 Log.w( TAG, "Weird: got ack %d but never sent", packetID );
             }
 
-            if ( BuildConfig.DEBUG ) {
+            if ( false && BuildConfig.DEBUG ) {
                 ArrayList<String> pstrs = new ArrayList<>();
                 for ( PacketData datum : map ) {
                     if ( 0 != datum.m_packetID ) {
@@ -1503,7 +1478,7 @@ public class RelayService extends JobIntentService
     // Called from any thread
     private void resetExitTimer()
     {
-        Log.d( TAG, "resetExitTimer()" );
+        // Log.d( TAG, "resetExitTimer()" );
         m_handler.removeCallbacks( m_onInactivity );
 
         // UDP socket's no good as a return address after several
@@ -1611,7 +1586,8 @@ public class RelayService extends JobIntentService
             result = figureBackoffSeconds();
         }
 
-        Log.d( TAG, "getMaxIntervalSeconds() => %d", result ); // WFT? went from 40 to 1000
+        // WFT? went from 40 to 1000
+        // Log.d( TAG, "getMaxIntervalSeconds() => %d", result );
         return result;
     }
 
@@ -1753,8 +1729,8 @@ public class RelayService extends JobIntentService
             try {
                 m_packetID = nextPacketID( m_cmd );
                 DataOutputStream out = new DataOutputStream( bas );
-                Log.d( TAG, "makeHeader(): building packet with cmd %s",
-                       m_cmd.toString() );
+                // Log.d( TAG, "makeHeader(): building packet with cmd %s",
+                //        m_cmd.toString() );
                 out.writeByte( XWPDevProto.XWPDEV_PROTO_VERSION_1.ordinal() );
                 un2vli( m_packetID, out );
                 out.writeByte( m_cmd.ordinal() );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
index 253118efd..06890e6fe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWApp.java
@@ -103,11 +103,9 @@ public class XWApp extends Application implements LifecycleObserver {
         switch( event ) {
         case ON_RESUME:
             BTService.onAppToForeground( this );
-            RelayService.onAppToForeground( this );
             break;
         case ON_STOP:
             BTService.onAppToBackground( this );
-            RelayService.onAppToBackground( this );
             break;
         }
     }

From bfad324bb45cf3da042c7923cf8c7a422373f9ef Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 10 Dec 2018 19:17:05 -0800
Subject: [PATCH 073/145] add stop button to notification

And keep the service alive (and the notification present) for 15
minutes.
---
 .../android/app/src/main/AndroidManifest.xml  |  3 +++
 .../org/eehouse/android/xw4/BTReceiver.java   | 12 +++++++++--
 .../org/eehouse/android/xw4/BTService.java    | 20 +++++++++++++++++--
 .../android/xw4/GamesListDelegate.java        |  3 +--
 .../app/src/main/res/values/common_rsrc.xml   |  2 --
 .../app/src/main/res/values/strings.xml       | 13 ++++++------
 6 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index ef8e0f2d7..d50e00959 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -211,6 +211,9 @@
       <intent-filter>
         <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />
       </intent-filter>
+      <intent-filter>
+        <action android:name="org.eehouse.android.ACTION_STOP_BT" />
+      </intent-filter>
     </receiver>
 
     <receiver android:name="SMSReceiver" >
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
index 19b21e6a9..c010b62ad 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTReceiver.java
@@ -29,6 +29,9 @@ import android.content.Intent;
 public class BTReceiver extends BroadcastReceiver {
     private static final String TAG = BTReceiver.class.getSimpleName();
 
+    // This string is also used in AndroidManifest (as a string literal)
+    static final String ACTION_STOP_BT = "org.eehouse.android.ACTION_STOP_BT";
+
     @Override
     public void onReceive( Context context, Intent intent )
     {
@@ -37,9 +40,14 @@ public class BTReceiver extends BroadcastReceiver {
             Log.d( TAG, "BTReceiver.onReceive(action=%s, intent=%s)",
                    action, intent.toString() );
 
-            if ( action.equals( BluetoothDevice.ACTION_ACL_CONNECTED ) ) {
+            switch (action ) {
+            case ACTION_STOP_BT:
+                BTService.stopBackground( context );
+                break;
+            case BluetoothDevice.ACTION_ACL_CONNECTED:
                 BTService.onACLConnected( context );
-            } else if ( action.equals( BluetoothAdapter.ACTION_STATE_CHANGED ) ) {
+                break;
+            case BluetoothAdapter.ACTION_STATE_CHANGED:
                 int newState =
                     intent.getIntExtra( BluetoothAdapter.EXTRA_STATE, -1 );
                 switch ( newState ) {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 4b984958a..db2ecb329 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -80,7 +80,7 @@ public class BTService extends XWService {
     private static final String BOGUS_MARSHMALLOW_ADDR = "02:00:00:00:00:00";
     private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
     // half minute for testing; maybe 15 on ship? Or make it a debug config.
-    private static int DEFAULT_KEEPALIVE_SECONDS = 30;
+    private static int DEFAULT_KEEPALIVE_SECONDS = 15 * 60;
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -91,6 +91,7 @@ public class BTService extends XWService {
     private static final int BT_PROTO = BT_PROTO_JSONS; // change in a release or two
 
     private enum BTAction { _NONE,
+                            CANCEL_SERVICE,
                             START_FOREGROUND,
                             START_BACKGROUND,
                             SCAN,
@@ -265,7 +266,7 @@ public class BTService extends XWService {
             startService( context,
                           getIntentTo( context,
                                        inForeground ? BTAction.START_FOREGROUND
-                                       : BTAction.START_BACKGROUND ) );;
+                                       : BTAction.START_BACKGROUND ) );
         }
     }
 
@@ -299,6 +300,12 @@ public class BTService extends XWService {
         BTListenerThread.startYourself( context );
     }
 
+    public static void stopBackground( Context context )
+    {
+        startService( context,
+                      getIntentTo( context, BTAction.CANCEL_SERVICE ) );
+    }
+
     public static void radioChanged( Context context, boolean cameOn )
     {
         Intent intent = getIntentTo( context, BTAction.RADIO );
@@ -471,6 +478,7 @@ public class BTService extends XWService {
                 BTAction cmd = BTAction.values()[ordinal];
                 Log.i( TAG, "handleCommand; cmd=%s", cmd.toString() );
                 switch( cmd ) {
+                case CANCEL_SERVICE:
                 case START_FOREGROUND:
                     stopForeground( true ); // Kill the notification
                     break;
@@ -563,11 +571,19 @@ public class BTService extends XWService {
                 PendingIntent pendIntent = PendingIntent
                     .getActivity( this, Utils.nextRandomInt(), notifIntent,
                                   PendingIntent.FLAG_ONE_SHOT );
+
+                Intent stopIntent = new Intent(this, BTReceiver.class);
+                stopIntent.setAction( BTReceiver.ACTION_STOP_BT );
+                PendingIntent stopPI =
+                    PendingIntent.getBroadcast(this, 0, stopIntent, 0);
+
                 m_notification =
                     new NotificationCompat.Builder( this, Utils.getChannelId(this) )
                     .setSmallIcon( R.drawable.notify_btservice )
                     .setContentText( getString(R.string.bkng_notify_text) )
                     .setContentIntent( pendIntent )
+                    .addAction( R.drawable.notify_btservice,
+                                getString(R.string.bkng_stop_text), stopPI )
                     .build();
             }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 1079a8afd..54f5d533e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2270,8 +2270,7 @@ public class GamesListDelegate extends ListDelegateBase
     private void tryBackgroundIntent( Intent intent )
     {
         if ( intent.getBooleanExtra( BACKGROUND_EXTRA, false ) ) {
-            makeNotAgainBuilder( R.string.not_again_btservice,
-                                 R.string.key_notagain_btservice )
+            makeOkOnlyBuilder( R.string.btservice_expl )
                 .show();
         }
     }
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index 389e79ddb..ecf62b8ed 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -136,8 +136,6 @@
   <string name="key_invite_multi">key_invite_multi</string>
   <string name="key_na_rematch_two_only">key_notagain_rematch_two_only</string>
   <string name="key_notagain_dfltname">key_notagain_dfltname</string>
-  <string name="key_notagain_btservice">key_notagain_btservice</string>
-
   <string name="key_na_comms_bt">key_na_comms_bt</string>
   <string name="key_na_comms_p2p">key_na_comms_p2p</string>
   <string name="key_na_comms_sms">key_na_comms_sms</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 448076ff7..c7b7660ae 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2030,6 +2030,7 @@
     <string name="summary_enable_p2p">Experimental, uses lots of battery</string>
 
     <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
+    <string name="bkng_stop_text">Stop</string>
 
     <!--  -->
     <string name="confirm_sms_title">Confirm your SMS plan</string>
@@ -2646,13 +2647,11 @@
   player name \"%1$s\". Would you like to personalize with your own
   name before you create this game?</string>
 
-  <string name="not_again_btservice">This notification is present
-  whenever CrossWords is ready to receive Bluetooth messages in the
-  background. This readiness has a slight impact on battery. If you
-  don\'t want to listen in the background disable the \"Enable
-  Background Listener\" preference. CrossWords will still receive
-  Bluetooth moves and invitations while in the foreground, but any
-  sent while it\'s in the background will be lost.</string>
+  <string name="btservice_expl">This notification is present whenever
+  CrossWords is running in the background to accept Bluetooth messages.
+  Because messages come in clusters, it usually runs for
+  about 15 minutes after the last message is received.
+  </string>
 
   <string name="no_invites">This game has sent no invitations</string>
 

From f2322d7e81e725d859e2612b156fbb94696531f6 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 06:57:18 -0800
Subject: [PATCH 074/145] cleanup (no behavior change)

---
 .../org/eehouse/android/xw4/SMSService.java   | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
index 74500b81d..6d23eb189 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSService.java
@@ -182,20 +182,20 @@ public class SMSService extends XWService {
     public static void handleFrom( Context context, byte[] buffer,
                                    String phone )
     {
-        Intent intent = getIntentTo( context, SMSAction.HANDLEDATA );
-        intent.putExtra( BUFFER, buffer );
-        intent.putExtra( PHONE, phone );
+        Intent intent = getIntentTo( context, SMSAction.HANDLEDATA )
+            .putExtra( BUFFER, buffer )
+            .putExtra( PHONE, phone );
         startService( context, intent );
     }
 
     public static void inviteRemote( Context context, String phone,
                                      NetLaunchInfo nli )
     {
-        Intent intent = getIntentTo( context, SMSAction.INVITE );
-        intent.putExtra( PHONE, phone );
         Log.w( TAG, "inviteRemote(%s, '%s')", phone, nli );
         byte[] data = nli.asByteArray();
-        intent.putExtra( GAMEDATA_BA, data );
+        Intent intent = getIntentTo( context, SMSAction.INVITE )
+            .putExtra( PHONE, phone )
+            .putExtra( GAMEDATA_BA, data );
         startService( context, intent );
     }
 
@@ -204,10 +204,10 @@ public class SMSService extends XWService {
     {
         int nSent = -1;
         if ( XWPrefs.getSMSEnabled( context ) ) {
-            Intent intent = getIntentTo( context, SMSAction.SEND );
-            intent.putExtra( PHONE, phone );
-            intent.putExtra( MultiService.GAMEID, gameID );
-            intent.putExtra( BINBUFFER, binmsg );
+            Intent intent = getIntentTo( context, SMSAction.SEND )
+                .putExtra( PHONE, phone )
+                .putExtra( MultiService.GAMEID, gameID )
+                .putExtra( BINBUFFER, binmsg );
             startService( context, intent );
             nSent = binmsg.length;
         } else {
@@ -218,9 +218,9 @@ public class SMSService extends XWService {
 
     public static void gameDied( Context context, int gameID, String phone )
     {
-        Intent intent = getIntentTo( context, SMSAction.REMOVE );
-        intent.putExtra( PHONE, phone );
-        intent.putExtra( MultiService.GAMEID, gameID );
+        Intent intent = getIntentTo( context, SMSAction.REMOVE )
+            .putExtra( PHONE, phone )
+            .putExtra( MultiService.GAMEID, gameID );
         startService( context, intent );
     }
 
@@ -264,8 +264,8 @@ public class SMSService extends XWService {
 
     private static Intent getIntentTo( Context context, SMSAction cmd )
     {
-        Intent intent = new Intent( context, SMSService.class );
-        intent.putExtra( CMD_STR, cmd.ordinal() );
+        Intent intent = new Intent( context, SMSService.class )
+            .putExtra( CMD_STR, cmd.ordinal() );
         return intent;
     }
 

From 4f8f14c83bced78d9309b03aacce2e76f74808af Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 06:57:59 -0800
Subject: [PATCH 075/145] kill thread when wait() fires InterruptedException

Rather than just dropping it and going back to a wait that will likely
last forever. I *think* wait() throwing that exception means the
thread's being killed, in which case the exception should be thrown up
to the containing loop that will then exit.
---
 .../org/eehouse/android/xw4/RelayService.java | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index f019f936f..a5c8b3665 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -999,16 +999,11 @@ public class RelayService extends JobIntentService
             }
         }
 
-        private RelayService getService()
+        private RelayService getService() throws InterruptedException
         {
             synchronized ( mServiceHolder ) {
                 while ( null == mServiceHolder[0] ) {
-                    try {
-                        mServiceHolder.wait();
-                    } catch (InterruptedException ie) {
-                        Log.e( TAG, "wait() threw: %s", ie.getMessage() );
-                        // Assert.assertFalse( BuildConfig.DEBUG );
-                    }
+                    mServiceHolder.wait();
                 }
                 return mServiceHolder[0];
             }
@@ -1018,25 +1013,30 @@ public class RelayService extends JobIntentService
         {
             m_UDPReadThread = new Thread( null, new Runnable() {
                     public void run() {
+                        try {
+                            connectSocket(); // block until this is done
+                            startWriteThread();
 
-                        connectSocket(); // block until this is done
-                        startWriteThread();
-
-                        Log.i( TAG, "read thread running" );
-                        byte[] buf = new byte[1024];
-                        for ( ; ; ) {
-                            DatagramPacket packet =
-                                new DatagramPacket( buf, buf.length );
-                            try {
-                                m_UDPSocket.receive( packet );
-                                final RelayService service = getService();
-                                service.resetExitTimer();
-                                service.gotPacket( packet );
-                            } catch ( java.io.InterruptedIOException iioe ) {
-                                // DbgUtils.logf( "FYI: udp receive timeout" );
-                            } catch( java.io.IOException ioe ) {
-                                break;
+                            Log.i( TAG, "read thread running" );
+                            byte[] buf = new byte[1024];
+                            for ( ; ; ) {
+                                DatagramPacket packet =
+                                    new DatagramPacket( buf, buf.length );
+                                try {
+                                    m_UDPSocket.receive( packet );
+                                    final RelayService service = getService();
+                                    service.resetExitTimer();
+                                    service.gotPacket( packet );
+                                } catch ( java.io.InterruptedIOException iioe ) {
+                                    // DbgUtils.logf( "FYI: udp receive timeout" );
+                                } catch( java.io.IOException ioe ) {
+                                    break;
+                                }
                             }
+
+                        } catch ( InterruptedException ie ) {
+                            Log.d( TAG, "exiting on interrupt: %s",
+                                   ie.getMessage() );
                         }
                         Log.i( TAG, "read thread exiting" );
                     }
@@ -1054,7 +1054,7 @@ public class RelayService extends JobIntentService
             m_queue.add( packet );
         }
 
-        private void connectSocket()
+        private void connectSocket() throws InterruptedException
         {
             if ( null == m_UDPSocket ) {
                 int port;
@@ -1109,19 +1109,19 @@ public class RelayService extends JobIntentService
                                         dataListUDP.add( outData );
                                     }
                                 }
+
+                                sendViaWeb( dataListWeb );
+                                sendViaUDP( dataListUDP );
+
+                                getService().resetExitTimer();
+
+                                runUDPAckTimer();
+
+                                ConnStatusHandler.showSuccessOut();
                             } catch ( InterruptedException ie ) {
                                 Log.w( TAG, "write thread killed" );
                                 break;
                             }
-
-                            sendViaWeb( dataListWeb );
-                            sendViaUDP( dataListUDP );
-
-                            getService().resetExitTimer();
-
-                            runUDPAckTimer();
-
-                            ConnStatusHandler.showSuccessOut();
                         }
 
                         Log.i( TAG, "write thread killing read thread" );
@@ -1140,7 +1140,7 @@ public class RelayService extends JobIntentService
             m_UDPWriteThread.start();
         }
 
-        private int sendViaWeb( List<PacketData> packets )
+        private int sendViaWeb( List<PacketData> packets ) throws InterruptedException
         {
             int sentLen = 0;
             if ( packets.size() > 0 ) {
@@ -1196,7 +1196,7 @@ public class RelayService extends JobIntentService
             return sentLen;
         }
 
-        private int sendViaUDP( List<PacketData> packets )
+        private int sendViaUDP( List<PacketData> packets ) throws InterruptedException
         {
             int sentLen = 0;
 

From 48c06acef5914dae9ee23e92f87ca79c4af07057 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 08:28:07 -0800
Subject: [PATCH 076/145] new debug util method

---
 .../app/src/main/java/org/eehouse/android/xw4/DbgUtils.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index 67d237f6a..96ab11ec7 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -126,6 +126,12 @@ public class DbgUtils {
         }
     }
 
+    public static void printStack( String tag, Exception ex )
+    {
+        String stackTrace = android.util.Log.getStackTraceString(ex);
+        Log.d( tag, stackTrace );
+    }
+
     static String extrasToString( Intent intent )
     {
         Bundle bundle = intent.getExtras();

From 68bb8a12686c2b32b4ac6fd29f617456a097b1e4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 14:38:40 -0800
Subject: [PATCH 077/145] fix bluetooth bootstrapping

Separate processing of sockets from accepting them so that when an ACL
CONN notification is received and we open a socket (but don't yet have a
Service running because the ACL thing is most likely for some other app)
we can set it aside to be processed once we do have a service. Use the
same block-until-non-null thing as in RelayService to keep that thread
free of NPEs.
---
 .../org/eehouse/android/xw4/BTService.java    | 219 +++++++++++-------
 1 file changed, 139 insertions(+), 80 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index db2ecb329..32a12131a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -599,14 +599,13 @@ public class BTService extends XWService {
         private static BTListenerThread[] s_listener = {null};
         private BluetoothServerSocket m_serverSocket;
         private Context mContext;
-        private BTService mService;
-        private BTServiceHelper mHelper;
+        private BTService[] mServiceHolder = { null };
         private volatile Thread mTimerThread;
 
         private BTListenerThread( Context context, BTService service )
         {
             mContext = context;
-            mService = service;
+            mServiceHolder[0] = service;
 
             // Started without a BTService instance? Run for only a little
             // while
@@ -615,8 +614,7 @@ public class BTService extends XWService {
             }
         }
 
-        static void startYourself( Context context, BTService service,
-                                   BTServiceHelper helper )
+        static void startYourself( Context context, BTService service )
         {
             Log.d( TAG, "startYourself(%s, %s)", context, service );
             DbgUtils.assertOnUIThread();
@@ -625,7 +623,7 @@ public class BTService extends XWService {
                     s_listener[0] = new BTListenerThread( context, service );
                     s_listener[0].start();
                 } else if ( null != service ) {
-                    s_listener[0].setService( context, service, helper );
+                    s_listener[0].setService( context, service );
                 }
             }
         }
@@ -633,7 +631,7 @@ public class BTService extends XWService {
         static void startYourself( Context context )
         {
             DbgUtils.assertOnUIThread();
-            startYourself( context, null, null );
+            startYourself( context, null );
         }
 
         static void stopYourself( BTListenerThread self )
@@ -655,16 +653,20 @@ public class BTService extends XWService {
             }
         }
 
-        void setService( Context context, BTService service, BTServiceHelper helper )
+        void setService( Context context, BTService service )
         {
-            if ( null == mService ) {
-                Log.d( TAG, "setService(): we didn't have one before. Do something!!!" );
-                mService = service;
-                mHelper = helper;
-                Assert.assertNotNull( context );
-                mContext = context; // Use Service instead of Receiver (possibly)
-            } else {
-                Assert.assertTrue( service == mService );
+            synchronized ( mServiceHolder ) {
+                if ( null == mServiceHolder[0] ) {
+                    Log.d( TAG, "setService(): setting. notifying all!!!" );
+                    Assert.assertNotNull( context );
+                    mContext = context; // Use Service instead of Receiver (possibly)
+                    mServiceHolder[0] = service;
+                    if ( service != null ) {
+                        mServiceHolder.notifyAll();
+                    }
+                } else {
+                    Assert.assertTrue( service == mServiceHolder[0] );
+                }
             }
         }
 
@@ -672,13 +674,18 @@ public class BTService extends XWService {
         {
             stopKillTimer();
 
-            if (! inForeground() ) {
-                startService( mContext,
-                              getIntentTo( mContext,
-                                           BTAction.START_BACKGROUND ) );
-            } else {
-                // Will be a race condition maybe?
-                Assert.assertFalse( BuildConfig.DEBUG );
+            startService( mContext,
+                          getIntentTo( mContext,
+                                       BTAction.START_BACKGROUND ) );
+        }
+
+        private BTService blockForService() throws InterruptedException
+        {
+            synchronized( mServiceHolder ) {
+                while ( mServiceHolder[0] == null ) {
+                    mServiceHolder.wait();
+                }
+                return mServiceHolder[0];
             }
         }
 
@@ -694,7 +701,7 @@ public class BTService extends XWService {
                             Thread.sleep( 10 * 1000 );
                             stopYourself( BTListenerThread.this );
                         } catch (InterruptedException ie) {
-                            Log.e( TAG, "timer thread interrupted; exiting" );
+                            Log.e( TAG, "kill timer thread exiting; we're live!" );
                         }
                     }
                 } );
@@ -733,40 +740,16 @@ public class BTService extends XWService {
                     BTCmd cmd = BTCmd.values()[inStream.readByte()];
                     Log.d( TAG, "BTListenerThread() got %s", cmd );
                     if ( protoOK( proto, cmd ) ) {
-                        if ( null == mService ) {
-                            Log.d( TAG, "dropping packet; starting service" );
+                        if ( null == mServiceHolder[0] ) {
                             startTheService();
-                        } else {
-                            switch( cmd ) {
-                            case PING:
-                                receivePing( socket );
-                                break;
-                            case INVITE:
-                                receiveInvitation( proto, inStream, socket );
-                                break;
-                            case MESG_SEND:
-                                receiveMessage( cmd, inStream, socket );
-                                break;
-
-                            case MESG_GAMEGONE:
-                                receiveMessage( cmd, inStream, socket );
-                                break;
-
-                            default:
-                                Log.e( TAG, "unexpected msg %s", cmd.toString());
-                                break;
-                            }
-                            mService.updateStatusIn( true );
-                            noteLastUsed( mContext );
                         }
+                        processWhenReady( socket, proto, inStream, cmd );
                     } else {
                         DataOutputStream os =
                             new DataOutputStream( socket.getOutputStream() );
                         os.writeByte( BTCmd.BAD_PROTO.ordinal() );
                         os.flush();
                         socket.close();
-
-                        mService.sendBadProto( socket );
                     }
                 } catch ( IOException ioe ) {
                     Log.w( TAG, "trying again..." );
@@ -787,6 +770,75 @@ public class BTService extends XWService {
             }
         } // run()
 
+        private static class InPacket {
+            BluetoothSocket mSocket;
+            byte mProto;
+            DataInputStream mInStream;
+            BTCmd mCmd;
+
+            InPacket( BluetoothSocket socket, byte proto,
+                      DataInputStream inStream, BTCmd cmd )
+            {
+                mSocket = socket;
+                mProto = proto;
+                mInStream = inStream;
+                mCmd = cmd;
+            }
+        }
+
+        private LinkedBlockingQueue<InPacket> mInQueue = new LinkedBlockingQueue<>();
+
+        private Thread mIgnored;
+        private void processWhenReady( BluetoothSocket socket, byte proto,
+                                       DataInputStream inStream, BTCmd cmd )
+        {
+            if ( mIgnored == null ) {
+                mIgnored = new Thread( new Runnable() {
+                        @Override
+                        public void run() {
+                            for ( ; ; ) {
+                                try {
+                                    InPacket elem = mInQueue.take();
+                                    BTService service = blockForService();
+                                    BTCmd cmd = elem.mCmd; // fired
+                                    switch( cmd ) {
+                                    case PING:
+                                        receivePing( service, elem.mSocket );
+                                        break;
+                                    case INVITE:
+                                        receiveInvitation( service, elem.mProto,
+                                                           elem.mInStream, elem.mSocket );
+                                        break;
+                                    case MESG_SEND:
+                                        receiveMessage( service, cmd, elem.mInStream,
+                                                        elem.mSocket );
+                                        break;
+
+                                    case MESG_GAMEGONE:
+                                        receiveMessage( service, cmd, elem.mInStream,
+                                                        elem.mSocket );
+                                        break;
+
+                                    default:
+                                        Log.e( TAG, "unexpected msg %s", cmd.toString());
+                                        break;
+                                    }
+
+                                    service.updateStatusIn( true );
+                                    noteLastUsed( service );
+                                } catch (IOException | InterruptedException ex) {
+                                    DbgUtils.printStack( TAG, ex );
+                                    break;
+                                }
+                            }
+                        }
+                    } );
+                mIgnored.start();
+            }
+
+            mInQueue.add( new InPacket( socket, proto, inStream, cmd ) );
+        }
+
         public void stopListening()
         {
             if ( null != m_serverSocket ) {
@@ -806,7 +858,7 @@ public class BTService extends XWService {
             return ok;
         }
 
-        private void receivePing( BluetoothSocket socket ) throws IOException
+        private void receivePing( BTService service, BluetoothSocket socket ) throws IOException
         {
             DataInputStream inStream = new DataInputStream( socket.getInputStream() );
             int gameID = inStream.readInt();
@@ -818,11 +870,11 @@ public class BTService extends XWService {
             os.flush();
 
             socket.close();
-            mService.updateStatusOut( true );
+            service.updateStatusOut( true );
         }
 
-        private void receiveInvitation( byte proto, DataInputStream is,
-                                        BluetoothSocket socket )
+        private void receiveInvitation( BTService service, byte proto,
+                                        DataInputStream is, BluetoothSocket socket )
             throws IOException
         {
             BTCmd result;
@@ -838,7 +890,8 @@ public class BTService extends XWService {
             }
 
             BluetoothDevice host = socket.getRemoteDevice();
-            result = mService.makeOrNotify( nli, host.getName(), host.getAddress() );
+            result = service
+                .makeOrNotify( nli, host.getName(), host.getAddress() );
 
             DataOutputStream os = new DataOutputStream( socket.getOutputStream() );
             os.writeByte( result.ordinal() );
@@ -847,7 +900,8 @@ public class BTService extends XWService {
             socket.close();
         } // receiveInvitation
 
-        private void receiveMessage( BTCmd cmd, DataInputStream dis, BluetoothSocket socket )
+        private void receiveMessage( BTService service, BTCmd cmd,
+                                     DataInputStream dis, BluetoothSocket socket )
         {
             try {
                 BTCmd result = null;
@@ -861,15 +915,15 @@ public class BTService extends XWService {
                     CommsAddrRec addr = new CommsAddrRec( host.getName(),
                                                           host.getAddress() );
                     XWServiceHelper.ReceiveResult rslt
-                        = mHelper.receiveMessage( mContext,
-                                                  gameID, mService.m_btMsgSink,
-                                                  buffer, addr );
+                        = service.mHelper.receiveMessage( mContext, gameID,
+                                                          service.m_btMsgSink,
+                                                          buffer, addr );
 
                     result = rslt == XWServiceHelper.ReceiveResult.GAME_GONE ?
                         BTCmd.MESG_GAMEGONE : BTCmd.MESG_ACCPT;
                     break;
                 case MESG_GAMEGONE:
-                    mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                    service.mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
                     result = BTCmd.MESG_ACCPT;
                     break;
                 default:
@@ -1043,11 +1097,12 @@ public class BTService extends XWService {
                     socket.close();
                 }
             } catch ( IOException ioe ) {
-                logIOE( ioe );
+                Log.e( TAG, "sendPing() failure; %s", ioe.getMessage() );
+                DbgUtils.printStack( TAG, ioe );
             }
             updateStatusOut( sendWorking );
             updateStatusIn( receiveWorking );
-            Log.d( TAG, "sendPing(%s) => %b", dev, gotReply );
+            Log.d( TAG, "sendPing(%s) => %b", dev.getName(), gotReply );
             return gotReply;
         } // sendPing
 
@@ -1273,7 +1328,7 @@ public class BTService extends XWService {
     private void startListener()
     {
         Assert.assertNotNull( mHelper );
-        BTListenerThread.startYourself( this, this, mHelper );
+        BTListenerThread.startYourself( this, this );
     }
 
     private void startSender()
@@ -1314,29 +1369,34 @@ public class BTService extends XWService {
     private DataOutputStream connect( BluetoothSocket socket, BTCmd cmd )
     {
         String name = socket.getRemoteDevice().getName();
+        Log.w( TAG, "connect(%s) starting", name );
         // DbgUtils.logf( "connecting to %s to send cmd %s", name, cmd.toString() );
         // Docs say always call cancelDiscovery before trying to connect
         m_adapter.cancelDiscovery();
 
-        DataOutputStream dos;
-        try {
-            for ( int ii = 0; ii < 3; ++ii ) {
-                try {
-                    socket.connect();
+        DataOutputStream dos = null;
+
+        // Try for 8 seconds. Some devices take a long time to get ACL conn
+        // ACTION
+        for ( long end = 10000 + System.currentTimeMillis(); ; ) {
+            try {
+                socket.connect();
+                Log.i( TAG, "connect(%s) succeeded", name );
+                dos = new DataOutputStream( socket.getOutputStream() );
+                dos.writeByte( BT_PROTO );
+                dos.writeByte( cmd.ordinal() );
+                break;          // success!!!
+            } catch (IOException ioe) {
+                if ( System.currentTimeMillis() > end ) {
+                    break;
+                }
+                Log.d( TAG, "connect(%s) trying again", name );
+                try {
+                    Thread.sleep( 1000 );
+                } catch ( InterruptedException ex ) {
                     break;
-                } catch (IOException ioe) {
-                    Thread.sleep( 2000 );
-                    Log.d( TAG, "ioe on connect(); trying again" );
                 }
             }
-            dos = new DataOutputStream( socket.getOutputStream() );
-            dos.writeByte( BT_PROTO );
-            dos.writeByte( cmd.ordinal() );
-            Log.i( TAG, "connect() to %s successful", name );
-        } catch ( IOException | InterruptedException ioe ) {
-            dos = null;
-            Log.w( TAG, "BTService.connect() to %s failed", name );
-            // logIOE( ioe );
         }
         return dos;
     }
@@ -1374,7 +1434,6 @@ public class BTService extends XWService {
                 mHandler.postAtTime( new Runnable() {
                         @Override
                         public void run() {
-                            Log.d( TAG, "timeout timer fired" );
                             setTimeoutTimer();
                         }
                     }, this, dieTimeMillis );

From f7258f29e8e9fd194f2a1ea98ddc608438444734 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 14:40:57 -0800
Subject: [PATCH 078/145] saw a crash, so gather more info if it happens again.

---
 xwords4/android/jni/xwjni.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c
index 408d022f9..11f2ece2a 100644
--- a/xwords4/android/jni/xwjni.c
+++ b/xwords4/android/jni/xwjni.c
@@ -269,15 +269,21 @@ tilesArrayToTileSet( JNIEnv* env, jintArray jtiles, TrayTileSet* tset )
 
 #ifdef GAMEPTR_IS_OBJECT
 static JNIState*
-getState( JNIEnv* env, GamePtrType gamePtr )
+getState( JNIEnv* env, GamePtrType gamePtr, const char* func )
 {
-    XP_ASSERT( NULL != gamePtr );
+#ifdef DEBUG
+    if ( NULL == gamePtr ) {
+        XP_LOGF( "ERROR: getState() called from %s() with null gamePtr",
+                 func );
+    }
+#endif
+    XP_ASSERT( NULL != gamePtr ); /* fired */
     jmethodID mid = getMethodID( env, gamePtr, "ptr", "()I" );
     XP_ASSERT( !!mid );
     return (JNIState*)(*env)->CallIntMethod( env, gamePtr, mid );
 }
 #else
-# define getState( env, gamePtr ) ((JNIState*)(gamePtr))
+# define getState( env, gamePtr, func ) ((JNIState*)(gamePtr))
 #endif
 
 JNIEXPORT jint JNICALL
@@ -891,12 +897,12 @@ struct _JNIState {
     MPSLOT
 };
 
-#define XWJNI_START() {                                 \
-    JNIState* state = getState( env, gamePtr );         \
-    MPSLOT;                                             \
-    MPASSIGN( mpool, state->mpool);                     \
-    XP_ASSERT( !!state->globalJNI );                    \
-    map_thread( &state->globalJNI->ti, env );           \
+#define XWJNI_START() {                                     \
+    JNIState* state = getState( env, gamePtr, __func__ );   \
+    MPSLOT;                                                 \
+    MPASSIGN( mpool, state->mpool);                         \
+    XP_ASSERT( !!state->globalJNI );                        \
+    map_thread( &state->globalJNI->ti, env );               \
 
 #define XWJNI_START_GLOBALS()                           \
     XWJNI_START()                                       \
@@ -990,7 +996,7 @@ Java_org_eehouse_android_xw4_jni_XwJNI_game_1makeNewGame
 JNIEXPORT void JNICALL Java_org_eehouse_android_xw4_jni_XwJNI_game_1dispose
 ( JNIEnv* env, jclass claz, GamePtrType gamePtr )
 {
-    JNIState* state = getState( env, gamePtr );
+    JNIState* state = getState( env, gamePtr, __func__ );
     LOG_FUNC();
 
 #ifdef MEM_DEBUG

From c2f5949623b7c53c38167ca1a81335b1c4859f8a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 11 Dec 2018 15:14:51 -0800
Subject: [PATCH 079/145] use AutoCloseable rather than a hack of my own

---
 .../org/eehouse/android/xw4/BTService.java    | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 32a12131a..10d0048f6 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -1076,22 +1076,20 @@ public class BTService extends XWService {
                     if ( null != os ) {
                         os.writeInt( gameID );
                         os.flush();
-                        Thread killer = killSocketIn( socket, 5 );
-
-                        DataInputStream is =
-                            new DataInputStream( socket.getInputStream() );
-                        BTCmd reply = BTCmd.values()[is.readByte()];
-                        if ( BTCmd.BAD_PROTO == reply ) {
-                            sendBadProto( socket );
-                        } else {
-                            gotReply = BTCmd.PONG == reply;
-                            if ( gotReply && is.readBoolean() ) {
-                                mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                        try ( KillerIn killer = new KillerIn( socket, 5 ) ) {
+                            DataInputStream is =
+                                new DataInputStream( socket.getInputStream() );
+                            BTCmd reply = BTCmd.values()[is.readByte()];
+                            if ( BTCmd.BAD_PROTO == reply ) {
+                                sendBadProto( socket );
+                            } else {
+                                gotReply = BTCmd.PONG == reply;
+                                if ( gotReply && is.readBoolean() ) {
+                                    mHelper.postEvent( MultiEvent.MESSAGE_NOGAME, gameID );
+                                }
                             }
                         }
-
                         receiveWorking = true;
-                        killer.interrupt();
                         sendWorking = true;
                     }
                     socket.close();
@@ -1210,12 +1208,13 @@ public class BTService extends XWService {
                             }
 
                             outStream.flush();
-                            Thread killer = killSocketIn( socket );
 
-                            DataInputStream inStream =
-                                new DataInputStream( socket.getInputStream() );
-                            BTCmd reply = BTCmd.values()[inStream.readByte()];
-                            killer.interrupt();
+                            BTCmd reply;
+                            try ( KillerIn killer = new KillerIn( socket, 10 ) ) {
+                                DataInputStream inStream =
+                                    new DataInputStream( socket.getInputStream() );
+                                reply = BTCmd.values()[inStream.readByte()];
+                            }
                             success = true;
 
                             switch ( reply ) {
@@ -1466,21 +1465,16 @@ public class BTService extends XWService {
             .updateStatusIn( this, null, CommsConnType.COMMS_CONN_BT, success );
     }
 
-    private Thread killSocketIn( final BluetoothSocket socket )
-    {
-        return killSocketIn( socket, 10 );
-    }
-
-    private Thread killSocketIn( final BluetoothSocket socket, int seconds )
-    {
-        final int millis = seconds * 1000;
-        Thread thread = new Thread( new Runnable() {
+    private class KillerIn implements AutoCloseable {
+        private final Thread mThread;
+        KillerIn( final BluetoothSocket socket, final int seconds )
+        {
+            mThread = new Thread( new Runnable() {
                 public void run() {
                     try {
-                        Thread.sleep( millis );
+                        Thread.sleep( 1000 * seconds );
                     } catch ( InterruptedException ie ) {
-                        Log.w( TAG, "killSocketIn: killed by owner" );
-                        return;
+                        Log.w( TAG, "KillerIn: killed by owner" );
                     }
                     try {
                         socket.close();
@@ -1488,9 +1482,15 @@ public class BTService extends XWService {
                         Log.ex( TAG, ioe );
                     }
                 }
-            } );
-        thread.start();
-        return thread;
+                });
+            mThread.start();
+        }
+
+        @Override
+        public void close()
+        {
+            mThread.interrupt();
+        }
     }
 
     private class BTMsgSink extends MultiMsgSink {

From 61dc8e837e1211a7462994e0950fb463e087f214 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 12 Dec 2018 22:21:02 -0800
Subject: [PATCH 080/145] cleanup

---
 .../java/org/eehouse/android/xw4/BTService.java  | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 10d0048f6..f2f72ddf4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -760,14 +760,7 @@ public class BTService extends XWService {
                 }
             }
 
-            if ( null != m_serverSocket ) {
-                try {
-                    m_serverSocket.close();
-                } catch ( IOException ioe ) {
-                    logIOE( ioe );
-                }
-                m_serverSocket = null;
-            }
+            closeServerSocket();
         } // run()
 
         private static class InPacket {
@@ -840,6 +833,12 @@ public class BTService extends XWService {
         }
 
         public void stopListening()
+        {
+            closeServerSocket();
+            interrupt();
+        }
+
+        private synchronized void closeServerSocket()
         {
             if ( null != m_serverSocket ) {
                 try {
@@ -849,7 +848,6 @@ public class BTService extends XWService {
                 }
                 m_serverSocket = null;
             }
-            interrupt();
         }
 
         private boolean protoOK( byte proto, BTCmd cmd )

From 2ab04901a740b845679f67ab224488dcb6252f8c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 12 Dec 2018 22:32:14 -0800
Subject: [PATCH 081/145] scan all paired devices at same time

One thread per device: brute force, but the threads live a few seconds
and the user just triggered the action so should be ok with it.
---
 .../org/eehouse/android/xw4/BTService.java    | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index f2f72ddf4..4c7bb4f0a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -698,7 +698,7 @@ public class BTService extends XWService {
                         try {
                             // Give legitimate caller 10 seconds to retry with
                             // a packet that we'll recognize.
-                            Thread.sleep( 10 * 1000 );
+                            Thread.sleep( 20 * 1000 );
                             stopYourself( BTListenerThread.this );
                         } catch (InterruptedException ie) {
                             Log.e( TAG, "kill timer thread exiting; we're live!" );
@@ -1041,12 +1041,25 @@ public class BTService extends XWService {
         private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs )
         {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
-            // DbgUtils.logf( "ping: got %d paired devices", pairedDevs.size() );
+            Map<BluetoothDevice, PingThread> threads = new HashMap<>();
             for ( BluetoothDevice dev : pairedDevs ) {
                 // Skip things that can't host an Android app
                 int clazz = dev.getBluetoothClass().getMajorDeviceClass();
                 if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
-                    if ( sendPing( dev, 0 ) ) { // did we get a reply?
+                    PingThread thread = new PingThread(dev);
+                    thread.start();
+                    threads.put( dev, thread );
+                } else {
+                    Log.d( TAG, "skipping %s; not an android device!",
+                           dev.getName() );
+                }
+            }
+
+            for ( BluetoothDevice dev : threads.keySet() ) {
+                PingThread thread = threads.get( dev );
+                try {
+                    thread.join();
+                    if ( thread.gotResponse() ) {
                         if ( null != addrs ) {
                             addrs.add( dev );
                         }
@@ -1054,13 +1067,26 @@ public class BTService extends XWService {
                             mHelper.postEvent( event, dev.getName() );
                         }
                     }
-                } else {
-                    Log.d( TAG, "skipping %s; not an android device!",
-                           dev.getName() );
+                } catch ( InterruptedException ex ) {
+                    Assert.assertFalse( BuildConfig.DEBUG );
                 }
             }
         }
 
+        private class PingThread extends Thread {
+            private boolean mGotResponse;
+            private BluetoothDevice mDev;
+
+            PingThread(BluetoothDevice dev) { mDev = dev; }
+
+            @Override
+            public void run() {
+                mGotResponse = sendPing( mDev, 0 );
+            }
+
+            boolean gotResponse() { return mGotResponse; }
+        }
+
         private boolean sendPing( BluetoothDevice dev, int gameID )
         {
             boolean gotReply = false;
@@ -1375,7 +1401,7 @@ public class BTService extends XWService {
 
         // Try for 8 seconds. Some devices take a long time to get ACL conn
         // ACTION
-        for ( long end = 10000 + System.currentTimeMillis(); ; ) {
+        for ( long end = 20000 + System.currentTimeMillis(); ; ) {
             try {
                 socket.connect();
                 Log.i( TAG, "connect(%s) succeeded", name );

From 02897f6e367f5ecb9cb7cb54b87c08d5e22159f4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 14 Dec 2018 16:00:36 -0800
Subject: [PATCH 082/145] use separate channel for background service
 notification

Since on newer OS versions users might want to hide it
---
 .../org/eehouse/android/xw4/BTService.java    |  9 +++---
 .../java/org/eehouse/android/xw4/Utils.java   | 28 ++-----------------
 .../app/src/main/res/values/strings.xml       |  4 +++
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 4c7bb4f0a..f4a35c904 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -577,14 +577,15 @@ public class BTService extends XWService {
                 PendingIntent stopPI =
                     PendingIntent.getBroadcast(this, 0, stopIntent, 0);
 
-                m_notification =
-                    new NotificationCompat.Builder( this, Utils.getChannelId(this) )
+                String channelID = Channels.getChannelID( this, Channels.ID.FOREGROUND );
+                NotificationCompat.Builder builder =
+                    new NotificationCompat.Builder( this, channelID )
                     .setSmallIcon( R.drawable.notify_btservice )
                     .setContentText( getString(R.string.bkng_notify_text) )
                     .setContentIntent( pendIntent )
                     .addAction( R.drawable.notify_btservice,
-                                getString(R.string.bkng_stop_text), stopPI )
-                    .build();
+                                getString(R.string.bkng_stop_text), stopPI );
+                m_notification = builder.build();
             }
 
             Log.d( TAG, "calling service.startForeground()" );
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 848da6f3f..9e6ec2df2 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
@@ -83,8 +83,6 @@ public class Utils {
     private static final String TAG = Utils.class.getSimpleName();
     public static final int TURN_COLOR = 0x7F00FF00;
 
-    private static final String _CHANNEL_ID = BuildConfig.APPLICATION_ID + "_channel_id";
-
     private static final String DB_PATH = "XW_GAMES";
     private static final String HIDDEN_PREFS = "xwprefs_hidden";
     private static final String FIRST_VERSION_KEY = "FIRST_VERSION_KEY";
@@ -258,8 +256,9 @@ public class Utils {
             defaults |= Notification.DEFAULT_VIBRATE;
         }
 
+        String channelID = Channels.getChannelID( context, Channels.ID.GAME_EVENT );
         Notification notification =
-            new NotificationCompat.Builder( context, getChannelId(context) )
+            new NotificationCompat.Builder( context, channelID )
             .setContentIntent( pi )
             .setSmallIcon( R.drawable.notify )
             //.setTicker(body)
@@ -620,27 +619,4 @@ public class Utils {
             }
         }
     }
-
-    private static boolean sChannelMade = false;
-    static String getChannelId( Context context )
-    {
-        if ( !sChannelMade ) {
-            sChannelMade = true;
-            if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
-                NotificationManager notMgr = (NotificationManager)
-                    context.getSystemService( Context.NOTIFICATION_SERVICE );
-
-                String channelDescription = "XWORDS Default Channel";
-                NotificationChannel channel = notMgr.getNotificationChannel( _CHANNEL_ID );
-                if ( channel == null ) {
-                    channel = new NotificationChannel( _CHANNEL_ID, channelDescription,
-                                                       NotificationManager.IMPORTANCE_LOW );
-                    // channel.setLightColor(Color.GREEN);
-                    channel.enableVibration( true );
-                    notMgr.createNotificationChannel( channel );
-                }
-            }
-        }
-        return _CHANNEL_ID;
-    }
 }
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index c7b7660ae..bd57ba9d4 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2727,4 +2727,8 @@
   <string name="perms_rationale_title">Android Permissions</string>
   <string name="toast_no_permission">Permission not granted</string>
 
+  <!-- Explanation in settings for always-on BT notification -->
+  <string name="foreground_channel_expl">Ready-for-bluetooth</string>
+  <!-- Explanation in settings for traditional move-arrived notification -->
+  <string name="gameevent_channel_expl">In-game events</string>
 </resources>

From f7ef1adcb514b10adadc813058b7ca1f15f8c31c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 14 Dec 2018 17:12:15 -0800
Subject: [PATCH 083/145] add settings button to foreground service
 notification

On O and beyond it's possible to tweak notification channels separately,
meaning users can hide the new BT-is-running notification and still get
game event notifications. So add a button that takes you to the right
Settings app page.
---
 .../org/eehouse/android/xw4/BTService.java    | 32 +++++++++++++++----
 .../app/src/main/res/values/strings.xml       |  3 +-
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index f4a35c904..a2d74f2ad 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -34,6 +34,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
@@ -238,7 +239,7 @@ public class BTService extends XWService {
     public static void openBTSettings( Activity activity )
     {
         Intent intent = new Intent();
-        intent.setAction( android.provider.Settings.ACTION_BLUETOOTH_SETTINGS );
+        intent.setAction( Settings.ACTION_BLUETOOTH_SETTINGS );
         activity.startActivity( intent );
     }
 
@@ -572,19 +573,36 @@ public class BTService extends XWService {
                     .getActivity( this, Utils.nextRandomInt(), notifIntent,
                                   PendingIntent.FLAG_ONE_SHOT );
 
-                Intent stopIntent = new Intent(this, BTReceiver.class);
-                stopIntent.setAction( BTReceiver.ACTION_STOP_BT );
-                PendingIntent stopPI =
-                    PendingIntent.getBroadcast(this, 0, stopIntent, 0);
-
                 String channelID = Channels.getChannelID( this, Channels.ID.FOREGROUND );
                 NotificationCompat.Builder builder =
                     new NotificationCompat.Builder( this, channelID )
                     .setSmallIcon( R.drawable.notify_btservice )
                     .setContentText( getString(R.string.bkng_notify_text) )
                     .setContentIntent( pendIntent )
-                    .addAction( R.drawable.notify_btservice,
+                    ;
+
+                // Add button to kill the foreground service
+                Intent stopIntent = new Intent( this, BTReceiver.class );
+                stopIntent.setAction( BTReceiver.ACTION_STOP_BT );
+                PendingIntent stopPI =
+                    PendingIntent.getBroadcast(this, 0, stopIntent, 0);
+                builder.addAction( R.drawable.notify_btservice,
                                 getString(R.string.bkng_stop_text), stopPI );
+
+                // If supported, button to take user to settings (to make
+                // notification less annoying perhaps)
+                if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
+                    Intent hideIntent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+                        .putExtra( Settings.EXTRA_APP_PACKAGE, getPackageName() )
+                        .putExtra( Settings.EXTRA_CHANNEL_ID, channelID )
+                        ;
+                    PendingIntent hidePI =
+                        PendingIntent.getActivity( this, 0, hideIntent, 0 );
+                    builder.addAction( R.drawable.notify_btservice,
+                                       getString(R.string.bkng_settings_text),
+                                       hidePI );
+                }
+
                 m_notification = builder.build();
             }
 
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index bd57ba9d4..ddf5d2c8b 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2031,6 +2031,7 @@
 
     <string name="bkng_notify_text">Accepting Bluetooth messages…</string>
     <string name="bkng_stop_text">Stop</string>
+    <string name="bkng_settings_text">Settings</string>
 
     <!--  -->
     <string name="confirm_sms_title">Confirm your SMS plan</string>
@@ -2728,7 +2729,7 @@
   <string name="toast_no_permission">Permission not granted</string>
 
   <!-- Explanation in settings for always-on BT notification -->
-  <string name="foreground_channel_expl">Ready-for-bluetooth</string>
+  <string name="foreground_channel_expl">Accepting Bluetooth in background</string>
   <!-- Explanation in settings for traditional move-arrived notification -->
   <string name="gameevent_channel_expl">In-game events</string>
 </resources>

From e15fb8400565a5094e9e11dc0c5a7fc2d7d2ae85 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 14 Dec 2018 19:33:03 -0800
Subject: [PATCH 084/145] ask for SMS_RECEIVE on startup if have SMS_SEND

It's free (same group) but required on SDK_26 for invitations to work.
---
 .../org/eehouse/android/xw4/GamesListDelegate.java     | 10 ++++++++++
 .../src/main/java/org/eehouse/android/xw4/Perms23.java |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 54f5d533e..a1e0afcd5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -987,6 +987,16 @@ public class GamesListDelegate extends ListDelegateBase
             } );
 
         updateField();
+
+        // RECEIVE_SMS is required now (Oreo/SDK_26) but wasn't
+        // before. There's logic elsewhere to ask for it AND SEND_SMS, but if
+        // the user's already granted SEND_SMS we can get RECEIVE_SMS just by
+        // asking (OS will grant without user interaction) since they're in
+        // the same group. So just do it now.  This code can be removed
+        // later...
+        if ( Perms23.havePermission( Perm.SEND_SMS ) ) {
+            Perms23.tryGetPerms( this, Perm.RECEIVE_SMS, 0, Action.SKIP_CALLBACK );
+        }
     } // init
 
     @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index 710809192..5f3ff3cdc 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -237,7 +237,8 @@ public class Perms23 {
     {
         // Log.d( TAG, "tryGetPerms(%s)", perm.toString() );
         Context context = XWApp.getContext();
-        String msg = LocUtils.getString( context, rationaleId );
+        String msg = rationaleId == 0
+            ? null : LocUtils.getString( context, rationaleId );
         tryGetPerms( delegate, perm, msg, action, params );
     }
 

From e3f862a6ebcae3a683e1cda6e85a1456937747e1 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 15 Dec 2018 07:07:54 -0800
Subject: [PATCH 085/145] shorten timeout for scan/ping

---
 .../eehouse/android/xw4/BTInviteDelegate.java | 30 ++++++-----
 .../org/eehouse/android/xw4/BTService.java    | 54 +++++++++++++------
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 8ecd1a1ee..4885ec0c9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -99,18 +99,7 @@ public class BTInviteDelegate extends InviteDelegate {
         case SCAN_DONE:
             post( new Runnable() {
                     public void run() {
-                        synchronized( BTInviteDelegate.this ) {
-                            m_progress.cancel();
-
-                            m_pairs = null;
-                            if ( 0 < args.length ) {
-                                m_pairs = TwoStringPair.make( (String[])(args[0]),
-                                                              (String[])(args[1]) );
-                            }
-
-                            updateListAdapter( m_pairs );
-                            tryEnable();
-                        }
+                        processScanResults( (String[])args[0], (String[])args[1] );
                     }
                 } );
             break;
@@ -145,7 +134,7 @@ public class BTInviteDelegate extends InviteDelegate {
         if ( 0 < count ) {
             String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
             m_progress = ProgressDialog.show( m_activity, msg, null, true, true );
-            BTService.scan( m_activity );
+            BTService.scan( m_activity, 5000 );
         } else {
             makeConfirmThenBuilder( R.string.bt_no_devs,
                                     Action.OPEN_BT_PREFS_ACTION )
@@ -154,6 +143,21 @@ public class BTInviteDelegate extends InviteDelegate {
         }
     }
 
+    private void processScanResults( String[] btNames, String[] btAddrs )
+    {
+        DbgUtils.assertOnUIThread();
+
+        m_progress.cancel();
+
+        m_pairs = null;
+        if ( 0 < btNames.length ) {
+            m_pairs = TwoStringPair.make( btNames, btAddrs );
+        }
+
+        updateListAdapter( m_pairs );
+        tryEnable();
+    }
+
     // @Override
     private void removeSelected()
     {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index a2d74f2ad..1d05807f4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -85,6 +85,7 @@ public class BTService extends XWService {
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
+    private static final int CONNECT_TIMEOUT_MS = 10000;
 
     private static final int BT_PROTO_ORIG = 0;
     private static final int BT_PROTO_JSONS = 1; // using jsons instead of lots of fields
@@ -109,6 +110,7 @@ public class BTService extends XWService {
     private static final String MSG_KEY = "MSG";
     private static final String GAMENAME_KEY = "NAM";
     private static final String ADDR_KEY = "ADR";
+    private static final String SCAN_TIMEOUT_KEY = "SCAN_TIMEOUT";
     private static final String RADIO_KEY = "RDO";
     private static final String CLEAR_KEY = "CLR";
 
@@ -144,6 +146,7 @@ public class BTService extends XWService {
 
     private class BTQueueElem {
         int m_failCount;
+        int m_timeout;
         // These should perhaps be in some subclasses....
         BTCmd m_cmd;
         byte[] m_msg;
@@ -156,6 +159,11 @@ public class BTService extends XWService {
         NetLaunchInfo m_nli;
 
         public BTQueueElem( BTCmd cmd ) { m_cmd = cmd; m_failCount = 0; }
+        public BTQueueElem( BTCmd cmd, int timeout )
+        {
+            this(cmd);
+            m_timeout = timeout;
+        }
 
         public BTQueueElem( BTCmd cmd, byte[] buf, String btAddr, int gameID ) {
             this( cmd );
@@ -321,9 +329,11 @@ public class BTService extends XWService {
         startService( context, intent );
     }
 
-    public static void scan( Context context )
+    public static void scan( Context context, int timeoutMS )
     {
-        startService( context, getIntentTo( context, BTAction.SCAN ) );
+        Intent intenet = getIntentTo( context, BTAction.SCAN )
+            .putExtra( SCAN_TIMEOUT_KEY, timeoutMS );
+        startService( context, intenet );
     }
 
     public static void pingHost( Context context, String hostAddr, int gameID )
@@ -493,7 +503,8 @@ public class BTService extends XWService {
                     String[] btAddrs = intent.getStringArrayExtra( CLEAR_KEY );
                     break;
                 case SCAN:
-                    m_sender.add( new BTQueueElem( BTCmd.SCAN ) );
+                    int timeout = intent.getIntExtra( SCAN_TIMEOUT_KEY, -1 );
+                    m_sender.add( new BTQueueElem( BTCmd.SCAN, timeout ) );
                     break;
                 case INVITE:
                     String jsonData = intent.getStringExtra( GAMEDATA_KEY );
@@ -1023,14 +1034,14 @@ public class BTService extends XWService {
                     switch( elem.m_cmd ) {
                     case PING:
                         if ( null == elem.m_btAddr ) {
-                            sendPings( MultiEvent.HOST_PONGED, null );
+                            sendPings( MultiEvent.HOST_PONGED, null, CONNECT_TIMEOUT_MS );
                         } else {
-                            sendPing( elem.m_btAddr, elem.m_gameID );
+                            sendPing( elem.m_btAddr, elem.m_gameID, CONNECT_TIMEOUT_MS );
                         }
                         break;
                     case SCAN:
                         Set<BluetoothDevice> devs = new HashSet<>();
-                        sendPings( null, devs );
+                        sendPings( null, devs, elem.m_timeout );
                         sendNames( devs );
                         break;
                     case INVITE:
@@ -1057,7 +1068,8 @@ public class BTService extends XWService {
             }
         } // run
 
-        private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs )
+        private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs,
+                                int timeout )
         {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             Map<BluetoothDevice, PingThread> threads = new HashMap<>();
@@ -1065,7 +1077,7 @@ public class BTService extends XWService {
                 // Skip things that can't host an Android app
                 int clazz = dev.getBluetoothClass().getMajorDeviceClass();
                 if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
-                    PingThread thread = new PingThread(dev);
+                    PingThread thread = new PingThread( dev, timeout );
                     thread.start();
                     threads.put( dev, thread );
                 } else {
@@ -1095,18 +1107,22 @@ public class BTService extends XWService {
         private class PingThread extends Thread {
             private boolean mGotResponse;
             private BluetoothDevice mDev;
+            private int mTimeout;
 
-            PingThread(BluetoothDevice dev) { mDev = dev; }
+            PingThread(BluetoothDevice dev, int timeout)
+            {
+                mDev = dev; mTimeout = timeout;
+            }
 
             @Override
             public void run() {
-                mGotResponse = sendPing( mDev, 0 );
+                mGotResponse = sendPing( mDev, 0, mTimeout );
             }
 
             boolean gotResponse() { return mGotResponse; }
         }
 
-        private boolean sendPing( BluetoothDevice dev, int gameID )
+        private boolean sendPing( BluetoothDevice dev, int gameID, int timeout )
         {
             boolean gotReply = false;
             boolean sendWorking = false;
@@ -1115,7 +1131,7 @@ public class BTService extends XWService {
                 BluetoothSocket socket =
                     dev.createRfcommSocketToServiceRecord( XWApp.getAppUUID() );
                 if ( null != socket ) {
-                    DataOutputStream os = connect( socket, BTCmd.PING );
+                    DataOutputStream os = connect( socket, BTCmd.PING, timeout );
                     if ( null != os ) {
                         os.writeInt( gameID );
                         os.flush();
@@ -1147,11 +1163,11 @@ public class BTService extends XWService {
             return gotReply;
         } // sendPing
 
-        private boolean sendPing( String btAddr, int gameID )
+        private boolean sendPing( String btAddr, int gameID, int timeout )
         {
             boolean success = false;
             BluetoothDevice dev = m_adapter.getRemoteDevice( btAddr );
-            success = sendPing( dev, gameID );
+            success = sendPing( dev, gameID, timeout );
             return success;
         }
 
@@ -1409,6 +1425,12 @@ public class BTService extends XWService {
     }
 
     private DataOutputStream connect( BluetoothSocket socket, BTCmd cmd )
+    {
+        return connect( socket, cmd, 20000 );
+    }
+
+    private DataOutputStream connect( BluetoothSocket socket, BTCmd cmd,
+                                      int timeout )
     {
         String name = socket.getRemoteDevice().getName();
         Log.w( TAG, "connect(%s) starting", name );
@@ -1420,8 +1442,9 @@ public class BTService extends XWService {
 
         // Try for 8 seconds. Some devices take a long time to get ACL conn
         // ACTION
-        for ( long end = 20000 + System.currentTimeMillis(); ; ) {
+        for ( long end = timeout + System.currentTimeMillis(); ; ) {
             try {
+                Log.d( TAG, "trying connect(%s) ", name );
                 socket.connect();
                 Log.i( TAG, "connect(%s) succeeded", name );
                 dos = new DataOutputStream( socket.getOutputStream() );
@@ -1432,7 +1455,6 @@ public class BTService extends XWService {
                 if ( System.currentTimeMillis() > end ) {
                     break;
                 }
-                Log.d( TAG, "connect(%s) trying again", name );
                 try {
                     Thread.sleep( 1000 );
                 } catch ( InterruptedException ex ) {

From 67fa27069ae30acb5e48dd31d0bd0d3adce3256a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 15 Dec 2018 07:20:29 -0800
Subject: [PATCH 086/145] add a hint for when scan shows nothing

---
 .../main/java/org/eehouse/android/xw4/BTInviteDelegate.java | 4 ++++
 xwords4/android/app/src/main/res/values/common_rsrc.xml     | 2 +-
 xwords4/android/app/src/main/res/values/strings.xml         | 6 ++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 4885ec0c9..93379b656 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -152,6 +152,10 @@ public class BTInviteDelegate extends InviteDelegate {
         m_pairs = null;
         if ( 0 < btNames.length ) {
             m_pairs = TwoStringPair.make( btNames, btAddrs );
+        } else {
+            makeNotAgainBuilder( R.string.not_again_emptybtscan,
+                                 R.string.key_notagain_emptybtscan )
+                .show();
         }
 
         updateListAdapter( m_pairs );
diff --git a/xwords4/android/app/src/main/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml
index ecf62b8ed..e5e1e255f 100644
--- a/xwords4/android/app/src/main/res/values/common_rsrc.xml
+++ b/xwords4/android/app/src/main/res/values/common_rsrc.xml
@@ -92,8 +92,8 @@
   <string name="key_udp_interval">key_udp_interval</string>
 
   <string name="key_notagain_sync">key_notagain_sync</string>
-  <!-- <string name="key_notagain_sms_ready">key_notagain_sms_ready</string> -->
   <string name="key_notagain_newselect">key_notagain_newselect</string>
+  <string name="key_notagain_emptybtscan">key_notagain_emptybtscan</string>
   <string name="key_notagain_backclears">key_notagain_backclears</string>
   <string name="key_notagain_chat">key_notagain_chat</string>
   <string name="key_notagain_relay">key_notagain_relay</string>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index ddf5d2c8b..9108001c4 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2732,4 +2732,10 @@
   <string name="foreground_channel_expl">Accepting Bluetooth in background</string>
   <!-- Explanation in settings for traditional move-arrived notification -->
   <string name="gameevent_channel_expl">In-game events</string>
+
+  <string name="not_again_emptybtscan">If a scan doesn\'t find the device you expect:\n
+  • First, just try again\n
+  • Make sure Bluetooth is on on the other device\n
+  • Launch CrossWords on the other device\n
+  </string>
 </resources>

From 2d91c133a811f54b7ed32a29430036f1c1812006 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 10:41:04 -0800
Subject: [PATCH 087/145] new file (forgotten earlier)

---
 .../org/eehouse/android/xw4/Channels.java     | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 xwords4/android/app/src/main/java/org/eehouse/android/xw4/Channels.java

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Channels.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Channels.java
new file mode 100644
index 000000000..9fdf57cab
--- /dev/null
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Channels.java
@@ -0,0 +1,72 @@
+/* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
+/*
+ * Copyright 2010 - 2014 by Eric House (xwords@eehouse.org).  All
+ * rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+package org.eehouse.android.xw4;
+
+import android.os.Build;
+import android.content.Context;
+import java.util.HashSet;
+import java.util.Set;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+
+public class Channels {
+
+    enum ID {
+        FOREGROUND(R.string.foreground_channel_expl,
+                   NotificationManager.IMPORTANCE_LOW),
+        GAME_EVENT(R.string.gameevent_channel_expl,
+                   NotificationManager.IMPORTANCE_LOW);
+
+        private int mExpl;
+        private int mImportance;
+        private ID( int expl, int imp )
+        {
+            mExpl = expl;
+            mImportance = imp;
+        }
+
+        public int getDesc() { return mExpl; }
+        private int getImportance() { return mImportance; }
+    }
+
+    private static Set<ID> sChannelsMade = new HashSet<>();
+    public static String getChannelID( Context context, ID id )
+    {
+        final String name = id.toString();
+        if ( ! sChannelsMade.contains( id ) ) {
+            sChannelsMade.add( id );
+            if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ) {
+                NotificationManager notMgr = (NotificationManager)
+                    context.getSystemService( Context.NOTIFICATION_SERVICE );
+
+                NotificationChannel channel = notMgr.getNotificationChannel( name );
+                if ( channel == null ) {
+                    String channelDescription = context.getString( id.getDesc() );
+                    channel = new NotificationChannel( name, channelDescription,
+                                                       id.getImportance() );
+                    channel.enableVibration( true );
+                    notMgr.createNotificationChannel( channel );
+                }
+            }
+        }
+        return name;
+    }
+}

From 3b0a523499f7d05eaa1e2af6f5d204b19f06adef Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 13:34:28 -0800
Subject: [PATCH 088/145] send successful pings back as they occur

rather than have the user see no feedback until the slowest-to-respond
paired device times out.
---
 .../eehouse/android/xw4/BTInviteDelegate.java | 36 +++++---
 .../org/eehouse/android/xw4/BTService.java    | 89 ++++++++-----------
 .../android/xw4/GamesListDelegate.java        | 16 ++--
 .../eehouse/android/xw4/InviteDelegate.java   | 15 +++-
 4 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 93379b656..31c712cdb 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -23,12 +23,12 @@ package org.eehouse.android.xw4;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
+import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
-
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
@@ -99,7 +99,21 @@ public class BTInviteDelegate extends InviteDelegate {
         case SCAN_DONE:
             post( new Runnable() {
                     public void run() {
-                        processScanResults( (String[])args[0], (String[])args[1] );
+                        m_progress.cancel();
+
+                        if ( null == m_pairs || m_pairs.length == 0 ) {
+                            makeNotAgainBuilder( R.string.not_again_emptybtscan,
+                                                 R.string.key_notagain_emptybtscan )
+                                .show();
+                        }
+                    }
+                } );
+            break;
+        case HOST_PONGED:
+            post( new Runnable() {
+                    @Override
+                    public void run() {
+                        processScanResult( (BluetoothDevice)args[0] );
                     }
                 } );
             break;
@@ -132,8 +146,12 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
+            m_pairs = null;
+            updateListAdapter( null );
+
             String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
             m_progress = ProgressDialog.show( m_activity, msg, null, true, true );
+
             BTService.scan( m_activity, 5000 );
         } else {
             makeConfirmThenBuilder( R.string.bt_no_devs,
@@ -143,26 +161,16 @@ public class BTInviteDelegate extends InviteDelegate {
         }
     }
 
-    private void processScanResults( String[] btNames, String[] btAddrs )
+    private void processScanResult( BluetoothDevice dev )
     {
         DbgUtils.assertOnUIThread();
 
-        m_progress.cancel();
-
-        m_pairs = null;
-        if ( 0 < btNames.length ) {
-            m_pairs = TwoStringPair.make( btNames, btAddrs );
-        } else {
-            makeNotAgainBuilder( R.string.not_again_emptybtscan,
-                                 R.string.key_notagain_emptybtscan )
-                .show();
-        }
+        m_pairs = TwoStringPair.add( m_pairs, dev.getAddress(), dev.getName() );
 
         updateListAdapter( m_pairs );
         tryEnable();
     }
 
-    // @Override
     private void removeSelected()
     {
         Set<InviterItem> checked = getChecked();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 1d05807f4..9da6c0338 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -82,6 +82,7 @@ public class BTService extends XWService {
     private static final String KEY_KEEPALIVE_UNTIL_SECS = "keep_secs";
     // half minute for testing; maybe 15 on ship? Or make it a debug config.
     private static int DEFAULT_KEEPALIVE_SECONDS = 15 * 60;
+    private static int CONNECT_SLEEP_MS = 1000;
 
     private static final long RESEND_TIMEOUT = 5; // seconds
     private static final int MAX_SEND_FAIL = 3;
@@ -317,15 +318,15 @@ public class BTService extends XWService {
 
     public static void radioChanged( Context context, boolean cameOn )
     {
-        Intent intent = getIntentTo( context, BTAction.RADIO );
-        intent.putExtra( RADIO_KEY, cameOn );
+        Intent intent = getIntentTo( context, BTAction.RADIO )
+            .putExtra( RADIO_KEY, cameOn );
         startService( context, intent );
     }
 
     public static void clearDevices( Context context, String[] btAddrs )
     {
-        Intent intent = getIntentTo( context, BTAction.CLEAR );
-        intent.putExtra( CLEAR_KEY, btAddrs );
+        Intent intent = getIntentTo( context, BTAction.CLEAR )
+            .putExtra( CLEAR_KEY, btAddrs );
         startService( context, intent );
     }
 
@@ -339,9 +340,9 @@ public class BTService extends XWService {
     public static void pingHost( Context context, String hostAddr, int gameID )
     {
         Assert.assertTrue( null != hostAddr && 0 < hostAddr.length() );
-        Intent intent = getIntentTo( context, BTAction.PINGHOST );
-        intent.putExtra( ADDR_KEY, hostAddr );
-        intent.putExtra( GAMEID_KEY, gameID );
+        Intent intent = getIntentTo( context, BTAction.PINGHOST )
+            .putExtra( ADDR_KEY, hostAddr )
+            .putExtra( GAMEID_KEY, gameID );
         startService( context, intent );
     }
 
@@ -349,24 +350,23 @@ public class BTService extends XWService {
                                      NetLaunchInfo nli )
     {
         Assert.assertTrue( null != btAddr && 0 < btAddr.length() );
-        Intent intent = getIntentTo( context, BTAction.INVITE );
         String nliData = nli.toString();
-        intent.putExtra( GAMEDATA_KEY, nliData );
-        intent.putExtra( ADDR_KEY, btAddr );
-
+        Intent intent = getIntentTo( context, BTAction.INVITE )
+            .putExtra( GAMEDATA_KEY, nliData )
+            .putExtra( ADDR_KEY, btAddr );
         startService( context, intent );
     }
 
     public static void gotGameViaNFC( Context context, NetLaunchInfo bli )
     {
-        Intent intent = getIntentTo( context, BTAction.NFCINVITE );
-        intent.putExtra( GAMEID_KEY, bli.gameID() );
-        intent.putExtra( DICT_KEY, bli.dict );
-        intent.putExtra( LANG_KEY, bli.lang );
-        intent.putExtra( NTO_KEY, bli.nPlayersT );
-        intent.putExtra( BT_NAME_KEY, bli.btName );
-        intent.putExtra( BT_ADDRESS_KEY, bli.btAddress );
-
+        Intent intent = getIntentTo( context, BTAction.NFCINVITE )
+            .putExtra( GAMEID_KEY, bli.gameID() )
+            .putExtra( DICT_KEY, bli.dict )
+            .putExtra( LANG_KEY, bli.lang )
+            .putExtra( NTO_KEY, bli.nPlayersT )
+            .putExtra( BT_NAME_KEY, bli.btName )
+            .putExtra( BT_ADDRESS_KEY, bli.btAddress )
+            ;
         startService( context, intent );
     }
 
@@ -1034,15 +1034,14 @@ public class BTService extends XWService {
                     switch( elem.m_cmd ) {
                     case PING:
                         if ( null == elem.m_btAddr ) {
-                            sendPings( MultiEvent.HOST_PONGED, null, CONNECT_TIMEOUT_MS );
+                            sendPings( MultiEvent.HOST_PONGED, CONNECT_TIMEOUT_MS );
                         } else {
                             sendPing( elem.m_btAddr, elem.m_gameID, CONNECT_TIMEOUT_MS );
                         }
                         break;
                     case SCAN:
-                        Set<BluetoothDevice> devs = new HashSet<>();
-                        sendPings( null, devs, elem.m_timeout );
-                        sendNames( devs );
+                        sendPings( MultiEvent.HOST_PONGED, elem.m_timeout );
+                        mHelper.postEvent( MultiEvent.SCAN_DONE );
                         break;
                     case INVITE:
                         sendInvite( elem );
@@ -1068,8 +1067,7 @@ public class BTService extends XWService {
             }
         } // run
 
-        private void sendPings( MultiEvent event, Set<BluetoothDevice> addrs,
-                                int timeout )
+        private void sendPings( MultiEvent event, int timeout )
         {
             Set<BluetoothDevice> pairedDevs = m_adapter.getBondedDevices();
             Map<BluetoothDevice, PingThread> threads = new HashMap<>();
@@ -1077,9 +1075,9 @@ public class BTService extends XWService {
                 // Skip things that can't host an Android app
                 int clazz = dev.getBluetoothClass().getMajorDeviceClass();
                 if ( Major.PHONE == clazz || Major.COMPUTER == clazz ) {
-                    PingThread thread = new PingThread( dev, timeout );
-                    thread.start();
+                    PingThread thread = new PingThread( dev, timeout, event );
                     threads.put( dev, thread );
+                    thread.start();
                 } else {
                     Log.d( TAG, "skipping %s; not an android device!",
                            dev.getName() );
@@ -1090,14 +1088,6 @@ public class BTService extends XWService {
                 PingThread thread = threads.get( dev );
                 try {
                     thread.join();
-                    if ( thread.gotResponse() ) {
-                        if ( null != addrs ) {
-                            addrs.add( dev );
-                        }
-                        if ( null != event ) {
-                            mHelper.postEvent( event, dev.getName() );
-                        }
-                    }
                 } catch ( InterruptedException ex ) {
                     Assert.assertFalse( BuildConfig.DEBUG );
                 }
@@ -1108,15 +1098,19 @@ public class BTService extends XWService {
             private boolean mGotResponse;
             private BluetoothDevice mDev;
             private int mTimeout;
+            private MultiEvent mEvent;
 
-            PingThread(BluetoothDevice dev, int timeout)
+            PingThread(BluetoothDevice dev, int timeout, MultiEvent event)
             {
-                mDev = dev; mTimeout = timeout;
+                mDev = dev; mTimeout = timeout; mEvent = event;
             }
 
             @Override
             public void run() {
                 mGotResponse = sendPing( mDev, 0, mTimeout );
+                if ( mGotResponse && null != mEvent) {
+                    mHelper.postEvent( mEvent, mDev );
+                }
             }
 
             boolean gotResponse() { return mGotResponse; }
@@ -1370,19 +1364,6 @@ public class BTService extends XWService {
         }
     } // class BTSenderThread
 
-    private void sendNames( Set<BluetoothDevice> devs )
-    {
-        String[] btNames = new String[devs.size()];
-        String[] btAddrs = new String[devs.size()];
-        int ii = 0;
-        for ( BluetoothDevice dev : devs ) {
-            btAddrs[ii] = dev.getAddress();
-            btNames[ii] = nameForAddr( m_adapter, btAddrs[ii] );
-            ++ii;
-        }
-        mHelper.postEvent( MultiEvent.SCAN_DONE, (Object)btAddrs, (Object)btNames );
-    }
-
     private void startListener()
     {
         Assert.assertNotNull( mHelper );
@@ -1440,8 +1421,8 @@ public class BTService extends XWService {
 
         DataOutputStream dos = null;
 
-        // Try for 8 seconds. Some devices take a long time to get ACL conn
-        // ACTION
+        // Retry for some time. Some devices take a long time to generate and
+        // broadcast ACL conn ACTION
         for ( long end = timeout + System.currentTimeMillis(); ; ) {
             try {
                 Log.d( TAG, "trying connect(%s) ", name );
@@ -1452,11 +1433,11 @@ public class BTService extends XWService {
                 dos.writeByte( cmd.ordinal() );
                 break;          // success!!!
             } catch (IOException ioe) {
-                if ( System.currentTimeMillis() > end ) {
+                if ( CONNECT_SLEEP_MS + System.currentTimeMillis() > end ) {
                     break;
                 }
                 try {
-                    Thread.sleep( 1000 );
+                    Thread.sleep( CONNECT_SLEEP_MS );
                 } catch ( InterruptedException ex ) {
                     break;
                 }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index a1e0afcd5..5a874cd96 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1231,14 +1231,14 @@ public class GamesListDelegate extends ListDelegateBase
                                final Object ... args )
     {
         switch( event ) {
-        case HOST_PONGED:
-            post( new Runnable() {
-                    public void run() {
-                        DbgUtils.showf( m_activity,
-                                        "Pong from %s", args[0].toString() );
-                    }
-                });
-            break;
+        // case HOST_PONGED:
+        //     post( new Runnable() {
+        //             public void run() {
+        //                 DbgUtils.showf( m_activity,
+        //                                 "Pong from %s", args[0].toString() );
+        //             }
+        //         });
+        //     break;
         case BT_GAME_CREATED:
             post( new Runnable() {
                     public void run() {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index d5c060d06..0bb1f2453 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -36,13 +36,13 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-
 abstract class InviteDelegate extends ListDelegateBase
     implements View.OnClickListener,
                ViewGroup.OnHierarchyChangeListener {
@@ -70,6 +70,19 @@ abstract class InviteDelegate extends ListDelegateBase
             return pairs;
         }
 
+        public static TwoStringPair[] add( TwoStringPair[] pairs, String name,
+                                           String addr )
+        {
+            if ( null == pairs ) {
+                pairs = new TwoStringPair[0];
+            }
+
+            pairs = Arrays.copyOfRange( pairs, 0, pairs.length + 1 );
+            pairs[pairs.length-1] = new TwoStringPair( name, addr );
+
+            return pairs;
+        }
+
         public String getDev() { return str1; }
 
         public boolean equals( InviterItem item )

From 02f37009d2ba3aaaf519c1e1ae519378b81c0d39 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 17:19:03 -0800
Subject: [PATCH 089/145] try fixing scp mis-sending filename

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 605f42385..4c8d16eda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,8 @@ before_install:
 - sudo apt-get install -y python-lxml imagemagick
 script:
 - "./gradlew -PuseCrashlytics asXw4dDeb"
-- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/xw4d/debug/*.apk
-  uploader@eehouse.org:XW4D_UPLOAD
+- NAME=$(find app/build/outputs/apk/xw4d/debug -name '*.apk')
+- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d $NAME uploader@eehouse.org:XW4D_UPLOAD/$(basename $NAME)
 notifications:
   email:
     recipients:

From d31c2f5513358c00585bb2a47dc675cd41368f9b Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 17:43:12 -0800
Subject: [PATCH 090/145] trying another fix for travis

---
 .travis.yml                      | 4 ++--
 xwords4/android/app/build.gradle | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4c8d16eda..605f42385 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,8 +35,8 @@ before_install:
 - sudo apt-get install -y python-lxml imagemagick
 script:
 - "./gradlew -PuseCrashlytics asXw4dDeb"
-- NAME=$(find app/build/outputs/apk/xw4d/debug -name '*.apk')
-- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d $NAME uploader@eehouse.org:XW4D_UPLOAD/$(basename $NAME)
+- scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/xw4d/debug/*.apk
+  uploader@eehouse.org:XW4D_UPLOAD
 notifications:
   email:
     recipients:
diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 21bc531e4..686eb71bd 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -10,11 +10,12 @@ boolean forFDroid = hasProperty('forFDroid')
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
-def GITREV = "git describe --tags"
+def GITCMD = "git describe --tags"
 if (! forFDroid) {
-    GITREV += " --dirty"
+    GITCMD += " --dirty"
 }
-GITREV = GITREV.execute().text.trim()
+def GITREV = GITCMD.execute().text.trim()
+print "GITREV: ${GITREV}\n"
 
 apply plugin: 'com.android.application'
 

From b88bbcf44385cef0e60c7f5d94630a4d3f21e233 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 17:53:18 -0800
Subject: [PATCH 091/145] diagnosing travis build problems

---
 xwords4/android/app/build.gradle | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 686eb71bd..7a627d9d7 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -10,6 +10,14 @@ boolean forFDroid = hasProperty('forFDroid')
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
+def TEST = "which git"
+TEST = TEST.execute().text.trim()
+print "TEST: ${TEST}\n"
+
+def TEST2 = "pwd"
+TEST2 = TEST2.execute().text.trim()
+print "TEST2: ${TEST2}\n"
+
 def GITCMD = "git describe --tags"
 if (! forFDroid) {
     GITCMD += " --dirty"

From a2fe00368ed8cca06a5bf83f8b5541d4622ebd97 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 18:11:09 -0800
Subject: [PATCH 092/145] more diagnosis

---
 xwords4/android/app/build.gradle | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 7a627d9d7..56c72df22 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -10,18 +10,15 @@ boolean forFDroid = hasProperty('forFDroid')
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
-def TEST = "which git"
+def TEST = "git --version"
 TEST = TEST.execute().text.trim()
 print "TEST: ${TEST}\n"
 
-def TEST2 = "pwd"
-TEST2 = TEST2.execute().text.trim()
-print "TEST2: ${TEST2}\n"
-
 def GITCMD = "git describe --tags"
 if (! forFDroid) {
     GITCMD += " --dirty"
 }
+print "GITCMD: ${GITCMD}\n"
 def GITREV = GITCMD.execute().text.trim()
 print "GITREV: ${GITREV}\n"
 

From 3b48ee0ed86f834f145f6c3de9c62fd8a6bff295 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 16 Dec 2018 18:48:06 -0800
Subject: [PATCH 093/145] try a different command

---
 xwords4/android/app/build.gradle | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 56c72df22..e639a519f 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -10,14 +10,11 @@ boolean forFDroid = hasProperty('forFDroid')
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
-def TEST = "git --version"
-TEST = TEST.execute().text.trim()
-print "TEST: ${TEST}\n"
 
-def GITCMD = "git describe --tags"
-if (! forFDroid) {
-    GITCMD += " --dirty"
-}
+def GITCMD = "git rev-parse HEAD"
+// if (! forFDroid) {
+//     GITCMD += " --dirty"
+// }
 print "GITCMD: ${GITCMD}\n"
 def GITREV = GITCMD.execute().text.trim()
 print "GITREV: ${GITREV}\n"

From d8d0065e90e7f86794c814a9ea3e9bb363264bcb Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 08:26:00 -0800
Subject: [PATCH 094/145] remove some logging

---
 .../app/src/main/java/org/eehouse/android/xw4/BTService.java  | 2 +-
 .../src/main/java/org/eehouse/android/xw4/RelayService.java   | 4 ++--
 .../src/main/java/org/eehouse/android/xw4/jni/JNIThread.java  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 9da6c0338..44f256554 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -1520,7 +1520,7 @@ public class BTService extends XWService {
                     try {
                         Thread.sleep( 1000 * seconds );
                     } catch ( InterruptedException ie ) {
-                        Log.w( TAG, "KillerIn: killed by owner" );
+                        // Log.d( TAG, "KillerIn: killed by owner" );
                     }
                     try {
                         socket.close();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index a5c8b3665..4e7446879 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -399,7 +399,7 @@ public class RelayService extends JobIntentService
     {
         MsgCmds cmd = cmdFrom( intent );
         if ( null != cmd ) {
-            Log.d( TAG, "handleCommand(): cmd=%s", cmd.toString() );
+            // Log.d( TAG, "handleCommand(): cmd=%s", cmd.toString() );
             switch( cmd ) {
             case PROCESS_GAME_MSGS:
                 String[] relayIDs = new String[1];
@@ -606,7 +606,7 @@ public class RelayService extends JobIntentService
                 if ( !skipAck ) {
                     sendAckIf( header );
                 }
-                Log.d( TAG, "gotPacket(): cmd=%s", header.m_cmd.toString() );
+                Log.d( TAG, "%s.gotPacket(): cmd=%s", this, header.m_cmd.toString() );
                 switch ( header.m_cmd ) {
                 case XWPDEV_UNAVAIL:
                     int unavail = dis.readInt();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index 91bc41ae8..3f197f307 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -750,8 +750,8 @@ public class JNIThread extends Thread {
     public void handle( JNICmd cmd, Object... args )
     {
         if ( m_stopped && ! JNICmd.CMD_NONE.equals(cmd) ) {
-            Log.w( TAG, "NOT adding %s to stopped thread!!!", cmd.toString() );
-            DbgUtils.printStack( TAG );
+            Log.w( TAG, "handle(%s): NOT adding to stopped thread!!!", cmd );
+            // DbgUtils.printStack( TAG );
         } else {
             m_queue.add( new QueueElem( cmd, true, args ) );
         }

From 5467941d455afd7c8fc41c303562a0095a82acec Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 08:26:39 -0800
Subject: [PATCH 095/145] start stuff when package replaced

And: Don't start the foreground service with its user-visible
notification, as that's too obtrusive and the ACL_CONNECTED stuff seems
to work well enough. Launching timers on a new install is mostly for my
own dev use, but won't hurt user experience either.
---
 .../android/app/src/main/AndroidManifest.xml   |  1 +
 .../eehouse/android/xw4/OnBootReceiver.java    | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/xwords4/android/app/src/main/AndroidManifest.xml b/xwords4/android/app/src/main/AndroidManifest.xml
index d50e00959..1538192f8 100644
--- a/xwords4/android/app/src/main/AndroidManifest.xml
+++ b/xwords4/android/app/src/main/AndroidManifest.xml
@@ -115,6 +115,7 @@
     <receiver android:name="OnBootReceiver">
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
       </intent-filter>
     </receiver>
     <receiver android:name="RelayReceiver"/>
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
index 75525e924..c57636ce8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/OnBootReceiver.java
@@ -30,12 +30,18 @@ public class OnBootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive( Context context, Intent intent )
     {
-        if ( null != intent
-             && null != intent.getAction()
-             && intent.getAction().equals( Intent.ACTION_BOOT_COMPLETED ) ) {
-            Log.d( TAG, "got ACTION_BOOT_COMPLETED" );
-            startTimers( context );
-            BTService.onAppToBackground( context );
+        if ( null != intent ) {
+            String action = intent.getAction();
+            Log.d( TAG, "got %s", action );
+            switch( action ) {
+            case Intent.ACTION_BOOT_COMPLETED:
+            case Intent.ACTION_MY_PACKAGE_REPLACED:
+                startTimers( context );
+                // Let's not put up the foreground service notification on
+                // boot. Too likely to annoy.
+                // BTService.onAppToBackground( context );
+                break;
+            }
         }
     }
 

From e10b17cec0c7d41378cf091bee9f361284fa4cc3 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 12:35:40 -0800
Subject: [PATCH 096/145] remove logging; diagnose git/travis problem

---
 .travis.yml                                                   | 1 +
 .../app/src/main/java/org/eehouse/android/xw4/BoardView.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 605f42385..c9667e982 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ before_install:
 - sudo apt-get -qq update
 - sudo apt-get install -y python-lxml imagemagick
 script:
+- git describe --tags --dirty
 - "./gradlew -PuseCrashlytics asXw4dDeb"
 - scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/xw4d/debug/*.apk
   uploader@eehouse.org:XW4D_UPLOAD
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
index 5d059fcf8..7c11c51d6 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardView.java
@@ -222,7 +222,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
         final int height = getHeight();
         boolean layoutDone = width == m_layoutWidth && height == m_layoutHeight;
         if ( layoutDone ) {
-            Log.d( TAG, "layoutBoardOnce(): layoutDone true" );
+            // Log.d( TAG, "layoutBoardOnce(): layoutDone true" );
         } else if ( null == m_gi ) {
             // nothing to do either
             Log.d( TAG, "layoutBoardOnce(): no m_gi" );
@@ -281,7 +281,7 @@ public class BoardView extends View implements BoardHandler, SyncedDraw {
             m_layoutHeight = height;
             layoutDone = true;
         }
-        Log.d( TAG, "layoutBoardOnce()=>%b", layoutDone );
+        // Log.d( TAG, "layoutBoardOnce()=>%b", layoutDone );
         return layoutDone;
     } // layoutBoardOnce
 

From cdeace0303322e7d6bb66f51a630e524bb1c54e0 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 12:48:57 -0800
Subject: [PATCH 097/145] remove git clone depth

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c9667e982..10dc82237 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+git:
+  depth: false
 language: android
 jdk: oraclejdk8
 env:

From acf86a229148aa882b341000c9502a951978eba1 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 12:53:03 -0800
Subject: [PATCH 098/145] remove diagnostic call

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 10dc82237..5f2f93ed9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,6 @@ before_install:
 - sudo apt-get -qq update
 - sudo apt-get install -y python-lxml imagemagick
 script:
-- git describe --tags --dirty
 - "./gradlew -PuseCrashlytics asXw4dDeb"
 - scp -o "StrictHostKeyChecking no" -i /tmp/id_rsa_uploader -d app/build/outputs/apk/xw4d/debug/*.apk
   uploader@eehouse.org:XW4D_UPLOAD

From 285f6ad34aaa8c64a5a71a2ab455d128eb29df31 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Mon, 17 Dec 2018 12:57:17 -0800
Subject: [PATCH 099/145] revert diagnostic changes

---
 xwords4/android/app/build.gradle | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index e639a519f..21bc531e4 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -10,14 +10,11 @@ boolean forFDroid = hasProperty('forFDroid')
 // Get the git revision we're using. Since fdroid modifies files as
 // part of its build process -dirty will always be added, confusing
 // users. So add that for the non-fdroid case.
-
-def GITCMD = "git rev-parse HEAD"
-// if (! forFDroid) {
-//     GITCMD += " --dirty"
-// }
-print "GITCMD: ${GITCMD}\n"
-def GITREV = GITCMD.execute().text.trim()
-print "GITREV: ${GITREV}\n"
+def GITREV = "git describe --tags"
+if (! forFDroid) {
+    GITREV += " --dirty"
+}
+GITREV = GITREV.execute().text.trim()
 
 apply plugin: 'com.android.application'
 

From 891c73a1b74d9dc62680828db67e2e59d28ea015 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 18 Dec 2018 06:55:23 -0800
Subject: [PATCH 100/145] make run() wait for gamePtr before starting loop

Was seeing race condition on slowest device where JNIThread init hadn't
finished before the event loop tried to use the gamePtr. So use
wait()/notifyAll() to fix.
---
 .../eehouse/android/xw4/jni/JNIThread.java    | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index 3f197f307..3c90325e1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -216,23 +216,29 @@ public class JNIThread extends Thread {
             if ( null != m_jniGamePtr ) {
                 Log.d( TAG, "configure(): m_jniGamePtr not null; that ok?" );
             }
-            m_jniGamePtr = null;
-            if ( null != stream ) {
-                m_jniGamePtr = XwJNI.initFromStream( m_rowid, stream, m_gi,
-                                                     dictNames, pairs.m_bytes,
-                                                     pairs.m_paths,
-                                                     m_gi.langName( m_context ),
-                                                     utils, null, cp, m_xport );
+
+            synchronized ( this ) {
+                m_jniGamePtr = null;
+                if ( null != stream ) {
+                    m_jniGamePtr = XwJNI.initFromStream( m_rowid, stream, m_gi,
+                                                         dictNames, pairs.m_bytes,
+                                                         pairs.m_paths,
+                                                         m_gi.langName( m_context ),
+                                                         utils, null, cp, m_xport );
+                }
+                if ( null == m_jniGamePtr ) {
+                    m_jniGamePtr = XwJNI.initNew( m_gi, dictNames, pairs.m_bytes,
+                                                  pairs.m_paths,
+                                                  m_gi.langName(m_context),
+                                                  utils, null, cp, m_xport );
+                }
+                Assert.assertNotNull( m_jniGamePtr );
+                notifyAll();
             }
-            if ( null == m_jniGamePtr ) {
-                m_jniGamePtr = XwJNI.initNew( m_gi, dictNames, pairs.m_bytes,
-                                              pairs.m_paths,
-                                              m_gi.langName(m_context),
-                                              utils, null, cp, m_xport );
-            }
-            Assert.assertNotNull( m_jniGamePtr );
+
             m_lastSavedState = Arrays.hashCode( stream );
         }
+        Log.d( TAG, "configure() => %b", success );
         return success;
     }
 
@@ -417,13 +423,24 @@ public class JNIThread extends Thread {
     }
 
     @SuppressWarnings("fallthrough")
+    @Override
     public void run()
     {
+        Log.d( TAG, "run() starting" );
         boolean[] barr = new boolean[2]; // scratch boolean
         for ( ; ; ) {
             synchronized ( this ) {
                 if ( m_stopped ) {
                     break;
+                } else if ( null == m_jniGamePtr ) {
+                    try {
+                        wait();
+                    } catch ( InterruptedException iex ) {
+                        Log.d( TAG, "exiting run() on interrupt: %s",
+                               iex.getMessage() );
+                        break;
+                    }
+                    continue;
                 }
             }
 
@@ -728,6 +745,7 @@ public class JNIThread extends Thread {
             m_jniGamePtr.release();
             m_jniGamePtr = null;
         }
+        Log.d( TAG, "run() finished" );
     } // run
 
     public void handleBkgrnd( JNICmd cmd, Object... args )
@@ -815,7 +833,6 @@ public class JNIThread extends Thread {
             result = s_instances.get( rowid );
             if ( null == result && makeNew ) {
                 result = new JNIThread( new GameLock( rowid, true ).lock() );
-                Assert.assertNotNull( result );
                 s_instances.put( rowid, result );
             }
             if ( null != result ) {

From 0e2af6a8368bc9ab2c5ad15e488080d49b0187fb Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 26 Dec 2018 17:41:21 -0800
Subject: [PATCH 101/145] rewrite GameLock to use wait()/notifyAll()

I've learned a bit about java since writing that class. Should be faster
now without the sleep/polling. Also making it illegal to use blocking
lock() call on UI thread. There may be some assertions to fix in the
next few days.
---
 .../eehouse/android/xw4/BoardDelegate.java    |  36 +-
 .../java/org/eehouse/android/xw4/DBUtils.java |  54 +--
 .../android/xw4/GameConfigDelegate.java       |  28 +-
 .../org/eehouse/android/xw4/GameLock.java     | 312 ++++++++++--------
 .../org/eehouse/android/xw4/GameUtils.java    | 274 +++++++--------
 .../android/xw4/GamesListDelegate.java        |  14 +-
 .../eehouse/android/xw4/XWServiceHelper.java  |   2 +-
 .../eehouse/android/xw4/jni/JNIThread.java    |  11 +-
 8 files changed, 401 insertions(+), 330 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 3269eb9a3..9b2b2a18c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -587,17 +587,21 @@ public class BoardDelegate extends DelegateBase
         m_haveInvited = args.getBoolean( GameUtils.INVITED, false );
         m_overNotShown = true;
 
+        // getRetained() can in threory fail to get the lock and so will
+        // return null. Let m_jniThreadRef stay null in that case; doResume()
+        // will finish() in that case.
         m_jniThreadRef = JNIThread.getRetained( m_rowid, true );
+        if ( null != m_jniThreadRef ) {
+            // see http://stackoverflow.com/questions/680180/where-to-stop- \
+            // destroy-threads-in-android-service-class
+            m_jniThreadRef.setDaemonOnce( true );
+            m_jniThreadRef.startOnce();
 
-        // see http://stackoverflow.com/questions/680180/where-to-stop- \
-        // destroy-threads-in-android-service-class
-        m_jniThreadRef.setDaemonOnce( true ); // firing
-        m_jniThreadRef.startOnce();
+            NFCUtils.register( m_activity, this ); // Don't seem to need to unregister...
 
-        NFCUtils.register( m_activity, this ); // Don't seem to need to unregister...
-
-        setBackgroundColor();
-        setKeepScreenOn();
+            setBackgroundColor();
+            setKeepScreenOn();
+        }
     } // init
 
     @Override
@@ -2067,9 +2071,9 @@ public class BoardDelegate extends DelegateBase
 
     private void doResume( boolean isStart )
     {
-        boolean success = true;
+        boolean success = null != m_jniThreadRef;
         boolean firstStart = null == m_handler;
-        if ( firstStart ) {
+        if ( success && firstStart ) {
             m_handler = new Handler();
 
             success = m_jniThreadRef.configure( m_activity, m_view, m_utils, this,
@@ -2777,12 +2781,12 @@ public class BoardDelegate extends DelegateBase
             summary = thread.getSummary();
             gi = thread.getGI();
         } else {
-            GameLock lock = new GameLock( rowID, false );
-            if ( lock.tryLock() ) {
-                summary = DBUtils.getSummary( activity, lock );
-                gi = new CurGameInfo( activity );
-                gamePtr = GameUtils.loadMakeGame( activity, gi, lock );
-                lock.unlock();
+            try ( GameLock lock = GameLock.getFor( rowID ).tryLockRO() ) {
+                if ( null != lock ) {
+                    summary = DBUtils.getSummary( activity, lock );
+                    gi = new CurGameInfo( activity );
+                    gamePtr = GameUtils.loadMakeGame( activity, gi, lock );
+                }
             }
         }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index 173c0d05e..e0f9a1438 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -366,22 +366,27 @@ public class DBUtils {
     public static void addRematchInfo( Context context, long rowid, String btAddr,
                                        String phone, String relayID, String p2pAddr )
     {
-        GameLock lock = new GameLock( rowid, true ).lock();
-        GameSummary summary = getSummary( context, lock );
-        if ( null != btAddr ) {
-            summary.putStringExtra( GameSummary.EXTRA_REMATCH_BTADDR, btAddr );
+        try ( GameLock lock = GameLock.getFor( rowid ).tryLock() ) {
+            Assert.assertNotNull( lock );
+            if ( null != lock ) {
+                GameSummary summary = getSummary( context, lock );
+                if ( null != btAddr ) {
+                    summary.putStringExtra( GameSummary.EXTRA_REMATCH_BTADDR, btAddr );
+                }
+                if ( null != phone ) {
+                    summary.putStringExtra( GameSummary.EXTRA_REMATCH_PHONE, phone );
+                }
+                if ( null != relayID ) {
+                    summary.putStringExtra( GameSummary.EXTRA_REMATCH_RELAY, relayID );
+                }
+                if ( null != p2pAddr ) {
+                    summary.putStringExtra( GameSummary.EXTRA_REMATCH_P2P, p2pAddr );
+                }
+                saveSummary( context, lock, summary );
+            } else {
+                Log.e( TAG, "addRematchInfo(%d): unable to lock game" );
+            }
         }
-        if ( null != phone ) {
-            summary.putStringExtra( GameSummary.EXTRA_REMATCH_PHONE, phone );
-        }
-        if ( null != relayID ) {
-            summary.putStringExtra( GameSummary.EXTRA_REMATCH_RELAY, relayID );
-        }
-        if ( null != p2pAddr ) {
-            summary.putStringExtra( GameSummary.EXTRA_REMATCH_P2P, p2pAddr );
-        }
-        saveSummary( context, lock, summary );
-        lock.unlock();
     }
 
     public static int countGamesUsingLang( Context context, int lang )
@@ -1052,7 +1057,8 @@ public class DBUtils {
 
             setCached( rowid, null ); // force reread
 
-            lock = new GameLock( rowid, true ).lock();
+            lock = GameLock.getFor( rowid ).tryLock();
+            Assert.assertNotNull( lock );
             notifyListeners( rowid, GameChangeType.GAME_CREATED );
         }
 
@@ -1113,14 +1119,14 @@ public class DBUtils {
 
     public static void deleteGame( Context context, long rowid )
     {
-        GameLock lock = new GameLock( rowid, true ).lock( 300 );
-        if ( null != lock ) {
-            deleteGame( context, lock );
-            lock.unlock();
-        } else {
-            Log.e( TAG, "deleteGame: unable to lock rowid %d", rowid );
-            if ( BuildConfig.DEBUG ) {
-                Assert.fail();
+        try ( GameLock lock = GameLock.getFor( rowid ).lock( 300 ) ) {
+            if ( null != lock ) {
+                deleteGame( context, lock );
+            } else {
+                Log.e( TAG, "deleteGame: unable to lock rowid %d", rowid );
+                if ( BuildConfig.DEBUG ) {
+                    Assert.fail();
+                }
             }
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index 9c5f1d1ee..b757a4c26 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -536,10 +536,14 @@ public class GameConfigDelegate extends DelegateBase
         if ( null == m_giOrig ) {
             m_giOrig = new CurGameInfo( m_activity );
 
-            GameLock gameLock;
+            GameLock gameLock = null;
             XwJNI.GamePtr gamePtr;
             if ( null == m_jniThread ) {
-                gameLock = new GameLock( m_rowid, false ).lock();
+                try {
+                    gameLock = GameLock.getFor( m_rowid ).lockRO();
+                } catch (InterruptedException iex) {
+                    Assert.assertFalse( BuildConfig.DEBUG );
+                }
                 gamePtr = GameUtils.loadMakeGame( m_activity, m_giOrig, gameLock );
             } else {
                 gameLock = m_jniThread.getLock();
@@ -1230,14 +1234,18 @@ public class GameConfigDelegate extends DelegateBase
     private void applyChanges( boolean forceNew )
     {
         if ( !isFinishing() ) {
-            GameLock gameLock = m_jniThread == null
-                ? new GameLock( m_rowid, true ).lock()
-                : m_jniThread.getLock();
-            GameUtils.applyChanges( m_activity, m_gi, m_car, m_disabMap,
-                                    gameLock, forceNew );
-            DBUtils.saveThumbnail( m_activity, gameLock, null ); // clear it
-            if ( null == m_jniThread ) {
-                gameLock.unlock();
+            try {
+                GameLock gameLock = m_jniThread == null
+                    ? GameLock.getFor( m_rowid ).lock()
+                    : m_jniThread.getLock();
+                GameUtils.applyChanges( m_activity, m_gi, m_car, m_disabMap,
+                                        gameLock, forceNew );
+                DBUtils.saveThumbnail( m_activity, gameLock, null ); // clear it
+                if ( null == m_jniThread ) {
+                    gameLock.unlock();
+                }
+            } catch (InterruptedException iex) {
+                Assert.assertFalse( BuildConfig.DEBUG );
             }
         }
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
index 85d66310b..aecd935bf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
@@ -20,178 +20,218 @@
 
 package org.eehouse.android.xw4;
 
-
+import java.io.Serializable;
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
 
 // Implements read-locks and write-locks per game.  A read lock is
 // obtainable when other read locks are granted but not when a
 // write lock is.  Write-locks are exclusive.
-public class GameLock {
+public class GameLock implements AutoCloseable {
     private static final String TAG = GameLock.class.getSimpleName();
+
+    public interface GotLock {
+        void onGotLock( GameLock lock );
+    }
     private static final boolean DEBUG_LOCKS = false;
-    private static final boolean THROW_ON_LOCKED = true;
-    private static final int SLEEP_TIME = 100;
-    private static final long ASSERT_TIME = 2000;
+    // private static final long ASSERT_TIME = 2000;
     private static final long THROW_TIME = 1000;
     private long m_rowid;
-    private boolean m_isForWrite;
-    private int m_lockCount;
-    private Thread m_ownerThread;
-    private StackTraceElement[] m_lockTrace;
+    private Stack<Owner> mOwners = new Stack<>();
+    private boolean mReadOnly;
 
-    static {
-        Assert.assertTrue( THROW_TIME <= ASSERT_TIME );
+    private static class Owner {
+        Thread mThread;
+        String mTrace;
+
+        Owner()
+        {
+            mThread = Thread.currentThread();
+            // mTrace = mThread.getStackTrace();
+            mTrace = android.util.Log.getStackTraceString(new Exception());
+        }
+
+        @Override
+        public String toString()
+        {
+            return String.format( "Owner: {%s/%s}", mThread, mTrace );
+        }
+    }
+
+    @Override
+    public String toString()
+    {
+        return String.format("{this: %H; rowid: %d; count: %d; ro: %b}",
+                             this, m_rowid, mOwners.size(), mReadOnly);
     }
 
     public static class GameLockedException extends RuntimeException {}
 
-    private static HashMap<Long, GameLock>
-        s_locks = new HashMap<Long,GameLock>();
-
-    public GameLock( long rowid, boolean isForWrite )
+    private static Map<Long, WeakReference<GameLock>> sLockMap = new HashMap<>();
+    public static GameLock getFor( long rowid )
     {
-        Assert.assertTrue( DBUtils.ROWID_NOTFOUND != rowid );
-        m_rowid = rowid;
-        m_isForWrite = isForWrite;
-        m_lockCount = 0;
-        if ( DEBUG_LOCKS ) {
-            Log.i( TAG, "GameLock(rowid:%d,isForWrite:%b)=>this: %H",
-                   rowid, isForWrite, this );
-            DbgUtils.printStack( TAG );
-        }
-    }
-
-    // This could be written to allow multiple read locks.  Let's
-    // see if not doing that causes problems.
-    public boolean tryLock()
-    {
-        return null == tryLockImpl(); // unowned?
-    }
-
-    private GameLock tryLockImpl()
-    {
-        GameLock owner = null;
-        boolean gotIt = false;
-        synchronized( s_locks ) {
-            owner = s_locks.get( m_rowid );
-            if ( null == owner ) { // unowned
-                Assert.assertTrue( 0 == m_lockCount );
-                s_locks.put( m_rowid, this );
-                if ( BuildConfig.DEBUG ) {
-                    m_ownerThread = Thread.currentThread();
-                }
-                ++m_lockCount;
-                gotIt = true;
-
-                if ( DEBUG_LOCKS ) {
-                    StackTraceElement[] trace
-                        = Thread.currentThread().getStackTrace();
-                    m_lockTrace = new StackTraceElement[trace.length];
-                    System.arraycopy( trace, 0, m_lockTrace, 0, trace.length );
-                }
-            } else if ( this == owner && ! m_isForWrite ) {
-                if ( DEBUG_LOCKS ) {
-                    Log.i( TAG, "tryLock(): incrementing lock count" );
-                }
-                Assert.assertTrue( 0 == m_lockCount );
-                ++m_lockCount;
-                gotIt = true;
-                owner = null;
-            } else if ( DEBUG_LOCKS ) {
-                Log.i( TAG, "tryLock(): rowid %d already held by lock %H",
-                       m_rowid, owner );
+        GameLock result = null;
+        synchronized ( sLockMap ) {
+            if ( sLockMap.containsKey( rowid ) ) {
+                result = sLockMap.get( rowid ).get();
+            }
+            if ( null == result ) {
+                result = new GameLock( rowid );
+                sLockMap.put( rowid, new WeakReference(result) );
             }
         }
-        if ( DEBUG_LOCKS ) {
-            Log.i( TAG, "tryLock %H (rowid=%d) => %b", this, m_rowid, gotIt );
-        }
-        return owner;
+        return result;
     }
 
-    // Wait forever (but may assert if too long)
-    public GameLock lock()
+    private GameLock( long rowid ) { m_rowid = rowid; }
+
+    // We grant a lock IFF:
+    // * Count is 0
+    // OR
+    // * existing locks are ReadOnly and this request is readOnly
+    // OR
+    // * the requesting thread already holds the lock
+    private GameLock tryLockImpl( boolean readOnly )
     {
-        return this.lock( 0 );
+        GameLock result = null;
+        synchronized ( mOwners ) {
+            if ( DEBUG_LOCKS ) {
+                Log.d( TAG, "%s.tryLockImpl(ro=%b)", this, readOnly );
+            }
+            // Thread thisThread = Thread.currentThread();
+            boolean grant = false;
+            if ( mOwners.empty() ) {
+                grant = true;
+            } else if ( mReadOnly && readOnly ) {
+                grant = true;
+            // } else if ( thisThread == mOwnerThread ) {
+            //     grant = true;
+            }
+
+            if ( grant ) {
+                mOwners.push( new Owner() );
+                mReadOnly = readOnly;
+                result = this;
+            }
+            if ( DEBUG_LOCKS ) {
+                Log.d( TAG, "%s.tryLockImpl(ro=%b) => %s", this, readOnly, result );
+                if ( null == result ) {
+                    Log.d( TAG, "Unable to lock; cur owner: %s; would-be owner: %s",
+                           mOwners.peek(), new Owner() );
+                }
+            }
+        }
+        return result;
+    }
+    
+    // // This could be written to allow multiple read locks.  Let's
+    // // see if not doing that causes problems.
+    public GameLock tryLock()
+    {
+        return tryLockImpl( false );
+    }
+
+    public GameLock tryLockRO()
+    {
+        return tryLockImpl( true );
+    }
+
+    private GameLock lockImpl( long timeoutMS, boolean readOnly ) throws InterruptedException
+    {
+        long startMS = System.currentTimeMillis();
+        long endMS = startMS + timeoutMS;
+        synchronized ( mOwners ) {
+            while ( null == tryLockImpl( readOnly ) ) {
+                long now = System.currentTimeMillis();
+                if ( now >= endMS ) {
+                    throw new GameLockedException();
+                }
+                mOwners.wait( endMS - now );
+            }
+        }
+
+        if ( DEBUG_LOCKS ) {
+            long tookMS = System.currentTimeMillis() - startMS;
+            Log.d( TAG, "%s.lockImpl() returning after %d ms", this, tookMS );
+        }
+        return this;
+    }
+
+    public GameLock lock() throws InterruptedException
+    {
+        if ( BuildConfig.DEBUG ) {
+            DbgUtils.assertOnUIThread( false );
+        }
+        return lockImpl( Long.MAX_VALUE, false );
+    }
+
+    public GameLock lockRO() throws InterruptedException
+    {
+        if ( BuildConfig.DEBUG ) {
+            DbgUtils.assertOnUIThread( false );
+        }
+        return lockImpl( Long.MAX_VALUE, true );
     }
 
     // Version that's allowed to return null -- if maxMillis > 0
     public GameLock lock( long maxMillis )
     {
-        GameLock result = null;
-        Assert.assertTrue( maxMillis <= ASSERT_TIME );
         Assert.assertTrue( maxMillis <= THROW_TIME );
-        long sleptTime = 0;
-
+        GameLock result = null;
+        try {
+            result = lockImpl( maxMillis, false );
+        } catch (InterruptedException ex) {
+            Log.d( TAG, "lock(): got %s", ex.getMessage() );
+        }
         if ( DEBUG_LOCKS ) {
-            Log.i( TAG, "lock %H (rowid:%d, maxMillis=%d)", this, m_rowid,
-                   maxMillis );
+            Log.d( TAG, "%s.lock(%d) => %s", this, maxMillis, result );
         }
-
-        for ( ; ; ) {
-            GameLock curOwner = tryLockImpl();
-            if ( null == curOwner ) {
-                result = this;
-                break;
-            }
-            if ( DEBUG_LOCKS ) {
-                Log.i( TAG, "lock() %H failed; sleeping", this );
-                if ( 0 == sleptTime || sleptTime + SLEEP_TIME >= ASSERT_TIME ) {
-                    Log.i( TAG, "lock %H seeking stack:", curOwner );
-                    DbgUtils.printStack( TAG, curOwner.m_lockTrace );
-                    Log.i( TAG, "lock %H seeking stack:", this );
-                    DbgUtils.printStack( TAG );
-                }
-            }
-            try {
-                Thread.sleep( SLEEP_TIME ); // milliseconds
-                sleptTime += SLEEP_TIME;
-            } catch( InterruptedException ie ) {
-                Log.ex( TAG, ie );
-                break;
-            }
-
-            if ( DEBUG_LOCKS ) {
-                Log.i( TAG, "lock() %H awake; "
-                               + "sleptTime now %d millis", this, sleptTime );
-            }
-
-            if ( 0 < maxMillis && sleptTime >= maxMillis ) {
-                break;
-            } else if ( THROW_ON_LOCKED && sleptTime >= THROW_TIME ) {
-                throw new GameLockedException();
-            } else if ( sleptTime >= ASSERT_TIME ) {
-                if ( DEBUG_LOCKS ) {
-                    Log.i( TAG, "lock %H overlocked", this );
-                }
-                Assert.fail();
-            }
-        }
-        // DbgUtils.logf( "GameLock.lock(%s) done", m_path );
         return result;
     }
 
+    public GameLock lockRO( long maxMillis )
+    {
+        Assert.assertTrue( maxMillis <= THROW_TIME );
+        GameLock lock = null;
+        try {
+            lock = lockImpl( maxMillis, true );
+        } catch ( InterruptedException ex ) {
+        }
+        return lock;
+    }
+
     public void unlock()
     {
-        // DbgUtils.logf( "GameLock.unlock(%s)", m_path );
-        synchronized( s_locks ) {
-            Assert.assertTrue( this == s_locks.get(m_rowid) );
-            // Need to get this working before can switch to using ReentrantLock
-            // if ( BuildConfig.DEBUG ) {
-            //     Assert.assertTrue( Thread.currentThread().equals(m_ownerThread) );
-            // }
-            if ( 1 == m_lockCount ) {
-                s_locks.remove( m_rowid );
-            } else {
-                Assert.assertTrue( !m_isForWrite );
-            }
-            --m_lockCount;
-
+        synchronized ( mOwners ) {
             if ( DEBUG_LOCKS ) {
-                Log.i( TAG, "unlock: this: %H (rowid:%d) unlocked", this, m_rowid );
+                Log.d( TAG, "%s.unlock()", this );
+            }
+            Thread oldThread = mOwners.pop().mThread;
+
+            // It's ok for different threads to hold the same RO lock
+            if ( !mReadOnly && oldThread != Thread.currentThread() ) {
+                Log.e( TAG, "unlock(): unequal threads: %s => %s", oldThread,
+                       Thread.currentThread() );
+                Assert.fail();
+            }
+            
+            if ( mOwners.empty() ) {
+                mOwners.notifyAll();
+            }
+            if ( DEBUG_LOCKS ) {
+                Log.d( TAG, "%s.unlock() DONE", this );
             }
         }
     }
 
+    @Override
+    public void close()
+    {
+        unlock();
+    }
+    
     public long getRowid()
     {
         return m_rowid;
@@ -200,9 +240,9 @@ public class GameLock {
     // used only for asserts
     public boolean canWrite()
     {
-        boolean result = m_isForWrite && 1 == m_lockCount;
+        boolean result = !mReadOnly; // && 1 == mLockCount[0];
         if ( !result ) {
-            Log.w( TAG, "canWrite(): %H, returning false", this );
+            Log.w( TAG, "%s.canWrite(): => false", this );
         }
         return result;
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 2df7fd7f9..1a0fad4ca 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -92,9 +92,12 @@ public class GameUtils {
 
     public static byte[] savedGame( Context context, long rowid )
     {
-        GameLock lock = new GameLock( rowid, false ).lock();
-        byte[] result = savedGame( context, lock );
-        lock.unlock();
+        byte[] result = null;
+        try (GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
+            if ( null != lock ) {
+                result = savedGame( context, lock );
+            }
+        }
 
         if ( null == result ) {
             throw new NoSuchGameException();
@@ -144,7 +147,7 @@ public class GameUtils {
         if ( null == lockDest ) {
             long groupID = DBUtils.getGroupForGame( context, lockSrc.getRowid() );
             long rowid = saveNewGame( context, gamePtr, gi, groupID );
-            lockDest = new GameLock( rowid, true ).lock();
+            lockDest = GameLock.getFor( rowid ).tryLock();
         } else {
             saveGame( context, gamePtr, gi, lockDest, true );
         }
@@ -157,16 +160,16 @@ public class GameUtils {
     public static boolean resetGame( Context context, long rowidIn )
     {
         boolean success = false;
-        GameLock lock = new GameLock( rowidIn, true ).lock( 500 );
-        if ( null != lock ) {
-            tellDied( context, lock, true );
-            resetGame( context, lock, lock, false );
-            lock.unlock();
+        try ( GameLock lock = GameLock.getFor( rowidIn ).lock( 500 ) ) {
+            if ( null != lock ) {
+                tellDied( context, lock, true );
+                resetGame( context, lock, lock, false );
 
-            Utils.cancelNotification( context, (int)rowidIn );
-            success = true;
-        } else {
-            Log.w( TAG, "resetGame: unable to open rowid %d", rowidIn );
+                Utils.cancelNotification( context, (int)rowidIn );
+                success = true;
+            } else {
+                Log.w( TAG, "resetGame: unable to open rowid %d", rowidIn );
+            }
         }
         return success;
     }
@@ -221,7 +224,7 @@ public class GameUtils {
             lock = thread.getLock();
         } else {
             try {
-                lock = new GameLock( rowid, false ).lock( maxMillis );
+                lock = GameLock.getFor( rowid ).lockRO( maxMillis );
             } catch ( GameLock.GameLockedException gle ) {
                 Log.ex( TAG, gle );
             }
@@ -248,11 +251,11 @@ public class GameUtils {
         long rowid = DBUtils.ROWID_NOTFOUND;
         GameLock lockSrc = null;
 
-        JNIThread thread = JNIThread.getRetained( rowidIn, false );
+        JNIThread thread = JNIThread.getRetained( rowidIn );
         if ( null != thread ) {
             lockSrc = thread.getLock();
         } else {
-            lockSrc = new GameLock( rowidIn, false ).lock( 300 );
+            lockSrc = GameLock.getFor( rowidIn ).lockRO( 300 );
         }
 
         if ( null != lockSrc ) {
@@ -288,14 +291,14 @@ public class GameUtils {
     {
         boolean success;
         // does this need to be synchronized?
-        GameLock lock = new GameLock( rowid, true );
-        if ( lock.tryLock() ) {
-            deleteGame( context, lock, informNow );
-            lock.unlock();
-            success = true;
-        } else {
-            Log.w( TAG, "deleteGame: unable to delete rowid %d", rowid );
-            success = false;
+        try ( GameLock lock = GameLock.getFor( rowid ).tryLock() ) {
+            if ( null != lock ) {
+                deleteGame( context, lock, informNow );
+                success = true;
+            } else {
+                Log.w( TAG, "deleteGame: unable to delete rowid %d", rowid );
+                success = false;
+            }
         }
         return success;
     }
@@ -392,16 +395,16 @@ public class GameUtils {
     public static Bitmap loadMakeBitmap( Context context, long rowid )
     {
         Bitmap thumb = null;
-        GameLock lock = new GameLock( rowid, false );
-        if ( lock.tryLock() ) {
-            CurGameInfo gi = new CurGameInfo( context );
-            GamePtr gamePtr = loadMakeGame( context, gi, lock );
-            if ( null != gamePtr ) {
-                thumb = takeSnapshot( context, gamePtr, gi );
-                gamePtr.release();
-                DBUtils.saveThumbnail( context, lock, thumb );
+        try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
+            if ( null != lock ) {
+                CurGameInfo gi = new CurGameInfo( context );
+                GamePtr gamePtr = loadMakeGame( context, gi, lock );
+                if ( null != gamePtr ) {
+                    thumb = takeSnapshot( context, gamePtr, gi );
+                    gamePtr.release();
+                    DBUtils.saveThumbnail( context, lock, thumb );
+                }
             }
-            lock.unlock();
         }
         return thumb;
     }
@@ -507,9 +510,10 @@ public class GameUtils {
                                     CurGameInfo gi, long groupID )
     {
         byte[] stream = XwJNI.game_saveToStream( gamePtr, gi );
-        GameLock lock = DBUtils.saveNewGame( context, stream, groupID, null );
-        long rowid = lock.getRowid();
-        lock.unlock();
+        long rowid;
+        try ( GameLock lock = DBUtils.saveNewGame( context, stream, groupID, null ) ) {
+            rowid = lock.getRowid();
+        }
         return rowid;
     }
 
@@ -540,10 +544,10 @@ public class GameUtils {
         long rowid = DBUtils.ROWID_NOTFOUND;
         byte[] bytes = XwJNI.gi_to_stream( gi );
         if ( null != bytes ) {
-            GameLock lock = DBUtils.saveNewGame( context, bytes, groupID,
-                                                 gameName );
-            rowid = lock.getRowid();
-            lock.unlock();
+            try ( GameLock lock = DBUtils.saveNewGame( context, bytes, groupID,
+                                                       gameName ) ) {
+                rowid = lock.getRowid();
+            }
         }
         return rowid;
     }
@@ -641,9 +645,12 @@ public class GameUtils {
         }
 
         if ( DBUtils.ROWID_NOTFOUND != rowid ) {
-            GameLock lock = new GameLock( rowid, true ).lock();
-            applyChanges( context, sink, gi, util, addr, null, lock, false );
-            lock.unlock();
+            // Use tryLock in case we're on UI thread. It's guaranteed to
+            // succeed because we just created the rowid.
+            try ( GameLock lock = GameLock.getFor( rowid ).tryLock() ) {
+                Assert.assertNotNull( lock );
+                applyChanges( context, sink, gi, util, addr, null, lock, false );
+            }
         }
 
         return rowid;
@@ -868,7 +875,7 @@ public class GameUtils {
         return file.endsWith( XWConstants.GAME_EXTN );
     }
 
-    public static Bundle makeLaunchExtras( long rowid, boolean invited )
+    private static Bundle makeLaunchExtras( long rowid, boolean invited )
     {
         Bundle bundle = new Bundle();
         bundle.putLong( INTENT_KEY_ROWID, rowid );
@@ -952,54 +959,54 @@ public class GameUtils {
             // have the lock and we'll never get it.  Better to drop
             // the message than fire the hung-lock assert.  Messages
             // belong in local pre-delivery storage anyway.
-            GameLock lock = new GameLock( rowid, true ).lock( 150 );
-            if ( null != lock ) {
-                CurGameInfo gi = new CurGameInfo( context );
-                FeedUtilsImpl feedImpl = new FeedUtilsImpl( context, rowid );
-                GamePtr gamePtr = loadMakeGame( context, gi, feedImpl, sink, lock );
-                if ( null != gamePtr ) {
-                    XwJNI.comms_resendAll( gamePtr, false, false );
+            try ( GameLock lock = GameLock.getFor( rowid ).lock( 150 ) ) {
+                if ( null != lock ) {
+                    CurGameInfo gi = new CurGameInfo( context );
+                    FeedUtilsImpl feedImpl = new FeedUtilsImpl( context, rowid );
+                    GamePtr gamePtr = loadMakeGame( context, gi, feedImpl, sink, lock );
+                    if ( null != gamePtr ) {
+                        XwJNI.comms_resendAll( gamePtr, false, false );
 
-                    Assert.assertNotNull( ret );
-                    draw = XwJNI.game_receiveMessage( gamePtr, msg, ret );
-                    XwJNI.comms_ackAny( gamePtr );
+                        Assert.assertNotNull( ret );
+                        draw = XwJNI.game_receiveMessage( gamePtr, msg, ret );
+                        XwJNI.comms_ackAny( gamePtr );
 
-                    // update gi to reflect changes due to messages
-                    XwJNI.game_getGi( gamePtr, gi );
+                        // update gi to reflect changes due to messages
+                        XwJNI.game_getGi( gamePtr, gi );
 
-                    if ( draw && XWPrefs.getThumbEnabled( context ) ) {
-                        Bitmap bitmap = takeSnapshot( context, gamePtr, gi );
-                        DBUtils.saveThumbnail( context, lock, bitmap );
-                    }
+                        if ( draw && XWPrefs.getThumbEnabled( context ) ) {
+                            Bitmap bitmap = takeSnapshot( context, gamePtr, gi );
+                            DBUtils.saveThumbnail( context, lock, bitmap );
+                        }
 
-                    if ( null != bmr ) {
-                        if ( null != feedImpl.m_chat ) {
-                            bmr.m_chat = feedImpl.m_chat;
-                            bmr.m_chatFrom = feedImpl.m_chatFrom;
-                            bmr.m_chatTs = feedImpl.m_ts;
-                        } else {
-                            LastMoveInfo lmi = new LastMoveInfo();
-                            XwJNI.model_getPlayersLastScore( gamePtr, -1, lmi );
-                            bmr.m_lmi = lmi;
+                        if ( null != bmr ) {
+                            if ( null != feedImpl.m_chat ) {
+                                bmr.m_chat = feedImpl.m_chat;
+                                bmr.m_chatFrom = feedImpl.m_chatFrom;
+                                bmr.m_chatTs = feedImpl.m_ts;
+                            } else {
+                                LastMoveInfo lmi = new LastMoveInfo();
+                                XwJNI.model_getPlayersLastScore( gamePtr, -1, lmi );
+                                bmr.m_lmi = lmi;
+                            }
+                        }
+
+                        saveGame( context, gamePtr, gi, lock, false );
+                        GameSummary summary = summarizeAndRelease( context, lock,
+                                                                   gamePtr, gi );
+                        if ( null != isLocalOut ) {
+                            isLocalOut[0] = 0 <= summary.turn
+                                && gi.players[summary.turn].isLocal;
+                        }
+
+                        int flags = setFromFeedImpl( feedImpl );
+                        if ( GameSummary.MSG_FLAGS_NONE != flags ) {
+                            draw = true;
+                            int curFlags = DBUtils.getMsgFlags( context, rowid );
+                            DBUtils.setMsgFlags( rowid, flags | curFlags );
                         }
                     }
-
-                    saveGame( context, gamePtr, gi, lock, false );
-                    GameSummary summary = summarizeAndRelease( context, lock,
-                                                               gamePtr, gi );
-                    if ( null != isLocalOut ) {
-                        isLocalOut[0] = 0 <= summary.turn
-                            && gi.players[summary.turn].isLocal;
-                    }
-
-                    int flags = setFromFeedImpl( feedImpl );
-                    if ( GameSummary.MSG_FLAGS_NONE != flags ) {
-                        draw = true;
-                        int curFlags = DBUtils.getMsgFlags( context, rowid );
-                        DBUtils.setMsgFlags( rowid, flags | curFlags );
-                    }
                 }
-                lock.unlock();
             }
         }
         return draw;
@@ -1011,35 +1018,36 @@ public class GameUtils {
     public static boolean replaceDicts( Context context, long rowid,
                                         String oldDict, String newDict )
     {
-        GameLock lock = new GameLock( rowid, true ).lock(300);
-        boolean success = null != lock;
-        if ( success ) {
-            byte[] stream = savedGame( context, lock );
-            CurGameInfo gi = new CurGameInfo( context );
-            XwJNI.gi_from_stream( gi, stream );
+        boolean success;
+        try ( GameLock lock = GameLock.getFor( rowid ).lock(300) ) {
+            success = null != lock;
+            if ( success ) {
+                byte[] stream = savedGame( context, lock );
+                CurGameInfo gi = new CurGameInfo( context );
+                XwJNI.gi_from_stream( gi, stream );
 
-            // first time required so dictNames() will work
-            gi.replaceDicts( context, newDict );
+                // first time required so dictNames() will work
+                gi.replaceDicts( context, newDict );
 
-            String[] dictNames = gi.dictNames();
-            DictUtils.DictPairs pairs = DictUtils.openDicts( context,
-                                                             dictNames );
+                String[] dictNames = gi.dictNames();
+                DictUtils.DictPairs pairs = DictUtils.openDicts( context,
+                                                                 dictNames );
 
-            GamePtr gamePtr =
-                XwJNI.initFromStream( rowid, stream, gi, dictNames,
-                                      pairs.m_bytes, pairs.m_paths,
-                                      gi.langName( context ), null,
-                                      null, CommonPrefs.get( context ), null );
-            // second time required as game_makeFromStream can overwrite
-            gi.replaceDicts( context, newDict );
+                GamePtr gamePtr =
+                    XwJNI.initFromStream( rowid, stream, gi, dictNames,
+                                          pairs.m_bytes, pairs.m_paths,
+                                          gi.langName( context ), null,
+                                          null, CommonPrefs.get( context ), null );
+                // second time required as game_makeFromStream can overwrite
+                gi.replaceDicts( context, newDict );
 
-            saveGame( context, gamePtr, gi, lock, false );
+                saveGame( context, gamePtr, gi, lock, false );
 
-            summarizeAndRelease( context, lock, gamePtr, gi );
+                summarizeAndRelease( context, lock, gamePtr, gi );
 
-            lock.unlock();
-        } else {
-            Log.w( TAG, "replaceDicts: unable to open rowid %d", rowid );
+            } else {
+                Log.w( TAG, "replaceDicts: unable to open rowid %d", rowid );
+            }
         }
         return success;
     } // replaceDicts
@@ -1295,32 +1303,32 @@ public class GameUtils {
                     }
                 }
 
-                GameLock lock = new GameLock( rowid, false );
-                if ( lock.tryLock() ) {
-                    CurGameInfo gi = new CurGameInfo( m_context );
-                    MultiMsgSink sink = new MultiMsgSink( m_context, rowid );
-                    GamePtr gamePtr = loadMakeGame( m_context, gi, sink, lock );
-                    if ( null != gamePtr ) {
-                        int nSent = XwJNI.comms_resendAll( gamePtr, true,
-                                                           m_filter, false );
-                        gamePtr.release();
-                        Log.d( TAG, "Resender.doInBackground(): sent %d "
-                               + "messages for rowid %d", nSent, rowid );
-                        nSentTotal += sink.numSent();
+                try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
+                    if ( null != lock ) {
+                        CurGameInfo gi = new CurGameInfo( m_context );
+                        MultiMsgSink sink = new MultiMsgSink( m_context, rowid );
+                        GamePtr gamePtr = loadMakeGame( m_context, gi, sink, lock );
+                        if ( null != gamePtr ) {
+                            int nSent = XwJNI.comms_resendAll( gamePtr, true,
+                                                               m_filter, false );
+                            gamePtr.release();
+                            Log.d( TAG, "Resender.doInBackground(): sent %d "
+                                   + "messages for rowid %d", nSent, rowid );
+                            nSentTotal += sink.numSent();
+                        } else {
+                            Log.d( TAG, "Resender.doInBackground(): loadMakeGame()"
+                                   + " failed for rowid %d", rowid );
+                        }
                     } else {
-                        Log.d( TAG, "Resender.doInBackground(): loadMakeGame()"
-                               + " failed for rowid %d", rowid );
-                    }
-                    lock.unlock();
-                } else {
-                    JNIThread jniThread = JNIThread.getRetained( rowid, false );
-                    if ( null != jniThread ) {
-                        jniThread.handle( JNIThread.JNICmd.CMD_RESEND, false,
-                                          false, false );
-                        jniThread.release();
-                    } else {
-                        Log.w( TAG, "Resender.doInBackground: unable to unlock %d",
-                               rowid );
+                        JNIThread jniThread = JNIThread.getRetained( rowid );
+                        if ( null != jniThread ) {
+                            jniThread.handle( JNIThread.JNICmd.CMD_RESEND, false,
+                                              false, false );
+                            jniThread.release();
+                        } else {
+                            Log.w( TAG, "Resender.doInBackground: unable to unlock %d",
+                                   rowid );
+                        }
                     }
                 }
             }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 5a874cd96..e221fade9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1829,11 +1829,11 @@ public class GamesListDelegate extends ListDelegateBase
                                 GameUtils.savedGame( self, selRowIDs[0] );
                             long groupID = XWPrefs
                                 .getDefaultNewGameGroup( self );
-                            GameLock lock =
-                                GameUtils.saveNewGame( self, stream, groupID );
-                            DBUtils.saveSummary( self, lock, smry );
-                            m_mySIS.selGames.add( lock.getRowid() );
-                            lock.unlock();
+                            try ( GameLock lock =
+                                  GameUtils.saveNewGame( self, stream, groupID ) ) {
+                                DBUtils.saveSummary( self, lock, smry );
+                                m_mySIS.selGames.add( lock.getRowid() );
+                            }
                             mkListAdapter();
                         }
                     });
@@ -2033,9 +2033,7 @@ public class GamesListDelegate extends ListDelegateBase
         try {
             hasDicts = GameUtils.gameDictsHere( m_activity, rowid, missingNames,
                                                 missingLang );
-        } catch ( GameUtils.NoSuchGameException nsge ) {
-            hasDicts = true;    // irrelevant question
-        } catch ( GameLock.GameLockedException gle ) {
+        } catch ( GameLock.GameLockedException | GameUtils.NoSuchGameException ex ) {
             hasDicts = true;    // irrelevant question
         }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
index e23a85349..3f076f1f8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -75,7 +75,7 @@ abstract class XWServiceHelper {
     {
         boolean allConsumed = true;
         boolean[] isLocalP = new boolean[1];
-        JNIThread jniThread = JNIThread.getRetained( rowid, false );
+        JNIThread jniThread = JNIThread.getRetained( rowid );
         boolean consumed = false;
         if ( null != jniThread ) {
             consumed = true;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index 3c90325e1..0dd797b00 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -35,6 +35,7 @@ import org.eehouse.android.xw4.DbgUtils;
 import org.eehouse.android.xw4.DictUtils;
 import org.eehouse.android.xw4.GameLock;
 import org.eehouse.android.xw4.GameUtils;
+import org.eehouse.android.xw4.Utils;
 import org.eehouse.android.xw4.Log;
 import org.eehouse.android.xw4.R;
 import org.eehouse.android.xw4.XWPrefs;
@@ -832,8 +833,14 @@ public class JNIThread extends Thread {
         synchronized( s_instances ) {
             result = s_instances.get( rowid );
             if ( null == result && makeNew ) {
-                result = new JNIThread( new GameLock( rowid, true ).lock() );
-                s_instances.put( rowid, result );
+                DbgUtils.assertOnUIThread(); // can't use GameLock.lock()
+                if ( true /*test done*/ || (0 != Utils.nextRandomInt() % 3) ) {
+                    GameLock lock = GameLock.getFor( rowid ).tryLock();
+                    if ( lock != null ) {
+                        result = new JNIThread( lock );
+                        s_instances.put( rowid, result );
+                    }
+                }
             }
             if ( null != result ) {
                 result.retain_sync();

From 62cd90c1832186164e2c00bfb1ca16cdc59a7887 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 26 Dec 2018 17:45:42 -0800
Subject: [PATCH 102/145] remove unused interface

---
 .../app/src/main/java/org/eehouse/android/xw4/GameLock.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
index aecd935bf..d060d0e06 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
@@ -32,9 +32,6 @@ import java.util.Stack;
 public class GameLock implements AutoCloseable {
     private static final String TAG = GameLock.class.getSimpleName();
 
-    public interface GotLock {
-        void onGotLock( GameLock lock );
-    }
     private static final boolean DEBUG_LOCKS = false;
     // private static final long ASSERT_TIME = 2000;
     private static final long THROW_TIME = 1000;

From b0805b0b6ae46c71bef425827aafc087e27caf7e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 26 Dec 2018 21:41:47 -0800
Subject: [PATCH 103/145] use tryLock() to avoid on-ui-thread assertions

---
 .../android/xw4/GameConfigDelegate.java       | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index b757a4c26..8cae19c7b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -537,14 +537,13 @@ public class GameConfigDelegate extends DelegateBase
             m_giOrig = new CurGameInfo( m_activity );
 
             GameLock gameLock = null;
-            XwJNI.GamePtr gamePtr;
+            XwJNI.GamePtr gamePtr = null;
             if ( null == m_jniThread ) {
-                try {
-                    gameLock = GameLock.getFor( m_rowid ).lockRO();
-                } catch (InterruptedException iex) {
-                    Assert.assertFalse( BuildConfig.DEBUG );
+                gameLock = GameLock.getFor( m_rowid ).tryLockRO();
+                if ( null != gameLock ) {
+                    gamePtr = GameUtils.loadMakeGame( m_activity, m_giOrig,
+                                                      gameLock );
                 }
-                gamePtr = GameUtils.loadMakeGame( m_activity, m_giOrig, gameLock );
             } else {
                 gameLock = m_jniThread.getLock();
                 gamePtr = m_jniThread.getGamePtr();
@@ -1234,18 +1233,14 @@ public class GameConfigDelegate extends DelegateBase
     private void applyChanges( boolean forceNew )
     {
         if ( !isFinishing() ) {
-            try {
-                GameLock gameLock = m_jniThread == null
-                    ? GameLock.getFor( m_rowid ).lock()
-                    : m_jniThread.getLock();
-                GameUtils.applyChanges( m_activity, m_gi, m_car, m_disabMap,
-                                        gameLock, forceNew );
-                DBUtils.saveThumbnail( m_activity, gameLock, null ); // clear it
-                if ( null == m_jniThread ) {
-                    gameLock.unlock();
-                }
-            } catch (InterruptedException iex) {
-                Assert.assertFalse( BuildConfig.DEBUG );
+            GameLock gameLock = m_jniThread == null
+                ? GameLock.getFor( m_rowid ).tryLock()
+                : m_jniThread.getLock();
+            GameUtils.applyChanges( m_activity, m_gi, m_car, m_disabMap,
+                                    gameLock, forceNew );
+            DBUtils.saveThumbnail( m_activity, gameLock, null ); // clear it
+            if ( null == m_jniThread ) {
+                gameLock.unlock();
             }
         }
     }

From 24386bd8c9361e55c14472503712c05858b6b5de Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 27 Dec 2018 18:09:18 -0800
Subject: [PATCH 104/145] catch uncaught exception

---
 .../org/eehouse/android/xw4/GameLock.java     | 26 ++++++++++++-------
 .../org/eehouse/android/xw4/GameUtils.java    |  2 ++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
index d060d0e06..27a68b653 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameLock.java
@@ -26,6 +26,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
 
+import android.support.annotation.NonNull;
+
 // Implements read-locks and write-locks per game.  A read lock is
 // obtainable when other read locks are granted but not when a
 // write lock is.  Write-locks are exclusive.
@@ -156,24 +158,30 @@ public class GameLock implements AutoCloseable {
         return this;
     }
 
+    @NonNull
     public GameLock lock() throws InterruptedException
     {
         if ( BuildConfig.DEBUG ) {
             DbgUtils.assertOnUIThread( false );
         }
-        return lockImpl( Long.MAX_VALUE, false );
+        GameLock result = lockImpl( Long.MAX_VALUE, false );
+        Assert.assertNotNull( result );
+        return result;
     }
 
-    public GameLock lockRO() throws InterruptedException
-    {
-        if ( BuildConfig.DEBUG ) {
-            DbgUtils.assertOnUIThread( false );
-        }
-        return lockImpl( Long.MAX_VALUE, true );
-    }
+    // @NonNull
+    // public GameLock lockRO() throws InterruptedException
+    // {
+    //     if ( BuildConfig.DEBUG ) {
+    //         DbgUtils.assertOnUIThread( false );
+    //     }
+    //     GameLock result = lockImpl( Long.MAX_VALUE, true );
+    //     Assert.assertNotNull( result );
+    //     return result;
+    // }
 
     // Version that's allowed to return null -- if maxMillis > 0
-    public GameLock lock( long maxMillis )
+    public GameLock lock( long maxMillis ) throws GameLockedException
     {
         Assert.assertTrue( maxMillis <= THROW_TIME );
         GameLock result = null;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 1a0fad4ca..370672797 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -1007,6 +1007,8 @@ public class GameUtils {
                         }
                     }
                 }
+            } catch ( GameLock.GameLockedException gle ) {
+                Log.e( TAG, "feedMessage(): game locked; dropping message" );
             }
         }
         return draw;

From 320db700a94d9183f111b0fefeecfb59a8117847 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 27 Dec 2018 19:30:34 -0800
Subject: [PATCH 105/145] add opponent address to net stat display

(Debug builds only)
---
 .../eehouse/android/xw4/BoardDelegate.java    |  6 +++-
 .../android/xw4/ConnStatusHandler.java        | 32 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 9b2b2a18c..7f87d9e23 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1485,7 +1485,11 @@ public class BoardDelegate extends DelegateBase
 
     public void onStatusClicked()
     {
-        final String msg = ConnStatusHandler.getStatusText( m_activity, m_connTypes );
+        CommsAddrRec addr = new CommsAddrRec();
+        XwJNI.comms_getAddr( m_jniGamePtr, addr );
+
+        final String msg = ConnStatusHandler
+            .getStatusText( m_activity, m_connTypes, addr );
         post( new Runnable() {
                 @Override
                 public void run() {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
index efe49c8b2..b6e460161 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
@@ -35,6 +35,7 @@ import android.text.format.Time;
 
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
 import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
+import org.eehouse.android.xw4.jni.CommsAddrRec;
 import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
@@ -163,7 +164,9 @@ public class ConnStatusHandler {
         return s_downOnMe && s_rect.contains( xx, yy );
     }
 
-    public static String getStatusText( Context context, CommsConnTypeSet connTypes )
+    public static String getStatusText( Context context,
+                                        CommsConnTypeSet connTypes,
+                                        CommsAddrRec addr )
     {
         String msg;
         if ( null == connTypes || 0 == connTypes.size() ) {
@@ -176,9 +179,12 @@ public class ConnStatusHandler {
                                                R.string.connstat_net_fmt,
                                                connTypes.toString( context, true )));
                 for ( CommsConnType typ : connTypes.getTypes() ) {
-                    String did = addDebugInfo( context, typ );
-                    sb.append( String.format( "\n\n*** %s %s***\n",
-                                              typ.longName( context ), did ) );
+                    sb.append( String.format( "\n\n*** %s ", typ.longName( context ) ) );
+                    String did = addDebugInfo( context, addr, typ );
+                    if ( null != did ) {
+                        sb.append( did ).append( " " );
+                    }
+                    sb.append( "***\n" );
 
                     // For sends we list failures too.
                     SuccessRecord record = recordFor( context, typ, false );
@@ -532,23 +538,35 @@ public class ConnStatusHandler {
         return result;
     }
 
-    private static String addDebugInfo( Context context, CommsConnType typ )
+    private static String addDebugInfo( Context context, CommsAddrRec addr,
+                                        CommsConnType typ )
     {
-        String result = "";
+        String result = null;
         if ( BuildConfig.DEBUG ) {
             switch ( typ ) {
             case COMMS_CONN_RELAY:
-                result = String.format( "(DevID: %d; host: %s) ",
+                result = String.format( "DevID: %d; host: %s",
                                         DevID.getRelayDevIDInt(context),
                                         XWPrefs.getDefaultRelayHost(context) );
                 break;
             case COMMS_CONN_P2P:
                 result = WiDirService.formatNetStateInfo();
                 break;
+            case COMMS_CONN_BT:
+                result = addr.bt_hostName;
+                break;
+            case COMMS_CONN_SMS:
+                result = addr.sms_phone;
+                break;
             default:
                 break;
             }
         }
+
+        if ( null != result ) {
+            result = "(" + result + ")";
+        }
+
         return result;
     }
 }

From 37a853c8a43df392c01421682a6c2d6a666cfcb9 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Thu, 27 Dec 2018 22:10:24 -0800
Subject: [PATCH 106/145] oops: use the first *remote* address

---
 .../main/java/org/eehouse/android/xw4/BoardDelegate.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 7f87d9e23..8a970aa59 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1485,11 +1485,10 @@ public class BoardDelegate extends DelegateBase
 
     public void onStatusClicked()
     {
-        CommsAddrRec addr = new CommsAddrRec();
-        XwJNI.comms_getAddr( m_jniGamePtr, addr );
-
+        CommsAddrRec[] addrs = XwJNI.comms_getAddrs( m_jniGamePtr );
         final String msg = ConnStatusHandler
-            .getStatusText( m_activity, m_connTypes, addr );
+            .getStatusText( m_activity, m_connTypes, addrs[0] );
+
         post( new Runnable() {
                 @Override
                 public void run() {

From bdd92baf550806f5103fc05b7d23b81da9c521b3 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 28 Dec 2018 07:09:15 -0800
Subject: [PATCH 107/145] fix NPE when game isn't connected yet

---
 .../main/java/org/eehouse/android/xw4/BoardDelegate.java  | 3 ++-
 .../java/org/eehouse/android/xw4/ConnStatusHandler.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 8a970aa59..7fbdef057 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1486,8 +1486,9 @@ public class BoardDelegate extends DelegateBase
     public void onStatusClicked()
     {
         CommsAddrRec[] addrs = XwJNI.comms_getAddrs( m_jniGamePtr );
+        CommsAddrRec addr = null != addrs && 0 < addrs.length ? addrs[0] : null;
         final String msg = ConnStatusHandler
-            .getStatusText( m_activity, m_connTypes, addrs[0] );
+            .getStatusText( m_activity, m_connTypes, addr );
 
         post( new Runnable() {
                 @Override
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
index b6e460161..92005f910 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ConnStatusHandler.java
@@ -553,10 +553,14 @@ public class ConnStatusHandler {
                 result = WiDirService.formatNetStateInfo();
                 break;
             case COMMS_CONN_BT:
-                result = addr.bt_hostName;
+                if ( null != addr ) {
+                    result = addr.bt_hostName;
+                }
                 break;
             case COMMS_CONN_SMS:
-                result = addr.sms_phone;
+                if ( null != addr ) {
+                    result = addr.sms_phone;
+                }
                 break;
             default:
                 break;

From e58f51a5232e41cf787296a80fd77005bc3dcf41 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Fri, 28 Dec 2018 07:15:40 -0800
Subject: [PATCH 108/145] log, rather than toast, too-frequent debug message

---
 .../src/main/java/org/eehouse/android/xw4/MainActivity.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
index 8ea9949f3..4c2da4d08 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/MainActivity.java
@@ -137,8 +137,8 @@ public class MainActivity extends XWActivity
                     }
                 } );
             if ( BuildConfig.DEBUG ) {
-                DbgUtils.showf( this, "Putting off handling intent; %d waiting",
-                                m_runWhenSafe.size() );
+                Log.d( TAG, "Putting off handling intent; %d waiting",
+                       m_runWhenSafe.size() );
             }
             handled = true;
         }

From e9ae36f68dac7dcdcb30cba3a9072923d7507b06 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 29 Dec 2018 07:41:03 -0800
Subject: [PATCH 109/145] fix invite via relayID (linux test app)

I broke it adding SMS invite support?
---
 xwords4/linux/gtkboard.c |  2 +-
 xwords4/linux/gtkmain.c  | 85 +++++++++++++++++-----------------------
 xwords4/linux/linuxsms.c |  3 --
 3 files changed, 37 insertions(+), 53 deletions(-)

diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c
index a55093990..2a09c05f3 100644
--- a/xwords4/linux/gtkboard.c
+++ b/xwords4/linux/gtkboard.c
@@ -1655,7 +1655,7 @@ send_invites( CommonGlobals* cGlobals, XP_U16 nPlayers,
     }
 #endif
 
-    if ( !!addrs->u.sms.phone ) {
+    if ( '\0' != addrs->u.sms.phone[0] && 0 < addrs->u.sms.port ) {
         gchar gameName[64];
         snprintf( gameName, VSIZE(gameName), "Game %d", cGlobals->gi->gameID );
 
diff --git a/xwords4/linux/gtkmain.c b/xwords4/linux/gtkmain.c
index 24648dc43..24ee899d3 100644
--- a/xwords4/linux/gtkmain.c
+++ b/xwords4/linux/gtkmain.c
@@ -652,11 +652,44 @@ gtkSocketAdded( void* closure, int newSock, GIOFunc proc )
 } /* gtk_socket_changed */
 
 
+/* Stuff common to receiving invitations */
+static void
+gameFromInvite( GtkAppGlobals* apg, const NetLaunchInfo* invite,
+                const CommsAddrRec* returnAddr )
+{
+    LaunchParams* params = apg->params;
+    CurGameInfo gi = {0};
+    gi_copy( MPPARM(params->mpool) &gi, &params->pgi );
+
+    gi_setNPlayers( &gi, invite->nPlayersT, invite->nPlayersH );
+    gi.gameID = invite->gameID;
+    gi.dictLang = invite->lang;
+    gi.forceChannel = invite->forceChannel;
+    gi.serverRole = SERVER_ISCLIENT; /* recipient of invitation is client */
+    replaceStringIfDifferent( params->mpool, &gi.dictName, invite->dict );
+
+    GtkGameGlobals* globals = malloc( sizeof(*globals) );
+    params->needsNewGame = XP_FALSE;
+    initGlobals( globals, params, &gi );
+
+    if ( !!returnAddr ) {
+        globals->cGlobals.addr = *returnAddr;
+    } else {
+        nli_makeAddrRec( invite, &globals->cGlobals.addr );
+    }
+
+    GtkWidget* gameWindow = globals->window;
+    globals->cGlobals.selRow = -1;
+    recordOpened( apg, globals );
+    gtk_widget_show( gameWindow );
+
+    gi_disposePlayerInfo( MPPARM(params->mpool) &gi );
+}
+
 static void
 relayInviteReceived( void* closure, NetLaunchInfo* invite )
 {
     GtkAppGlobals* apg = (GtkAppGlobals*)closure;
-    LaunchParams* params = apg->params;
 
     XP_U32 gameID = invite->gameID;
     sqlite3_int64 rowids[1];
@@ -666,28 +699,7 @@ relayInviteReceived( void* closure, NetLaunchInfo* invite )
     if ( 0 < nRowIDs ) {
         gtktell( apg->window, "Duplicate invite rejected" );
     } else {
-        CurGameInfo gi = {0};
-        gi_copy( MPPARM(params->mpool) &gi, &params->pgi );
-
-        gi_setNPlayers( &gi, invite->nPlayersT, invite->nPlayersH );
-        gi.gameID = gameID;
-        gi.dictLang = invite->lang;
-        gi.forceChannel = invite->forceChannel;
-        replaceStringIfDifferent( params->mpool, &gi.dictName, invite->dict );
-
-        GtkGameGlobals* globals = malloc( sizeof(*globals) );
-        params->needsNewGame = XP_FALSE;
-        initGlobals( globals, params, &gi );
-
-        nli_makeAddrRec( invite, &globals->cGlobals.addr );
-        // globals->cGlobals.addr = *returnAddr;
-
-        GtkWidget* gameWindow = globals->window;
-        globals->cGlobals.selRow = -1;
-        recordOpened( apg, globals );
-        gtk_widget_show( gameWindow );
-
-        gi_disposePlayerInfo( MPPARM(params->mpool) &gi );
+        gameFromInvite( apg, invite, NULL );
     }
 }
 
@@ -746,41 +758,16 @@ gtkNoticeRcvd( void* closure )
 }
 
 static void
-/* smsInviteReceived( void* closure, const XP_UCHAR* XP_UNUSED_DBG(gameName),  */
-/*                    XP_U32 gameID, XP_U16 dictLang, const XP_UCHAR* dictName, */
-/*                    XP_U16 nPlayers, XP_U16 nHere, XP_U16 forceChannel, */
-/*                    const CommsAddrRec* returnAddr ) */
 smsInviteReceived( void* closure, const NetLaunchInfo* nli,
                    const CommsAddrRec* returnAddr )
 {
     GtkAppGlobals* apg = (GtkAppGlobals*)closure;
-    LaunchParams* params = apg->params;
     XP_LOGF( "%s(gameName=%s, gameID=%d, dictName=%s, nPlayers=%d, "
              "nHere=%d, forceChannel=%d)", __func__, nli->gameName,
              nli->gameID, nli->dict, nli->nPlayersT,
              nli->nPlayersH, nli->forceChannel );
 
-    CurGameInfo gi = {0};
-    gi_copy( MPPARM(params->mpool) &gi, &params->pgi );
-
-    gi_setNPlayers( &gi, nli->nPlayersT, nli->nPlayersH );
-    gi.gameID = nli->gameID;
-    gi.dictLang = nli->lang;
-    gi.forceChannel = nli->forceChannel;
-    gi.serverRole = SERVER_ISCLIENT; /* recipient of invitation is client */
-    replaceStringIfDifferent( params->mpool, &gi.dictName, nli->dict );
-
-    GtkGameGlobals* globals = malloc( sizeof(*globals) );
-    params->needsNewGame = XP_FALSE;
-    initGlobals( globals, params, &gi );
-    globals->cGlobals.addr = *returnAddr;
-
-    GtkWidget* gameWindow = globals->window;
-    globals->cGlobals.selRow = -1;
-    recordOpened( apg, globals );
-    gtk_widget_show( gameWindow );
-
-    gi_disposePlayerInfo( MPPARM(params->mpool) &gi );
+    gameFromInvite( apg, nli, returnAddr );
 }
 
 static void
diff --git a/xwords4/linux/linuxsms.c b/xwords4/linux/linuxsms.c
index c98bc9adc..c0f62d93b 100644
--- a/xwords4/linux/linuxsms.c
+++ b/xwords4/linux/linuxsms.c
@@ -247,9 +247,6 @@ parseAndDispatch( LaunchParams* params, uint8_t* buf, int len,
             case INVITE:
                 (*storage->procs->inviteReceived)( storage->procClosure,
                                                    (NetLaunchInfo*)msg->data, addr );
-                                                   /* gameName,  */
-                                                   /* gameID, dictLang, dictName, nPlayers, */
-                                                   /* nMissing, forceChannel, addr ); */
                 break;
             default:
                 XP_ASSERT(0);   /* implement me!! */

From 4a90792dec11e7d32adc691ad87de0589074a5d7 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 29 Dec 2018 12:15:28 -0800
Subject: [PATCH 110/145] If game's in Spanish, don't require 7 tiles for
 trade.

Put up an error message if too many tiles selected for trade
(a condition that couldn't exist when the pool was guaranteed to
have at least 7 in it.) (It's a hack: there's not even an enum
giving Spanish's code, and the lang_locale stuff in info.txt isn't
making it into the .xwd format.)
---
 .../eehouse/android/xw4/BoardDelegate.java    | 48 +++++++++++--------
 .../org/eehouse/android/xw4/jni/UtilCtxt.java | 42 ++++++++--------
 .../eehouse/android/xw4/jni/UtilCtxtImpl.java |  2 +-
 .../org/eehouse/android/xw4/jni/XwJNI.java    |  1 +
 .../app/src/main/res/values/strings.xml       |  8 ++++
 xwords4/android/jni/utilwrapper.c             | 11 ++++-
 xwords4/android/jni/xwjni.c                   | 11 +++++
 xwords4/common/board.c                        | 25 ++++++++--
 xwords4/common/model.h                        |  5 --
 xwords4/common/util.h                         |  3 +-
 xwords4/linux/linuxutl.c                      |  4 ++
 11 files changed, 108 insertions(+), 52 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 7fbdef057..830bd28ab 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -631,7 +631,7 @@ public class BoardDelegate extends DelegateBase
     @Override
     protected void onStop()
     {
-        if ( isFinishing() ) {
+        if ( isFinishing() && null != m_jniThreadRef ) {
             m_jniThreadRef.release();
             m_jniThreadRef = null;
         }
@@ -1858,50 +1858,56 @@ public class BoardDelegate extends DelegateBase
         }
 
         @Override
-        public void userError( int code )
+        public void userError( UtilErrID code )
         {
             int resid = 0;
             boolean asToast = false;
+            String msg = null;
             switch( code ) {
-            case UtilCtxt.ERR_TILES_NOT_IN_LINE:
+            case ERR_TILES_NOT_IN_LINE:
                 resid = R.string.str_tiles_not_in_line;
                 break;
-            case UtilCtxt.ERR_NO_EMPTIES_IN_TURN:
+            case ERR_NO_EMPTIES_IN_TURN:
                 resid = R.string.str_no_empties_in_turn;
                 break;
-            case UtilCtxt.ERR_TWO_TILES_FIRST_MOVE:
+            case ERR_TWO_TILES_FIRST_MOVE:
                 resid = R.string.str_two_tiles_first_move;
                 break;
-            case UtilCtxt.ERR_TILES_MUST_CONTACT:
+            case ERR_TILES_MUST_CONTACT:
                 resid = R.string.str_tiles_must_contact;
                 break;
-            case UtilCtxt.ERR_NOT_YOUR_TURN:
+            case ERR_NOT_YOUR_TURN:
                 resid = R.string.str_not_your_turn;
                 break;
-            case UtilCtxt.ERR_NO_PEEK_ROBOT_TILES:
+            case ERR_NO_PEEK_ROBOT_TILES:
                 resid = R.string.str_no_peek_robot_tiles;
                 break;
-            case UtilCtxt.ERR_NO_EMPTY_TRADE:
+            case ERR_NO_EMPTY_TRADE:
                 // This should not be possible as the button's
                 // disabled when no tiles selected.
                 Assert.fail();
                 break;
-            case UtilCtxt.ERR_TOO_FEW_TILES_LEFT_TO_TRADE:
+            case ERR_TOO_MANY_TRADE:
+                int nLeft = XwJNI.server_countTilesInPool( m_jniGamePtr );
+                msg = getQuantityString( R.plurals.too_many_trade_fmt,
+                                         nLeft, nLeft );
+                break;
+            case ERR_TOO_FEW_TILES_LEFT_TO_TRADE:
                 resid = R.string.str_too_few_tiles_left_to_trade;
                 break;
-            case UtilCtxt.ERR_CANT_UNDO_TILEASSIGN:
+            case ERR_CANT_UNDO_TILEASSIGN:
                 resid = R.string.str_cant_undo_tileassign;
                 break;
-            case UtilCtxt.ERR_CANT_HINT_WHILE_DISABLED:
+            case ERR_CANT_HINT_WHILE_DISABLED:
                 resid = R.string.str_cant_hint_while_disabled;
                 break;
-            case UtilCtxt.ERR_NO_PEEK_REMOTE_TILES:
+            case ERR_NO_PEEK_REMOTE_TILES:
                 resid = R.string.str_no_peek_remote_tiles;
                 break;
-            case UtilCtxt.ERR_REG_UNEXPECTED_USER:
+            case ERR_REG_UNEXPECTED_USER:
                 resid = R.string.str_reg_unexpected_user;
                 break;
-            case UtilCtxt.ERR_SERVER_DICT_WINS:
+            case ERR_SERVER_DICT_WINS:
                 resid = R.string.str_server_dict_wins;
                 break;
             case ERR_REG_SERVER_SANS_REMOTE:
@@ -1913,17 +1919,21 @@ public class BoardDelegate extends DelegateBase
                 break;
             }
 
-            if ( resid != 0 ) {
+            if ( null == msg && resid != 0 ) {
+                msg = getString( resid );
+            }
+
+            if ( null != msg ) {
                 if ( asToast ) {
-                    final int residf = resid;
+                    final String msgf = msg;
                     runOnUiThread( new Runnable() {
                             @Override
                             public void run() {
-                                showToast( residf );
+                                showToast( msgf );
                             }
                         } );
                 } else {
-                    nonBlockingDialog( DlgID.DLG_OKONLY, getString( resid ) );
+                    nonBlockingDialog( DlgID.DLG_OKONLY, msg );
                 }
             }
         } // userError
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
index 8812323e6..69c525b1d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
@@ -67,27 +67,31 @@ public interface UtilCtxt {
     void notifyMove( String query );
     void notifyTrade( String[] tiles );
 
-    // These oughtto be an enum but then I'd have to cons one up in C.
-    static final int ERR_NONE = 0;
-    static final int ERR_TILES_NOT_IN_LINE = 1;
-    static final int ERR_NO_EMPTIES_IN_TURN = 2;
-    static final int ERR_TWO_TILES_FIRST_MOVE = 3;
-    static final int ERR_TILES_MUST_CONTACT = 4;
-    static final int ERR_TOO_FEW_TILES_LEFT_TO_TRADE = 5;
-    static final int ERR_NOT_YOUR_TURN = 6;
-    static final int ERR_NO_PEEK_ROBOT_TILES = 7;
-    static final int ERR_SERVER_DICT_WINS = 8;
-    static final int ERR_NO_PEEK_REMOTE_TILES = 9;
-    static final int ERR_REG_UNEXPECTED_USER = 10;
-    static final int ERR_REG_SERVER_SANS_REMOTE = 11;
-    static final int STR_NEED_BT_HOST_ADDR = 12;
-    static final int ERR_NO_EMPTY_TRADE = 13;
-    static final int ERR_CANT_UNDO_TILEASSIGN = 14;
-    static final int ERR_CANT_HINT_WHILE_DISABLED = 15;
-    static final int ERR_NO_HINT_FOUND = 16;
+    // Must be kept in sync with enum in common/util.h
+    enum UtilErrID {
+        ERR_NONE,                   /* 0 is special case */
+        ERR_TILES_NOT_IN_LINE,   /* scoring a move where tiles aren't in line */
+        ERR_NO_EMPTIES_IN_TURN,
+        ERR_TWO_TILES_FIRST_MOVE,
+        ERR_TILES_MUST_CONTACT,
+        ERR_TOO_FEW_TILES_LEFT_TO_TRADE,
+        ERR_NOT_YOUR_TURN,
+        ERR_NO_PEEK_ROBOT_TILES,
+        ERR_SERVER_DICT_WINS,
+        ERR_NO_PEEK_REMOTE_TILES,
+        ERR_REG_UNEXPECTED_USER, /* server asked to register too many remote
+                                    users */
+        ERR_REG_SERVER_SANS_REMOTE,
+        STR_NEED_BT_HOST_ADDR,
+        ERR_NO_EMPTY_TRADE,
+        ERR_TOO_MANY_TRADE,
+        ERR_CANT_UNDO_TILEASSIGN,
+        ERR_CANT_HINT_WHILE_DISABLED,
+        ERR_NO_HINT_FOUND,          /* not really an error... */
+    };
 
     static final int ERR_RELAY_BASE = 17;
-    void userError( int id );
+    void userError( UtilErrID id );
 
     void informMove( int turn, String expl, String words );
     void informUndo();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
index 2a1c30043..c3684303f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
@@ -128,7 +128,7 @@ public class UtilCtxtImpl implements UtilCtxt {
     }
 
     @Override
-    public void userError( int id )
+    public void userError( UtilErrID id )
     {
         subclassOverride( "userError" );
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
index 2b9f96110..bd51c2f92 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
@@ -364,6 +364,7 @@ public class XwJNI {
     public static native void server_handleUndo( GamePtr gamePtr );
     public static native boolean server_do( GamePtr gamePtr );
     public static native void server_tilesPicked( GamePtr gamePtr, int player, int[] tiles );
+    public static native int server_countTilesInPool( GamePtr gamePtr );
 
     public static native String server_formatDictCounts( GamePtr gamePtr, int nCols );
     public static native boolean server_getGameIsOver( GamePtr gamePtr );
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 9108001c4..5352de781 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1319,6 +1319,14 @@
     <string name="str_too_few_tiles_left_to_trade">Too few tiles left
          to exchange.</string>
 
+         <!-- In Spanish you can trade with fewer than 7 tiles in the
+              pool, so you can wind up selecting more than are
+              available. You get this error message in that case. -->
+    <plurals name="too_many_trade_fmt">
+      <item quantity="one">Too many tiles selected. Please select only 1</item>
+      <item quantity="other">Too many tiles selected. Please select no more than %1$d.</item>
+    </plurals>
+
     <!-- Displayed if you try to use the undo menuitem or button and
          there are no tiles on the board (no move has yet been made.)
          [If I'm being clever and disabling those features in this
diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index 03eab0bf4..e02f4f5f3 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -120,13 +120,20 @@ static XWBonusType and_util_getSquareBonus( XW_UtilCtxt* XP_UNUSED(uc),
 static void
 and_util_userError( XW_UtilCtxt* uc, UtilErrID id )
 {
-    UTIL_CBK_HEADER( "userError", "(I)V" );
-    (*env)->CallVoidMethod( env, util->jutil, mid, id );
+    UTIL_CBK_HEADER( "userError", "(L" PKG_PATH("jni/UtilCtxt$UtilErrID") ";)V" );
+
+    jobject idEnum = intToJEnum( env, id,
+                                 PKG_PATH("jni/UtilCtxt$UtilErrID") );
+
+    (*env)->CallVoidMethod( env, util->jutil, mid, idEnum );
     if ((*env)->ExceptionOccurred(env)) {
         (*env)->ExceptionDescribe(env);
         (*env)->ExceptionClear(env);
         XP_LOGF( "exception found" );
     }
+
+    deleteLocalRef( env, idEnum );
+
     UTIL_CBK_TAIL();
 }
 
diff --git a/xwords4/android/jni/xwjni.c b/xwords4/android/jni/xwjni.c
index 11f2ece2a..b6ff65792 100644
--- a/xwords4/android/jni/xwjni.c
+++ b/xwords4/android/jni/xwjni.c
@@ -1535,6 +1535,17 @@ Java_org_eehouse_android_xw4_jni_XwJNI_server_1tilesPicked
     XWJNI_END();
 }
 
+JNIEXPORT jint JNICALL
+Java_org_eehouse_android_xw4_jni_XwJNI_server_1countTilesInPool
+( JNIEnv* env, jclass C, GamePtrType gamePtr )
+{
+    jint result;
+    XWJNI_START();
+    result = server_countTilesInPool( state->game.server );
+    XWJNI_END();
+    return result;
+}
+
 JNIEXPORT void JNICALL
 Java_org_eehouse_android_xw4_jni_XwJNI_board_1resetEngine
 (JNIEnv* env, jclass C, GamePtrType gamePtr )
diff --git a/xwords4/common/board.c b/xwords4/common/board.c
index ad97837bf..d3f832c8c 100644
--- a/xwords4/common/board.c
+++ b/xwords4/common/board.c
@@ -120,7 +120,7 @@ static XP_Bool board_moveArrow( BoardCtxt* board, XP_Key cursorKey );
 
 static XP_Bool board_setXOffset( BoardCtxt* board, XP_U16 offset );
 static XP_Bool preflight( BoardCtxt* board, XP_Bool reveal );
-
+static XP_U16 MIN_TRADE_TILES( const BoardCtxt* board );
 
 #ifdef KEY_SUPPORT
 static XP_Bool moveKeyTileToBoard( BoardCtxt* board, XP_Key cursorKey,
@@ -830,7 +830,7 @@ XP_Bool
 board_canTrade( BoardCtxt* board )
 {
     XP_Bool result = preflight( board, XP_FALSE )
-        && MIN_TRADE_TILES <= server_countTilesInPool( board->server );
+        && MIN_TRADE_TILES(board) <= server_countTilesInPool( board->server );
     return result;
 }
 
@@ -1062,11 +1062,17 @@ board_commitTurn( BoardCtxt* board, XP_Bool phoniesConfirmed,
     } else if ( phoniesConfirmed || turnConfirmed || checkRevealTray( board ) ) {
         if ( pti->tradeInProgress ) {
             TileBit traySelBits = pti->traySelBits;
+            int count = 0;
+            for ( TileBit tmp = traySelBits; tmp != 0; tmp &= tmp - 1 ) {
+                ++count;
+            }
             result = XP_TRUE; /* there's at least the window to clean up
                                  after */
 
             if ( NO_TILES == traySelBits ) {
                 util_userError( board->util, ERR_NO_EMPTY_TRADE );
+            } else if ( count > server_countTilesInPool(board->server) ) {
+                util_userError( board->util, ERR_TOO_MANY_TRADE );
             } else {
                 TrayTileSet selTiles;
                 getSelTiles( board, traySelBits, &selTiles );
@@ -1189,7 +1195,7 @@ selectPlayerImpl( BoardCtxt* board, XP_U16 newPlayer, XP_Bool reveal,
         /* Just in case somebody started a trade when it wasn't his turn and
            there were plenty of tiles but now there aren't. */
         if ( newInfo->tradeInProgress && 
-             server_countTilesInPool(board->server) < MIN_TRADE_TILES ) {
+             server_countTilesInPool(board->server) < MIN_TRADE_TILES(board) ) {
             newInfo->tradeInProgress = XP_FALSE;
             newInfo->traySelBits = 0x00; /* clear any selected */
         }
@@ -2070,6 +2076,15 @@ preflight( BoardCtxt* board, XP_Bool reveal )
         && !TRADE_IN_PROGRESS(board);
 } /* preflight */
 
+static XP_U16
+MIN_TRADE_TILES( const BoardCtxt* board )
+{
+    const DictionaryCtxt* dict = model_getDictionary( board->model );
+    XP_LangCode langCode = dict_getLangCode( dict );
+    /* 6 is Spanish, but I swear that's not defined anywhere! */
+    return 6 == langCode ? 1 : MAX_TRAY_TILES;
+}
+
 /* Refuse with error message if any tiles are currently on board in this turn.
  * Then call the engine, and display the first move.  Return true if there's
  * any redrawing to be done.
@@ -2524,7 +2539,8 @@ board_beginTrade( BoardCtxt* board )
 
     result = preflight( board, XP_TRUE );
     if ( result ) {
-        if ( server_countTilesInPool(board->server) < MIN_TRADE_TILES){
+        XP_S16 tilesLeft = server_countTilesInPool(board->server);
+        if ( tilesLeft < MIN_TRADE_TILES( board ) ) {
             util_userError( board->util, ERR_TOO_FEW_TILES_LEFT_TO_TRADE );
         } else {
             model_resetCurrentTurn( board->model, board->selPlayer );
@@ -2551,6 +2567,7 @@ board_endTrade( BoardCtxt* board )
         invalSelTradeWindow( board );
         pti->tradeInProgress = XP_FALSE;
         pti->traySelBits = NO_TILES;
+        board_invalTrayTiles( board, ALLTILES );
     }
     return result;
 }
diff --git a/xwords4/common/model.h b/xwords4/common/model.h
index 327deaa87..b48ca5a29 100644
--- a/xwords4/common/model.h
+++ b/xwords4/common/model.h
@@ -40,11 +40,6 @@ extern "C" {
 # define NTILES_NBITS 3
 #endif
 
-/* Try making this 0, as some local rules, e.g. Spanish, allow.  Will need to
- * add UI to limit the number of tiles selected to that remaining in the pool.
- */
-#define MIN_TRADE_TILES MAX_TRAY_TILES
-
 /* apply to CellTile */
 #define TILE_VALUE_MASK 0x003F 
 #define TILE_BLANK_BIT 0x0040
diff --git a/xwords4/common/util.h b/xwords4/common/util.h
index a3b67a96b..e02ce2322 100644
--- a/xwords4/common/util.h
+++ b/xwords4/common/util.h
@@ -43,15 +43,14 @@ typedef enum {
     ERR_TOO_FEW_TILES_LEFT_TO_TRADE,
     ERR_NOT_YOUR_TURN,
     ERR_NO_PEEK_ROBOT_TILES,
-#ifndef XWFEATURE_STANDALONE_ONLY
     ERR_SERVER_DICT_WINS,
     ERR_NO_PEEK_REMOTE_TILES,
     ERR_REG_UNEXPECTED_USER, /* server asked to register too many remote
                                 users */
     ERR_REG_SERVER_SANS_REMOTE,
     STR_NEED_BT_HOST_ADDR,
-#endif
     ERR_NO_EMPTY_TRADE,
+    ERR_TOO_MANY_TRADE,
 /*     ERR_CANT_ENGINE_MID_MOVE, */
 /*     ERR_NOT_YOUR_TURN_TO_TRADE, */
 /*     ERR_NOT_YOUR_TURN_TO_MOVE, */
diff --git a/xwords4/linux/linuxutl.c b/xwords4/linux/linuxutl.c
index 44504b614..abf6c7bd0 100644
--- a/xwords4/linux/linuxutl.c
+++ b/xwords4/linux/linuxutl.c
@@ -346,6 +346,10 @@ linux_getErrString( UtilErrID id, XP_Bool* silent )
         message = "No tiles selected; trade cancelled.";
         break;
 
+    case ERR_TOO_MANY_TRADE:
+        message = "More tiles selected than remain in pool.";
+        break;
+
     case ERR_NO_HINT_FOUND:
         message = "Unable to suggest any moves.";
         break;

From 5a7d5b80dab5038e31667db5cb7907c9b4a46e76 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 29 Dec 2018 19:52:11 -0800
Subject: [PATCH 111/145] punctuation

---
 xwords4/android/app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 5352de781..aae885580 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1323,7 +1323,7 @@
               pool, so you can wind up selecting more than are
               available. You get this error message in that case. -->
     <plurals name="too_many_trade_fmt">
-      <item quantity="one">Too many tiles selected. Please select only 1</item>
+      <item quantity="one">Too many tiles selected. Please select only one.</item>
       <item quantity="other">Too many tiles selected. Please select no more than %1$d.</item>
     </plurals>
 

From e30497f33665556653485ae4c971cd099a4438fa Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 29 Dec 2018 19:56:56 -0800
Subject: [PATCH 112/145] catch another exception

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index e221fade9..675c25ea4 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2104,7 +2104,8 @@ public class GamesListDelegate extends ListDelegateBase
             boolean haveDict;
             try {
                 haveDict = GameUtils.gameDictsHere( m_activity, rowid );
-            } catch ( GameLock.GameLockedException gle ) {
+            } catch ( GameLock.GameLockedException
+                      | GameUtils.NoSuchGameException gle ) {
                 haveDict = true;
             }
             if ( haveDict ) {

From e77b8301577c95c3ad6ab5107bd0043887bc70b8 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 1 Jan 2019 19:43:44 -0800
Subject: [PATCH 113/145] replace assert with what it was to remind me to add

---
 .../src/main/java/org/eehouse/android/xw4/RelayService.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
index 4e7446879..873470bc6 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayService.java
@@ -1222,8 +1222,7 @@ public class RelayService extends JobIntentService
 
                         service.m_handler.post( new Runnable() {
                                 public void run() {
-                                    Assert.assertFalse( BuildConfig.DEBUG );
-                                    // stopUDPThreadsIf();
+                                    service.stopUDPThreads();
                                 }
                             } );
                         break;

From 3cf8d7571b8c1120bd913e816b76c6cee121702e Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@XWServe>
Date: Sat, 5 Jan 2019 18:46:58 -0800
Subject: [PATCH 114/145] fix md5sum calc for non-utf8 wordlists

And use apache logging
---
 xwords4/android/scripts/info.py | 75 +++++++++++++++------------------
 xwords4/dawg/dawg2dict.pl       | 20 ++++++---
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/xwords4/android/scripts/info.py b/xwords4/android/scripts/info.py
index 80ad70d6f..b38a65c55 100755
--- a/xwords4/android/scripts/info.py
+++ b/xwords4/android/scripts/info.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Script meant to be installed on eehouse.org.
 
-import logging, shelve, hashlib, sys, re, json, subprocess, glob, os
+import shelve, hashlib, sys, re, json, subprocess, glob, os
 import struct, random, string, psycopg2, zipfile
 import mk_for_download, mygit
 import xwconfig
@@ -87,15 +87,6 @@ g_langs = {'English' : 'en',
            'Italian' : 'it',
 }
 
-logging.basicConfig(level=logging.DEBUG
-        ,format='%(asctime)s [[%(levelname)s]] %(message)s'
-        ,datefmt='%d %b %y %H:%M'
-        ,filename='/tmp/info_py.log')
-#        ,filemode='w')
-
-# This seems to be required to prime the pump somehow.
-# logging.debug( "loaded...." )
-
 def languageCodeFor( lang ):
     result = ''
     if lang in g_langs: result = g_langs[lang]
@@ -110,7 +101,9 @@ def getInternalSum( filePath ):
                              '-dict', filePath ],
                             stdout = subprocess.PIPE,
                             stderr = subprocess.PIPE)
-    return proc.communicate()[0].strip()
+    results = proc.communicate()
+    # apache.log_error(filePath + ': ' + results[1].strip())
+    return results[0].strip()
 
 def md5Checksums( sums, filePath ):
     if not filePath.endswith(k_suffix): filePath += k_suffix
@@ -128,11 +121,11 @@ def md5Checksums( sums, filePath ):
 
             sums[filePath] = [ md5.hexdigest(), 
                                getInternalSum( filePath ) ]
-            logging.debug( "figured sum for %s: %s" % (filePath, 
+            apache.log_error( "figured sum for %s: %s" % (filePath, 
                                                        sums[filePath] ) )
             result = sums[filePath]
         except:
-            # logging.debug( "Unexpected error: " + sys.exc_info()[0] )
+            # apache.log_error( "Unexpected error: " + sys.exc_info()[0] )
             result = None
     return result
 
@@ -148,7 +141,7 @@ def openShelf():
         if not k_SUMS in s_shelf: s_shelf[k_SUMS] = {}
         if not k_COUNT in s_shelf: s_shelf[k_COUNT] = 0
     s_shelf[k_COUNT] += 1
-    # logging.debug( "Count now %d" % s_shelf[k_COUNT] )
+    # apache.log_error( "Count now %d" % s_shelf[k_COUNT] )
 
 def closeShelf():
     global s_shelf
@@ -246,7 +239,7 @@ def getVariantDir( name ):
     splits = string.split( name, '.' )
     last = splits[-1]
     if not last == 'xw4': result = last + '/'
-    # logging.debug( 'getVariantDir(' + name + ") => " + result )
+    # apache.log_error( 'getVariantDir(' + name + ") => " + result )
     return result
 
 # public, but deprecated
@@ -254,20 +247,20 @@ def curVersion( req, name, avers = 41, gvers = None, installer = None ):
     global k_versions
     result = { k_SUCCESS : True }
     if apacheAvailable:
-        logging.debug( 'IP address of requester is %s' 
+        apache.log_error( 'IP address of requester is %s'
                        % req.get_remote_host(apache.REMOTE_NAME) )
 
-    logging.debug( "name: %s; avers: %s; installer: %s; gvers: %s"
+    apache.log_error( "name: %s; avers: %s; installer: %s; gvers: %s"
                    % (name, avers, installer, gvers) )
     if name in k_versions:
         versions = k_versions[name]
         if versions[k_AVERS] > int(avers):
-            logging.debug( avers + " is old" )
+            apache.log_error( avers + " is old" )
             result[k_URL] = k_urlbase + '/' + versions[k_URL]
         else:
-            logging.debug(name + " is up-to-date")
+            apache.log_error(name + " is up-to-date")
     else:
-        logging.debug( 'Error: bad name ' + name )
+        apache.log_error( 'Error: bad name ' + name )
     return json.dumps( result )
 
 # public, but deprecated
@@ -285,7 +278,7 @@ def dictVersion( req, name, lang, md5sum ):
         if not md5sum in dictSums[path]:
             result[k_URL] = k_urlbase + "/and_wordlists/" + path
     else:
-        logging.debug( path + " not known" )
+        apache.log_error( path + " not known" )
     closeShelf()
     return json.dumps( result )
 
@@ -303,10 +296,10 @@ def getApp( params, name = None, debug = False):
                 apk = apks[0]
                 curApk = params[k_GVERS] + '.apk'
                 if curApk in apk:
-                    logging.debug( "already have " + curApk )
+                    apache.log_error( "already have " + curApk )
                 else:
                     url = k_urlbase + '/' + k_apkDir + variantDir + apk[len(dir):]
-                    logging.debug("url: " + url)
+                    apache.log_error("url: " + url)
                     result = {k_URL: url}
         elif k_DEVOK in params and params[k_DEVOK]:
             apks = getOrderedApks( k_filebase + k_apkDir, name, False )
@@ -315,18 +308,18 @@ def getApp( params, name = None, debug = False):
                 # Does path NOT contain name of installed file
                 curApk = params[k_GVERS] + '.apk'
                 if curApk in apk:
-                    logging.debug( "already have " + curApk )
+                    apache.log_error( "already have " + curApk )
                 else:
                     url = k_urlbase + '/' + apk[len(k_filebase):]
                     result = {k_URL: url}
-                    logging.debug( result )
+                    apache.log_error( result )
                     
         elif k_AVERS in params:
             vers = params[k_AVERS]
             if k_INSTALLER in params: installer = params[k_INSTALLER]
             else: installer = ''
 
-            logging.debug( "name: %s; installer: %s; gvers: %s"
+            apache.log_error( "name: %s; installer: %s; gvers: %s"
                            % (name, installer, vers) )
             print "name: %s; installer: %s; vers: %s" % (name, installer, vers)
             dir = k_filebase + k_apkDir + 'rel/'
@@ -335,11 +328,11 @@ def getApp( params, name = None, debug = False):
                 apk = apk[len(k_filebase):] # strip fs path
                 result = {k_URL: k_urlbase + '/' + apk}
             else:
-                logging.debug(name + " is up-to-date")
+                apache.log_error(name + " is up-to-date")
         else:
-            logging.debug( 'Error: bad name ' + name )
+            apache.log_error( 'Error: bad name ' + name )
     else:
-        logging.debug( 'missing param' )
+        apache.log_error( 'missing param' )
     return result
 
 def getStats( path ):
@@ -434,7 +427,7 @@ def getDicts( params ):
                         k_INDEX : index, k_ISUM: dictSums[path][1] }
                 result.append( cur )
         else:
-            logging.debug( path + " not known" )
+            apache.log_error( path + " not known" )
 
     closeShelf()
     if 0 == len(result): result = None
@@ -442,16 +435,16 @@ def getDicts( params ):
 
 def variantFor( name ):
     if name == 'xw4': result = 'XWords4'
-    logging.debug( 'variantFor(%s)=>%s' % (name, result))
+    apache.log_error( 'variantFor(%s)=>%s' % (name, result))
     return result
 
 def getXlate( params, name, stringsHash ):
     result = []
     path = xwconfig.k_REPOPATH
-    logging.debug('creating repo with path ' + path)
+    apache.log_error('creating repo with path ' + path)
     repo = mygit.GitRepo( path )
-    logging.debug( "getXlate: %s, hash=%s" % (json.dumps(params), stringsHash) )
-    # logging.debug( 'status: ' + repo.status() )
+    apache.log_error( "getXlate: %s, hash=%s" % (json.dumps(params), stringsHash) )
+    # apache.log_error( 'status: ' + repo.status() )
 
     # reduce org.eehouse.anroid.xxx to xxx, then turn it into a
     # variant and get the contents of the R.java file
@@ -466,7 +459,7 @@ def getXlate( params, name, stringsHash ):
     # the revision BEFORE the revision that changed R.java
 
     head = repo.getHeadRev()
-    logging.debug('head = %s' % head)
+    apache.log_error('head = %s' % head)
     rjavarevs = repo.getRevsBetween(head, stringsHash, rPath)
     if rjavarevs:
         assert( 1 >= len(rjavarevs) )
@@ -477,7 +470,7 @@ def getXlate( params, name, stringsHash ):
             firstPossible = rjavarevs[-2] + '^'
             # get actual number for rev^
             firstPossible = repo.getRevsBetween( firstPossible, firstPossible )[0]
-        logging.debug('firstPossible: %s' % firstPossible)
+        apache.log_error('firstPossible: %s' % firstPossible)
 
         for entry in params:
             curVers = entry[k_XLATEVERS]
@@ -493,7 +486,7 @@ def getXlate( params, name, stringsHash ):
                                           } )
 
     if 0 == len(result): result = None
-    logging.debug( "getXlate=>%s" % (json.dumps(result)) )
+    apache.log_error( "getXlate=>%s" % (json.dumps(result)) )
     return result
 
 def init():
@@ -549,7 +542,7 @@ def opponentIDsFor( req, params ):
 def getUpdates( req, params ):
     result = { k_SUCCESS : True }
     appResult = None
-    logging.debug( "getUpdates: got params: %s" % params )
+    apache.log_error( "getUpdates: got params: %s" % params )
     asJson = json.loads( params )
     if k_APP in asJson:
         name = None
@@ -564,15 +557,15 @@ def getUpdates( req, params ):
 
     # Let's not upgrade strings at the same time as we're upgrading the app
     # if appResult:
-    #     logging.debug( 'skipping xlation upgrade because app being updated' )
+    #     apache.log_error( 'skipping xlation upgrade because app being updated' )
     # elif k_XLATEINFO in asJson and k_NAME in asJson and k_STRINGSHASH in asJson:
     #     xlateResult = getXlate( asJson[k_XLATEINFO], asJson[k_NAME], asJson[k_STRINGSHASH] )
     #     if xlateResult:
-    #         logging.debug( xlateResult )
+    #         apache.log_error( xlateResult )
     #         result[k_XLATEINFO] = xlateResult;
         
     result = json.dumps( result )
-    # logging.debug( result )
+    # apache.log_error( result )
     return result
 
 def clearShelf():
diff --git a/xwords4/dawg/dawg2dict.pl b/xwords4/dawg/dawg2dict.pl
index d28ac87bb..977228fd7 100755
--- a/xwords4/dawg/dawg2dict.pl
+++ b/xwords4/dawg/dawg2dict.pl
@@ -35,6 +35,7 @@ my $gDoRaw = 0;
 my $gDoJSON = 0;
 my $gFileType;
 my $gNodeSize;
+my $gIsUTF;
 
 use Fcntl 'SEEK_CUR';
 
@@ -98,9 +99,12 @@ sub readXWDFaces($$$) {
     $nRead = sysread( $fh, $buf, 1 );
     $nBytes = unpack( 'c', $buf );
     printf STDERR "nBytes of faces: %d\n", $nBytes;
-    $nRead = sysread( $fh, $buf, 1 );
-    $nChars = unpack( 'c', $buf );
-    printf STDERR "nChars of faces: %d\n", $nChars;
+
+	if ( $gIsUTF ) {
+		$nRead = sysread( $fh, $buf, 1 );
+		$nChars = unpack( 'c', $buf );
+		printf STDERR "nChars of faces: %d\n", $nChars;
+	}
 
     # At this point $fh is pointing at the start of data
     if ( $gSumOnly ) {
@@ -224,13 +228,17 @@ sub nodeSizeFromFlags($$) {
 
 	$flags = $flags & ~DICT_SYNONYMS_MASK;
 
+	my $nodeSize;
     if ( $flags == 2 || $flags == 4 ) {
-        return 3;
+        $nodeSize = 3;
     } elsif ( $flags == 3 || $flags == 5 ) {
-        return 4;
+		$nodeSize = 4;
     } else {
         die "invalid dict flags $flags";
     }
+	my $isUTF = $flags == 4 || $flags == 5;
+
+	return ( $nodeSize, $isUTF );
 } # nodeSizeFromFlags
 
 sub mergeSpecials($$) {
@@ -268,7 +276,7 @@ sub prepXWD($$$$) {
     my $nRead = sysread( $fh, $buf, 2 );
     my $flags = unpack( "n", $buf );
 
-    $gNodeSize = nodeSizeFromFlags( $fh, $flags );
+    ($gNodeSize, $gIsUTF) = nodeSizeFromFlags( $fh, $flags );
 
     my $nSpecials;
     my $faceCount = readXWDFaces( $fh, $facRef, \$nSpecials ); # does checksum

From cace99818d8f3a9e033dd00847e81bf9703d87ee Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 5 Jan 2019 11:46:48 -0800
Subject: [PATCH 115/145] remove dead code

---
 .../org/eehouse/android/xw4/DictsDelegate.java  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
index c02d61c19..6cd901c7a 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictsDelegate.java
@@ -1063,23 +1063,6 @@ public class DictsDelegate extends ListDelegateBase
         return items;
     }
 
-    // private static Intent mkDownloadIntent( Context context, String dict_url )
-    // {
-        // Uri uri = Uri.parse( dict_url );
-        // Intent intent = new Intent( Intent.ACTION_VIEW, uri );
-        // intent.setFlags( Intent.FLAG_ACTIVITY_NEW_TASK );
-        // return intent;
-    // }
-
-    private static Intent mkDownloadIntent( Context context,
-                                            int lang, String dict )
-    {
-        Assert.fail();
-        return null;
-        // String dict_url = Utils.makeDictUri( context, lang, dict );
-        // return mkDownloadIntent( context, dict_url );
-    }
-
     public static void downloadForResult( Delegator delegator, RequestCode requestCode,
                                           int lang )
     {

From 105e8e26231405c8d635039e2d0eb2925f871689 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 5 Jan 2019 18:54:48 -0800
Subject: [PATCH 116/145] add logging

Keep some stuff added to debug problem with dict checksums on server.
---
 .../eehouse/android/xw4/DictLangCache.java    |  2 +-
 .../org/eehouse/android/xw4/NetUtils.java     | 24 +++++++++++++++++--
 xwords4/android/jni/jniutlswrapper.c          |  9 +++++++
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
index 9573533a5..3105ecea9 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DictLangCache.java
@@ -326,7 +326,7 @@ public class DictLangCache {
     public static void inval( final Context context, String name,
                               DictLoc loc, boolean added )
     {
-        DBUtils.dictsRemoveInfo( context, name );
+        DBUtils.dictsRemoveInfo( context, DictUtils.removeDictExtn( name ) );
 
         if ( added ) {
             DictAndLoc dal = new DictAndLoc( name, loc );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
index 1c07bf43b..3ea61d723 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/NetUtils.java
@@ -275,8 +275,10 @@ public class NetUtils {
                     }
                     result = new String( bas.toByteArray() );
                 } else {
-                    Log.w( TAG, "runConn: responseCode: %d for url: %s",
-                           responseCode, conn.getURL() );
+                    Log.w( TAG, "runConn: responseCode: %d/%s for url: %s",
+                           responseCode, conn.getResponseMessage(),
+                           conn.getURL() );
+                    logErrorStream( conn.getErrorStream() );
                 }
             } catch ( java.net.ProtocolException pe ) {
                 Log.ex( TAG, pe );
@@ -288,6 +290,24 @@ public class NetUtils {
         return result;
     }
 
+    private static void logErrorStream( InputStream is )
+    {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            byte[] buffer = new byte[1024];
+            for ( ; ; ) {
+                int length = is.read( buffer );
+                if ( length == -1 ) {
+                    break;
+                }
+                baos.write( buffer, 0, length );
+            }
+            Log.e( TAG, baos.toString() );
+        } catch (Exception ex) {
+            Log.e( TAG, ex.getMessage() );
+        }
+    }
+
     // This handles multiple params but only every gets passed one!
     private static String getPostDataString( Map<String, String> params )
     {
diff --git a/xwords4/android/jni/jniutlswrapper.c b/xwords4/android/jni/jniutlswrapper.c
index 3deccbbdd..fbb54f202 100644
--- a/xwords4/android/jni/jniutlswrapper.c
+++ b/xwords4/android/jni/jniutlswrapper.c
@@ -103,6 +103,15 @@ and_util_getMD5SumForDict( JNIUtilCtxt* jniutil, const XP_UCHAR* name,
     jstring result = 
         (*env)->CallObjectMethod( env, jniutil->jjniutil, mid, jname, jbytes );
     deleteLocalRefs( env, jname, jbytes, DELETE_NO_REF );
+
+#ifdef DEBUG
+    if ( !!result ) {
+        const char* chars = (*env)->GetStringUTFChars( env, result, NULL );
+        XP_LOGF( "%s(%s, len=%d) => %s", __func__, name, len, chars );
+        (*env)->ReleaseStringUTFChars( env, result, chars );
+    }
+#endif
+
     return result;
 }
 

From 5a64b3b92ff0b106b2b170808492cf6bf6e8f40a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 08:59:38 -0800
Subject: [PATCH 117/145] Fix problems inviting SMS on emulator

Likely no-ops on real devices
---
 .../src/main/java/org/eehouse/android/xw4/Perms23.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index 5f3ff3cdc..094aa7264 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -192,9 +192,11 @@ public class Perms23 {
                     } );
             }
             builder.asyncQuery( m_delegate.getActivity(), new PermCbck() {
+                    @Override
                     public void onPermissionResult( Map<Perm, Boolean> perms ) {
                         if ( Action.SKIP_CALLBACK != m_action ) {
-                            if ( perms.get( m_perm ) ) {
+                            Boolean got = perms.get( m_perm );
+                            if ( null != got && got ) {
                                 m_delegate.onPosButton( m_action, m_params );
                             } else {
                                 m_delegate.onNegButton( m_action, m_params );
@@ -302,12 +304,11 @@ public class Perms23 {
         return result;
     }
 
-    // This is probably overkill as the OS only allows one permission request
-    // at a time
+    // If two permission requests are made in a row the map may contain more
+    // than one entry.
     private static int s_nextRecord = 0;
     private static int register( PermCbck cbck )
     {
-        Assert.assertTrue( !BuildConfig.DEBUG || 0 == s_map.size() );
         DbgUtils.assertOnUIThread();
         int code = ++s_nextRecord;
         s_map.put( code, cbck );

From 5da32d93f79e8f004133c78cbd20da8f60c32fdf Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 10:58:12 -0800
Subject: [PATCH 118/145] fix double-launch of SMSInvite activity

Adding a second permission a while back resulted in two Actions being
received and acted on. Needed instead to group the two and receive a
single Action IFF both were granted.
---
 .../eehouse/android/xw4/BoardDelegate.java    |  8 +--
 .../java/org/eehouse/android/xw4/Perms23.java | 59 ++++++++++++++-----
 .../app/src/main/res/values/strings.xml       |  2 +-
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 830bd28ab..4161dc59e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -535,7 +535,7 @@ public class BoardDelegate extends DelegateBase
                             finish();
                         }
                     };
-                alert.setNoDismissListenerNeg( ab, R.string.button_wait, lstnr );
+                alert.setNoDismissListenerNeg( ab, R.string.button_close, lstnr );
             }
 
             dialog = ab.create();
@@ -1220,9 +1220,9 @@ public class BoardDelegate extends DelegateBase
                                                   RequestCode.BT_INVITE_RESULT );
                 break;
             case SMS:
-                Perms23.tryGetPerms( this, Perm.SEND_SMS, R.string.sms_invite_rationale,
-                                     Action.INVITE_SMS, m_mySIS.nMissing, info );
-                Perms23.tryGetPerms( this, Perm.RECEIVE_SMS, R.string.sms_invite_rationale,
+                Perms23.tryGetPerms( this, new Perm[] { Perm.SEND_SMS,
+                                                        Perm.RECEIVE_SMS },
+                                     R.string.sms_invite_rationale,
                                      Action.INVITE_SMS, m_mySIS.nMissing, info );
                 break;
             case RELAY:
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
index 094aa7264..d4ea7541e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/Perms23.java
@@ -31,6 +31,7 @@ import android.support.v4.content.ContextCompat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -81,6 +82,12 @@ public class Perms23 {
             m_perms.addAll( perms );
         }
 
+        public Builder( Perm[] perms ) {
+            for ( Perm perm : perms ) {
+                m_perms.add( perm );
+            }
+        }
+
         public Builder( Perm perm ) {
             m_perms.add( perm );
         }
@@ -129,7 +136,7 @@ public class Perms23 {
 
             if ( haveAll ) {
                 if ( null != cbck ) {
-                    Map<Perm, Boolean> map = new HashMap<Perm, Boolean>();
+                    Map<Perm, Boolean> map = new HashMap<>();
                     for ( Perm perm : m_perms ) {
                         map.put( perm, true );
                     }
@@ -150,36 +157,37 @@ public class Perms23 {
 
     private static class QueryInfo {
         private Action m_action;
-        private Perm m_perm;
+        private Perm[] m_perms;
         private DelegateBase m_delegate;
         private String m_rationaleMsg;
         private Object[] m_params;
 
         private QueryInfo( DelegateBase delegate, Action action,
-                           Perm perm, String msg, Object[] params ) {
+                           Perm[] perms, String msg, Object[] params ) {
             m_delegate = delegate;
             m_action = action;
-            m_perm = perm;
+            m_perms = perms;
             m_rationaleMsg = msg;
             m_params = params;
         }
 
         private QueryInfo( DelegateBase delegate, Object[] params )
         {
-            this( delegate, (Action)params[0], (Perm)params[1], (String)params[2],
+            this( delegate, (Action)params[0], (Perm[])params[1], (String)params[2],
                   (Object[])params[3] );
         }
 
         private Object[] getParams()
         {
-            return new Object[] { m_action, m_perm, m_rationaleMsg, m_params };
+            return new Object[] { m_action, m_perms, m_rationaleMsg, m_params };
         }
 
         private void doIt( boolean showRationale )
         {
-            Builder builder = new Builder( m_perm );
+            Builder builder = new Builder( m_perms );
             if ( showRationale && null != m_rationaleMsg ) {
                 builder.setOnShowRationale( new OnShowRationale() {
+                        @Override
                         public void onShouldShowRationale( Set<Perm> perms ) {
                             m_delegate.makeConfirmThenBuilder( m_rationaleMsg,
                                                                Action.PERMS_QUERY )
@@ -195,8 +203,18 @@ public class Perms23 {
                     @Override
                     public void onPermissionResult( Map<Perm, Boolean> perms ) {
                         if ( Action.SKIP_CALLBACK != m_action ) {
-                            Boolean got = perms.get( m_perm );
-                            if ( null != got && got ) {
+                            Set<Perm> keys = perms.keySet();
+
+                            // We need all the sought perms to have been granted
+                            boolean allGood = keys.size() == m_params.length;
+                            for ( Iterator<Perm> iter = keys.iterator();
+                                  allGood && iter.hasNext(); ) {
+                                if ( !perms.get(iter.next()) ) {
+                                    allGood = false;
+                                }
+                            }
+
+                            if ( allGood ) {
                                 m_delegate.onPosButton( m_action, m_params );
                             } else {
                                 m_delegate.onNegButton( m_action, m_params );
@@ -234,23 +252,36 @@ public class Perms23 {
      * Request permissions, giving rationale once, then call with action and
      * either positive or negative, the former if permission granted.
      */
-    public static void tryGetPerms( DelegateBase delegate, Perm perm, int rationaleId,
+    public static void tryGetPerms( DelegateBase delegate, Perm[] perms, int rationaleId,
                                     final Action action, Object... params )
     {
         // Log.d( TAG, "tryGetPerms(%s)", perm.toString() );
         Context context = XWApp.getContext();
         String msg = rationaleId == 0
             ? null : LocUtils.getString( context, rationaleId );
-        tryGetPerms( delegate, perm, msg, action, params );
+        tryGetPerms( delegate, perms, msg, action, params );
+    }
+
+    public static void tryGetPerms( DelegateBase delegate, Perm[] perms,
+                                    String rationaleMsg, final Action action,
+                                    Object... params )
+    {
+        // Log.d( TAG, "tryGetPerms(%s)", perm.toString() );
+        new QueryInfo( delegate, action, perms, rationaleMsg, params )
+            .doIt( true );
     }
 
     public static void tryGetPerms( DelegateBase delegate, Perm perm,
                                     String rationaleMsg, final Action action,
                                     Object... params )
     {
-        // Log.d( TAG, "tryGetPerms(%s)", perm.toString() );
-        new QueryInfo( delegate, action, perm, rationaleMsg, params )
-            .doIt( true );
+        tryGetPerms( delegate, new Perm[]{ perm }, rationaleMsg, action, params );
+    }
+
+    public static void tryGetPerms( DelegateBase delegate, Perm perm, int rationaleId,
+                                    final Action action, Object... params )
+    {
+        tryGetPerms( delegate, new Perm[]{perm}, rationaleId, action, params );
     }
 
     public static void onGotPermsAction( DelegateBase delegate, boolean positive,
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index aae885580..6f490d757 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2462,7 +2462,7 @@
     <string name="waiting_invite_title">Waiting for response</string>
     <string name="waiting_rematch_title">Rematch in progress</string>
     <!-- Button for alert with title above -->
-    <string name="button_wait">Wait</string>
+    <string name="button_close">Close</string>
     <string name="button_reinvite">Re-invite</string>
 
     <string name="invite_stays">(This dialog will stay up until all

From aecce2826e97d486b579f720b3d99cf5510097aa Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 11:12:59 -0800
Subject: [PATCH 119/145] revert change making userError() take an enum

The set's open-ended on the C side, meaning that an int can't be
converted to an enum reliably. Yay for asserts that caught this.
---
 .../eehouse/android/xw4/BoardDelegate.java    |  2 +-
 .../org/eehouse/android/xw4/jni/UtilCtxt.java | 48 +++++++++----------
 .../eehouse/android/xw4/jni/UtilCtxtImpl.java |  2 +-
 xwords4/android/jni/utilwrapper.c             | 10 +---
 4 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index 4161dc59e..b71fb3592 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -1858,7 +1858,7 @@ public class BoardDelegate extends DelegateBase
         }
 
         @Override
-        public void userError( UtilErrID code )
+        public void userError( int code )
         {
             int resid = 0;
             boolean asToast = false;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
index 69c525b1d..acd793caa 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxt.java
@@ -67,31 +67,31 @@ public interface UtilCtxt {
     void notifyMove( String query );
     void notifyTrade( String[] tiles );
 
-    // Must be kept in sync with enum in common/util.h
-    enum UtilErrID {
-        ERR_NONE,                   /* 0 is special case */
-        ERR_TILES_NOT_IN_LINE,   /* scoring a move where tiles aren't in line */
-        ERR_NO_EMPTIES_IN_TURN,
-        ERR_TWO_TILES_FIRST_MOVE,
-        ERR_TILES_MUST_CONTACT,
-        ERR_TOO_FEW_TILES_LEFT_TO_TRADE,
-        ERR_NOT_YOUR_TURN,
-        ERR_NO_PEEK_ROBOT_TILES,
-        ERR_SERVER_DICT_WINS,
-        ERR_NO_PEEK_REMOTE_TILES,
-        ERR_REG_UNEXPECTED_USER, /* server asked to register too many remote
-                                    users */
-        ERR_REG_SERVER_SANS_REMOTE,
-        STR_NEED_BT_HOST_ADDR,
-        ERR_NO_EMPTY_TRADE,
-        ERR_TOO_MANY_TRADE,
-        ERR_CANT_UNDO_TILEASSIGN,
-        ERR_CANT_HINT_WHILE_DISABLED,
-        ERR_NO_HINT_FOUND,          /* not really an error... */
-    };
+    // These can't be an ENUM! The set is open-ended, with arbitrary values
+    // added to ERR_RELAY_BASE, so no way to create an enum from an int in the
+    // jni world. int has to be passed into userError(). Trust me: I
+    // tried. :-)
+    static final int ERR_NONE = 0;
+    static final int ERR_TILES_NOT_IN_LINE = 1;
+    static final int ERR_NO_EMPTIES_IN_TURN = 2;
+    static final int ERR_TWO_TILES_FIRST_MOVE = 3;
+    static final int ERR_TILES_MUST_CONTACT = 4;
+    static final int ERR_TOO_FEW_TILES_LEFT_TO_TRADE = 5;
+    static final int ERR_NOT_YOUR_TURN = 6;
+    static final int ERR_NO_PEEK_ROBOT_TILES = 7;
+    static final int ERR_SERVER_DICT_WINS = 8;
+    static final int ERR_NO_PEEK_REMOTE_TILES = 9;
+    static final int ERR_REG_UNEXPECTED_USER = 10;
+    static final int ERR_REG_SERVER_SANS_REMOTE = 11;
+    static final int STR_NEED_BT_HOST_ADDR = 12;
+    static final int ERR_NO_EMPTY_TRADE = 13;
+    static final int ERR_TOO_MANY_TRADE = 14;
+    static final int ERR_CANT_UNDO_TILEASSIGN = 15;
+    static final int ERR_CANT_HINT_WHILE_DISABLED = 16;
+    static final int ERR_NO_HINT_FOUND = 17;
 
-    static final int ERR_RELAY_BASE = 17;
-    void userError( UtilErrID id );
+    static final int ERR_RELAY_BASE = 18;
+    void userError( int id );
 
     void informMove( int turn, String expl, String words );
     void informUndo();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
index c3684303f..2a1c30043 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/UtilCtxtImpl.java
@@ -128,7 +128,7 @@ public class UtilCtxtImpl implements UtilCtxt {
     }
 
     @Override
-    public void userError( UtilErrID id )
+    public void userError( int id )
     {
         subclassOverride( "userError" );
     }
diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index e02f4f5f3..56c7bb104 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -120,20 +120,14 @@ static XWBonusType and_util_getSquareBonus( XW_UtilCtxt* XP_UNUSED(uc),
 static void
 and_util_userError( XW_UtilCtxt* uc, UtilErrID id )
 {
-    UTIL_CBK_HEADER( "userError", "(L" PKG_PATH("jni/UtilCtxt$UtilErrID") ";)V" );
-
-    jobject idEnum = intToJEnum( env, id,
-                                 PKG_PATH("jni/UtilCtxt$UtilErrID") );
-
-    (*env)->CallVoidMethod( env, util->jutil, mid, idEnum );
+    UTIL_CBK_HEADER( "userError", "(I)V" );
+    (*env)->CallVoidMethod( env, util->jutil, mid, id );
     if ((*env)->ExceptionOccurred(env)) {
         (*env)->ExceptionDescribe(env);
         (*env)->ExceptionClear(env);
         XP_LOGF( "exception found" );
     }
 
-    deleteLocalRef( env, idEnum );
-
     UTIL_CBK_TAIL();
 }
 

From d868fef0d2f3aa423c3344db097ac990cd2b3e46 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 12:04:51 -0800
Subject: [PATCH 120/145] revert space-only change

---
 xwords4/android/jni/utilwrapper.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xwords4/android/jni/utilwrapper.c b/xwords4/android/jni/utilwrapper.c
index 56c7bb104..03eab0bf4 100644
--- a/xwords4/android/jni/utilwrapper.c
+++ b/xwords4/android/jni/utilwrapper.c
@@ -127,7 +127,6 @@ and_util_userError( XW_UtilCtxt* uc, UtilErrID id )
         (*env)->ExceptionClear(env);
         XP_LOGF( "exception found" );
     }
-
     UTIL_CBK_TAIL();
 }
 

From 3a0e67c7b398d7c8c8764f6b1171557a3eab363d Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 12:05:30 -0800
Subject: [PATCH 121/145] remove unreachable code

---
 .../org/eehouse/android/xw4/BTInviteDelegate.java   | 13 -------------
 .../java/org/eehouse/android/xw4/BTService.java     | 12 ------------
 2 files changed, 25 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 31c712cdb..a5b3e989d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -73,7 +73,6 @@ public class BTInviteDelegate extends InviteDelegate {
                                         m_nMissing );
         super.init( msg, 0 );
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
-        BTService.clearDevices( m_activity, null ); // will return names
 
         scan();
     }
@@ -171,18 +170,6 @@ public class BTInviteDelegate extends InviteDelegate {
         tryEnable();
     }
 
-    private void removeSelected()
-    {
-        Set<InviterItem> checked = getChecked();
-        String[] devs = new String[checked.size()];
-        Iterator<InviterItem> iter = checked.iterator();
-        for ( int ii = 0; iter.hasNext(); ++ii ) {
-            TwoStringPair pair = (TwoStringPair)iter.next();
-            devs[ii] = pair.str1;
-        }
-        BTService.clearDevices( m_activity, devs );
-    }
-
     // DlgDelegate.DlgClickNotify interface
     @Override
     public boolean onPosButton( Action action, Object[] params )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index 44f256554..b7044d97f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -101,7 +101,6 @@ public class BTService extends XWService {
                             INVITE,
                             SEND,
                             RADIO,
-                            CLEAR,
                             REMOVE,
                             NFCINVITE,
                             PINGHOST,
@@ -113,7 +112,6 @@ public class BTService extends XWService {
     private static final String ADDR_KEY = "ADR";
     private static final String SCAN_TIMEOUT_KEY = "SCAN_TIMEOUT";
     private static final String RADIO_KEY = "RDO";
-    private static final String CLEAR_KEY = "CLR";
 
     private static final String GAMEID_KEY = "GMI";
     private static final String GAMEDATA_KEY = "GD";
@@ -323,13 +321,6 @@ public class BTService extends XWService {
         startService( context, intent );
     }
 
-    public static void clearDevices( Context context, String[] btAddrs )
-    {
-        Intent intent = getIntentTo( context, BTAction.CLEAR )
-            .putExtra( CLEAR_KEY, btAddrs );
-        startService( context, intent );
-    }
-
     public static void scan( Context context, int timeoutMS )
     {
         Intent intenet = getIntentTo( context, BTAction.SCAN )
@@ -499,9 +490,6 @@ public class BTService extends XWService {
                     setTimeoutTimer();
                     break;
 
-                case CLEAR:
-                    String[] btAddrs = intent.getStringArrayExtra( CLEAR_KEY );
-                    break;
                 case SCAN:
                     int timeout = intent.getIntExtra( SCAN_TIMEOUT_KEY, -1 );
                     m_sender.add( new BTQueueElem( BTCmd.SCAN, timeout ) );

From 2f508c0b5ce79213545043a8403e12e74443df07 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 12:30:31 -0800
Subject: [PATCH 122/145] persist BT invitee dev scan results

Only launch the scan automatically when the persisted list is empty.
---
 .../eehouse/android/xw4/BTInviteDelegate.java | 26 ++++++++++++++++++-
 .../eehouse/android/xw4/InviteDelegate.java   |  4 ++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index a5b3e989d..fbd284416 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -37,6 +37,7 @@ import java.util.Set;
 
 public class BTInviteDelegate extends InviteDelegate {
     private static final String TAG = BTInviteDelegate.class.getSimpleName();
+    private static final String KEY_PAIRS = TAG + "_pairs";
     private static final int[] BUTTONIDS = { R.id.button_scan,
                                              R.id.button_settings,
     };
@@ -74,7 +75,12 @@ public class BTInviteDelegate extends InviteDelegate {
         super.init( msg, 0 );
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
 
-        scan();
+        m_pairs = loadPairs();
+        if ( m_pairs == null || m_pairs.length == 0 ) {
+            scan();
+        } else {
+            updateListAdapter( m_pairs );
+        }
     }
 
     @Override
@@ -165,11 +171,29 @@ public class BTInviteDelegate extends InviteDelegate {
         DbgUtils.assertOnUIThread();
 
         m_pairs = TwoStringPair.add( m_pairs, dev.getAddress(), dev.getName() );
+        storePairs( m_pairs );
 
         updateListAdapter( m_pairs );
         tryEnable();
     }
 
+    private TwoStringPair[] loadPairs()
+    {
+        TwoStringPair[] pairs = null;
+        try {
+            String str64 = DBUtils.getStringFor( m_activity, KEY_PAIRS, null );
+            pairs = (TwoStringPair[])Utils.string64ToSerializable( str64 );
+        } catch ( Exception ex ) {} // NPE, de-serialization problems, etc.
+        return pairs;
+    }
+
+    private void storePairs( TwoStringPair[] pairs )
+    {
+        String str64 = pairs == null
+            ? "" : Utils.serializableToString64( pairs );
+        DBUtils.setStringFor( m_activity, KEY_PAIRS, str64 );
+    }
+
     // DlgDelegate.DlgClickNotify interface
     @Override
     public boolean onPosButton( Action action, Object[] params )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index 0bb1f2453..d5c9f5249 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -36,6 +36,8 @@ import android.widget.FrameLayout;
 import android.widget.ListView;
 import android.widget.Spinner;
 import android.widget.TextView;
+
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -53,7 +55,7 @@ abstract class InviteDelegate extends ListDelegateBase
         String getDev();        // the string that identifies this item in results
     }
 
-    protected static class TwoStringPair implements InviterItem {
+    protected static class TwoStringPair implements InviterItem, Serializable {
         public String str1;
         public String str2;
 

From c7f9fc465f2df2881176ffc887f897a501275198 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 13:40:49 -0800
Subject: [PATCH 123/145] persist and display most recent scan time

---
 .../eehouse/android/xw4/BTInviteDelegate.java | 70 +++++++++++++------
 .../app/src/main/res/values/strings.xml       |  3 +
 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index fbd284416..d1e4fbc4b 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -26,25 +26,41 @@ import android.app.ProgressDialog;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.Button;
 
 import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
+import java.io.Serializable;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
 
 public class BTInviteDelegate extends InviteDelegate {
     private static final String TAG = BTInviteDelegate.class.getSimpleName();
-    private static final String KEY_PAIRS = TAG + "_pairs";
+    private static final String KEY_PERSIST = TAG + "_persist";
     private static final int[] BUTTONIDS = { R.id.button_scan,
                                              R.id.button_settings,
     };
     private Activity m_activity;
-    private TwoStringPair[] m_pairs;
     private ProgressDialog m_progress;
 
+    private static class Persisted implements Serializable {
+        TwoStringPair[] pairs;
+        // HashMap: m_stamps is serialized, so can't be abstract type
+        HashMap<String, Long> stamps = new HashMap<>();
+
+        void add( BluetoothDevice dev ) {
+            pairs = TwoStringPair.add( pairs, dev.getAddress(), dev.getName() );
+            stamps.put( dev.getName(), System.currentTimeMillis() );
+        }
+
+        boolean empty() { return pairs == null || pairs.length == 0; }
+    }
+    private Persisted mPersisted;
+
     public static void launchForResult( Activity activity, int nMissing,
                                         SentInvitesInfo info,
                                         RequestCode requestCode )
@@ -75,11 +91,11 @@ public class BTInviteDelegate extends InviteDelegate {
         super.init( msg, 0 );
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
 
-        m_pairs = loadPairs();
-        if ( m_pairs == null || m_pairs.length == 0 ) {
+        load();
+        if ( mPersisted.empty() ) {
             scan();
         } else {
-            updateListAdapter( m_pairs );
+            updateListAdapter( mPersisted.pairs );
         }
     }
 
@@ -106,7 +122,7 @@ public class BTInviteDelegate extends InviteDelegate {
                     public void run() {
                         m_progress.cancel();
 
-                        if ( null == m_pairs || m_pairs.length == 0 ) {
+                        if ( mPersisted.empty() ) {
                             makeNotAgainBuilder( R.string.not_again_emptybtscan,
                                                  R.string.key_notagain_emptybtscan )
                                 .show();
@@ -130,10 +146,16 @@ public class BTInviteDelegate extends InviteDelegate {
     @Override
     protected void onChildAdded( View child, InviterItem data )
     {
-        TwoStrsItem item = (TwoStrsItem)child;
-        TwoStringPair pair = (TwoStringPair)data;
-        // null: we don't display mac address
-        ((TwoStrsItem)child).setStrings( pair.str2, null );
+        String devName = ((TwoStringPair)data).str2;
+
+        String msg = null;
+        if ( mPersisted.stamps.containsKey( devName ) ) {
+            long lastSeenMS = mPersisted.stamps.get( devName );
+            CharSequence elapsed = DateUtils.getRelativeTimeSpanString( lastSeenMS );
+            msg = getString( R.string.bt_scan_age_fmt, elapsed );
+        }
+
+        ((TwoStrsItem)child).setStrings( devName, msg );
     }
 
     @Override
@@ -151,7 +173,7 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
-            m_pairs = null;
+            mPersisted.pairs = null;
             updateListAdapter( null );
 
             String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
@@ -170,28 +192,30 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         DbgUtils.assertOnUIThread();
 
-        m_pairs = TwoStringPair.add( m_pairs, dev.getAddress(), dev.getName() );
-        storePairs( m_pairs );
+        mPersisted.add( dev );
+        store();
 
-        updateListAdapter( m_pairs );
+        updateListAdapter( mPersisted.pairs );
         tryEnable();
     }
 
-    private TwoStringPair[] loadPairs()
+    private void load()
     {
-        TwoStringPair[] pairs = null;
         try {
-            String str64 = DBUtils.getStringFor( m_activity, KEY_PAIRS, null );
-            pairs = (TwoStringPair[])Utils.string64ToSerializable( str64 );
+            String str64 = DBUtils.getStringFor( m_activity, KEY_PERSIST, null );
+            mPersisted = (Persisted)Utils.string64ToSerializable( str64 );
         } catch ( Exception ex ) {} // NPE, de-serialization problems, etc.
-        return pairs;
+
+        if ( null == mPersisted ) {
+            mPersisted = new Persisted();
+        }
     }
 
-    private void storePairs( TwoStringPair[] pairs )
+    private void store()
     {
-        String str64 = pairs == null
-            ? "" : Utils.serializableToString64( pairs );
-        DBUtils.setStringFor( m_activity, KEY_PAIRS, str64 );
+        String str64 = mPersisted == null
+            ? "" : Utils.serializableToString64( mPersisted );
+        DBUtils.setStringFor( m_activity, KEY_PERSIST, str64 );
     }
 
     // DlgDelegate.DlgClickNotify interface
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 6f490d757..f479237a6 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2408,6 +2408,9 @@
 	within Bluetooth range and that CrossWords is installed on
 	it.</string>
 
+    <!-- How long ago did we last see a BT device via scan -->
+    <string name="bt_scan_age_fmt">Last scan response: %1$s</string>
+
 	<!-- label within default wordlists in app preferences -->
 	<string name="default_language">Default language</string>
 

From 853578eb7dc9819ca662827d4050ecefb8df8725 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 14:34:43 -0800
Subject: [PATCH 124/145] don't drop known BT devices on every scan

Instead, keep them forever (for now), sorted by how long since they were
last seen. A Delete button's probably needed to prevent ex-partners from
sticking around too long. :-)
---
 .../eehouse/android/xw4/BTInviteDelegate.java | 57 ++++++++++++++++---
 .../app/src/main/res/values/strings.xml       | 11 ++--
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index d1e4fbc4b..6538ec013 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -1,6 +1,6 @@
 /* -*- compile-command: "find-and-gradle.sh insXw4Deb"; -*- */
 /*
- * Copyright 2009 - 2016 by Eric House (xwords@eehouse.org).  All rights
+ * Copyright 2009 - 2019 by Eric House (xwords@eehouse.org).  All rights
  * reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -34,6 +34,8 @@ import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
 import java.io.Serializable;
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Set;
@@ -53,11 +55,47 @@ public class BTInviteDelegate extends InviteDelegate {
         HashMap<String, Long> stamps = new HashMap<>();
 
         void add( BluetoothDevice dev ) {
-            pairs = TwoStringPair.add( pairs, dev.getAddress(), dev.getName() );
-            stamps.put( dev.getName(), System.currentTimeMillis() );
+            String devName = dev.getName();
+            Log.d( TAG, "add(%s)", devName );
+            // If it's already there, update it. Otherwise create new
+            boolean alreadyHave = false;
+            if ( null != pairs ) {
+                for ( TwoStringPair pair : pairs ) {
+                    alreadyHave = pair.str2.equals(devName);
+                    if ( alreadyHave ) {
+                        break;
+                    }
+                }
+            }
+            if ( !alreadyHave ) {
+                pairs = TwoStringPair.add( pairs, dev.getAddress(), devName );
+            }
+            stamps.put( devName, System.currentTimeMillis() );
+            sort();
         }
 
         boolean empty() { return pairs == null || pairs.length == 0; }
+
+        private void sort()
+        {
+            Arrays.sort( pairs, new Comparator<TwoStringPair>() {
+                    @Override
+                    public int compare( TwoStringPair rec1, TwoStringPair rec2 ) {
+                        long val1 = stamps.get( rec1.str2 );
+                        long val2 = stamps.get( rec2.str2 );
+                        return (int)(val2 - val1);
+                    }
+                });
+        }
+
+        void hackOneIn()
+        {
+            String name = "Faker";
+            if ( !stamps.containsKey(name) ) {
+                pairs = TwoStringPair.add( pairs, "00:00:00:00:00:00", name );
+                stamps.put( name, System.currentTimeMillis() );
+            }
+        }
     }
     private Persisted mPersisted;
 
@@ -87,8 +125,10 @@ public class BTInviteDelegate extends InviteDelegate {
     protected void init( Bundle savedInstanceState )
     {
         String msg = getQuantityString( R.plurals.invite_bt_desc_fmt_2, m_nMissing,
-                                        m_nMissing );
+                                        m_nMissing )
+            + getString( R.string.invite_bt_desc_postscript );
         super.init( msg, 0 );
+
         addButtonBar( R.layout.bt_buttons, BUTTONIDS );
 
         load();
@@ -173,9 +213,6 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
-            mPersisted.pairs = null;
-            updateListAdapter( null );
-
             String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
             m_progress = ProgressDialog.show( m_activity, msg, null, true, true );
 
@@ -209,6 +246,12 @@ public class BTInviteDelegate extends InviteDelegate {
         if ( null == mPersisted ) {
             mPersisted = new Persisted();
         }
+
+        if ( BuildConfig.DEBUG ) {
+            // For testing, let's make there always be something that never
+            // responds to scans so we can see how it ages.
+            mPersisted.hackOneIn();
+        }
     }
 
     private void store()
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index f479237a6..b674c6140 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1859,12 +1859,15 @@
     <!--  -->
     <plurals name="invite_bt_desc_fmt_2">
       <item quantity="one">Please check the device you want to include
-      in this game.\n\n(The list is of devices you\'ve paired and on
-      which CrossWords is currently running.)</item>
+      in this game.</item>
       <item quantity="other">Please check up to %1$d device[s] you
-      want to include in this game.\n\n(The list is of devices you\'ve
-      paired and on which CrossWords is currently running.)</item>
+      want to include in this game.</item>
     </plurals>
+
+    <!-- Appended to above -->
+    <string name="invite_bt_desc_postscript">\n\n(The list is of devices you\'ve
+    paired and on which CrossWords has been detected.)</string>
+
     <plurals name="bt_scan_progress_fmt">
       <item quantity="one">Scanning for CrossWords</item>
       <item quantity="other">Scanning for CrossWords on %1$d paired devices.</item>

From 83340567b29d5e0cc98ed5d686c327249e7e6fda Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 15:20:36 -0800
Subject: [PATCH 125/145] add and implement remove button for btinvite dialog

---
 .../eehouse/android/xw4/BTInviteDelegate.java | 18 +++++++++++++++
 .../eehouse/android/xw4/InviteDelegate.java   | 22 +++++++++++++++++++
 .../app/src/main/res/layout/bt_buttons.xml    |  5 +++++
 .../app/src/main/res/values/strings.xml       | 11 ++++++----
 4 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 6538ec013..f735cfe0d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -45,6 +45,7 @@ public class BTInviteDelegate extends InviteDelegate {
     private static final String KEY_PERSIST = TAG + "_persist";
     private static final int[] BUTTONIDS = { R.id.button_scan,
                                              R.id.button_settings,
+                                             R.id.button_clear,
     };
     private Activity m_activity;
     private ProgressDialog m_progress;
@@ -74,6 +75,15 @@ public class BTInviteDelegate extends InviteDelegate {
             sort();
         }
 
+        void remove(final Set<InviterItem> checked)
+        {
+            for ( InviterItem item : checked ) {
+                TwoStringPair pair = (TwoStringPair)item;
+                stamps.remove( pair.str2 );
+                pairs = TwoStringPair.remove( pairs, pair );
+            }
+        }
+
         boolean empty() { return pairs == null || pairs.length == 0; }
 
         private void sort()
@@ -149,6 +159,14 @@ public class BTInviteDelegate extends InviteDelegate {
         case R.id.button_settings:
             BTService.openBTSettings( m_activity );
             break;
+        case R.id.button_clear:
+            mPersisted.remove( getChecked() );
+            store();
+
+            clearChecked();
+            updateListAdapter( mPersisted.pairs );
+            tryEnable();
+            break;
         }
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index d5c9f5249..9e8de5b80 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -85,6 +85,26 @@ abstract class InviteDelegate extends ListDelegateBase
             return pairs;
         }
 
+        public static TwoStringPair[] remove( TwoStringPair[] pairs, InviterItem dead )
+        {
+            int pos = -1;
+            for ( int ii = 0; ii < pairs.length; ++ii ) {
+                TwoStringPair pair = pairs[ii];
+                if ( pair.equals(dead) ) {
+                    pos = ii;
+                    break;
+                }
+            }
+
+            TwoStringPair[] newPairs = new TwoStringPair[pairs.length - 1];
+            // lower range
+            System.arraycopy(pairs, 0, newPairs, 0, pos );
+            // upper range
+            System.arraycopy(pairs, pos + 1, newPairs, pos, newPairs.length - pos );
+
+            return newPairs;
+        }
+
         public String getDev() { return str1; }
 
         public boolean equals( InviterItem item )
@@ -167,6 +187,8 @@ abstract class InviteDelegate extends ListDelegateBase
         for ( int id : buttonBarItemIds ) {
             bar.findViewById( id ).setOnClickListener( listener );
         }
+
+        tryEnable();
     }
 
     protected void updateListAdapter( InviterItem[] items )
diff --git a/xwords4/android/app/src/main/res/layout/bt_buttons.xml b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
index df6e78e69..30a230022 100644
--- a/xwords4/android/app/src/main/res/layout/bt_buttons.xml
+++ b/xwords4/android/app/src/main/res/layout/bt_buttons.xml
@@ -14,4 +14,9 @@
           android:text="@string/bt_pair_settings"
           style="@style/evenly_spaced_horizontal"
           />
+
+  <Button android:id="@+id/button_clear"
+          android:text="@string/bt_pick_clear_button"
+          style="@style/evenly_spaced_horizontal"
+          />
 </LinearLayout>
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index b674c6140..41331f79f 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1821,11 +1821,14 @@
 
     <!-- <string name="newgame_enable_bt">Turn Bluetooth on</string> -->
 
-      <!-- In the Bluetooth invite device dialog -->
-      <!--  -->
-    <string name="bt_pick_clear_button">Remove checked</string>
-    <!--  -->
+    <!-- In invitation dialogs, button to remove checked items -->
+    <string name="bt_pick_clear_button">Remove</string>
+
+    <!-- In the Bluetooth invite device dialog, to launch Andorid BT
+         settings pair new device -->
     <string name="bt_pair_settings">Pair More</string>
+    <!-- In the Bluetooth invite device dialog, kick off a new scan of
+         nearby devices -->
     <string name="button_scan">Rescan</string>
 
       <!--  -->

From 2a845da9b6a2568005afeceb69223c8be89504bb Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 16:29:52 -0800
Subject: [PATCH 126/145] use List instead of array

---
 .../eehouse/android/xw4/BTInviteDelegate.java | 14 ++---
 .../eehouse/android/xw4/InviteDelegate.java   | 54 ++++++-------------
 .../android/xw4/RelayInviteDelegate.java      |  2 +-
 .../android/xw4/SMSInviteDelegate.java        |  2 +-
 .../android/xw4/WiDirInviteDelegate.java      | 10 ++--
 5 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index f735cfe0d..80f9f13cf 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -34,10 +34,10 @@ import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
 import java.io.Serializable;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 
 public class BTInviteDelegate extends InviteDelegate {
@@ -51,7 +51,7 @@ public class BTInviteDelegate extends InviteDelegate {
     private ProgressDialog m_progress;
 
     private static class Persisted implements Serializable {
-        TwoStringPair[] pairs;
+        List<TwoStringPair> pairs;
         // HashMap: m_stamps is serialized, so can't be abstract type
         HashMap<String, Long> stamps = new HashMap<>();
 
@@ -75,20 +75,20 @@ public class BTInviteDelegate extends InviteDelegate {
             sort();
         }
 
-        void remove(final Set<InviterItem> checked)
+        void remove(final Set<? extends InviterItem> checked)
         {
             for ( InviterItem item : checked ) {
                 TwoStringPair pair = (TwoStringPair)item;
                 stamps.remove( pair.str2 );
-                pairs = TwoStringPair.remove( pairs, pair );
+                TwoStringPair.remove( pairs, pair );
             }
         }
 
-        boolean empty() { return pairs == null || pairs.length == 0; }
+        boolean empty() { return pairs == null || pairs.size() == 0; }
 
         private void sort()
         {
-            Arrays.sort( pairs, new Comparator<TwoStringPair>() {
+            Collections.sort( pairs, new Comparator<TwoStringPair>() {
                     @Override
                     public int compare( TwoStringPair rec1, TwoStringPair rec2 ) {
                         long val1 = stamps.get( rec1.str2 );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index 9e8de5b80..36a322027 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -38,10 +38,12 @@ import android.widget.Spinner;
 import android.widget.TextView;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -63,46 +65,21 @@ abstract class InviteDelegate extends ListDelegateBase
             this.str1 = str1; this.str2 = str2;
         }
 
-        public static TwoStringPair[] make( String[] names, String[] addrs )
-        {
-            TwoStringPair[] pairs = new TwoStringPair[names.length];
-            for ( int ii = 0; ii < pairs.length; ++ii ) {
-                pairs[ii] = new TwoStringPair( names[ii], addrs[ii] );
-            }
-            return pairs;
-        }
-
-        public static TwoStringPair[] add( TwoStringPair[] pairs, String name,
-                                           String addr )
+        public static List<TwoStringPair> add( List<TwoStringPair> pairs, String name,
+                                               String addr )
         {
             if ( null == pairs ) {
-                pairs = new TwoStringPair[0];
+                pairs = new ArrayList<>();
             }
 
-            pairs = Arrays.copyOfRange( pairs, 0, pairs.length + 1 );
-            pairs[pairs.length-1] = new TwoStringPair( name, addr );
+            pairs.add( new TwoStringPair( name, addr ) );
 
             return pairs;
         }
 
-        public static TwoStringPair[] remove( TwoStringPair[] pairs, InviterItem dead )
+        public static void remove( List<TwoStringPair> pairs, InviterItem dead )
         {
-            int pos = -1;
-            for ( int ii = 0; ii < pairs.length; ++ii ) {
-                TwoStringPair pair = pairs[ii];
-                if ( pair.equals(dead) ) {
-                    pos = ii;
-                    break;
-                }
-            }
-
-            TwoStringPair[] newPairs = new TwoStringPair[pairs.length - 1];
-            // lower range
-            System.arraycopy(pairs, 0, newPairs, 0, pos );
-            // upper range
-            System.arraycopy(pairs, pos + 1, newPairs, pos, newPairs.length - pos );
-
-            return newPairs;
+            pairs.remove(dead);
         }
 
         public String getDev() { return str1; }
@@ -191,12 +168,13 @@ abstract class InviteDelegate extends ListDelegateBase
         tryEnable();
     }
 
-    protected void updateListAdapter( InviterItem[] items )
+    protected void updateListAdapter( List<? extends InviterItem> items )
     {
         updateListAdapter( R.layout.two_strs_item, items );
     }
 
-    protected void updateListAdapter( int itemId, InviterItem[] items )
+    protected void updateListAdapter( int itemId,
+                                      List<? extends InviterItem> items )
     {
         updateChecked( items );
         m_adapter = new InviteItemsAdapter( itemId, items );
@@ -282,7 +260,7 @@ abstract class InviteDelegate extends ListDelegateBase
     protected void clearChecked() { m_checked.clear(); }
 
     // Figure which previously-checked items belong in the new set.
-    private void updateChecked( InviterItem[] newItems )
+    private void updateChecked( List<? extends InviterItem> newItems )
     {
         Set<InviterItem> old = new HashSet<InviterItem>();
         old.addAll( m_checked );
@@ -318,11 +296,13 @@ abstract class InviteDelegate extends ListDelegateBase
         private InviterItem[] m_items;
         private int m_itemId;
 
-        public InviteItemsAdapter( int itemID, InviterItem[] items )
+        public InviteItemsAdapter( int itemID, List<? extends InviterItem> items )
         {
-            super( null == items? 0 : items.length );
+            super( null == items? 0 : items.size() );
             m_itemId = itemID;
-            m_items = items;
+            if ( null != items ) {
+                m_items = items.toArray( new InviterItem[items.size()] );
+            }
             // m_items = new LinearLayout[getCount()];
         }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
index 8d738b3c2..966cd3ad2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/RelayInviteDelegate.java
@@ -463,7 +463,7 @@ public class RelayInviteDelegate extends InviteDelegate {
             });
 
         addSelf();
-        updateListAdapter( m_devIDRecs.toArray( new DevIDRec[m_devIDRecs.size()] ) );
+        updateListAdapter( m_devIDRecs );
         tryEnable();
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
index 23942077a..d3b11ad22 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/SMSInviteDelegate.java
@@ -298,7 +298,7 @@ public class SMSInviteDelegate extends InviteDelegate {
                 }
             });
 
-        updateListAdapter( m_phoneRecs.toArray( new PhoneRec[m_phoneRecs.size()] ) );
+        updateListAdapter( m_phoneRecs );
         tryEnable();
     }
 
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
index 6d39ffe53..7628604f8 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
@@ -27,9 +27,11 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
-import java.util.Iterator;
-import java.util.Map;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 public class WiDirInviteDelegate extends InviteDelegate
     implements WiDirService.DevSetListener {
@@ -106,13 +108,13 @@ public class WiDirInviteDelegate extends InviteDelegate
     private void rebuildList()
     {
         int count = m_macsToName.size();
-        TwoStringPair[] pairs = new TwoStringPair[count];
+        List<TwoStringPair> pairs = new ArrayList<>();
         // String[] names = new String[count];
         // String[] addrs = new String[count];
         Iterator<String> iter = m_macsToName.keySet().iterator();
         for ( int ii = 0; ii < count; ++ii ) {
             String mac = iter.next();
-            pairs[ii] = new TwoStringPair(mac, m_macsToName.get(mac) );
+            pairs.add( new TwoStringPair(mac, m_macsToName.get(mac) ) );
             // addrs[ii] = mac;
             // names[ii] = m_macsToName.get(mac);
         }

From 095377267339af97f9392a72f8b27aa52a1d23b5 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 16:58:30 -0800
Subject: [PATCH 127/145] cleanup: don't need wrapper around a List<>

---
 .../eehouse/android/xw4/BTInviteDelegate.java | 19 ++++++------
 .../eehouse/android/xw4/InviteDelegate.java   | 29 ++++---------------
 .../android/xw4/WiDirInviteDelegate.java      |  4 +--
 3 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 80f9f13cf..56bfc204e 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -34,6 +34,7 @@ import org.eehouse.android.xw4.DBUtils.SentInvitesInfo;
 import org.eehouse.android.xw4.DlgDelegate.Action;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -55,12 +56,12 @@ public class BTInviteDelegate extends InviteDelegate {
         // HashMap: m_stamps is serialized, so can't be abstract type
         HashMap<String, Long> stamps = new HashMap<>();
 
-        void add( BluetoothDevice dev ) {
-            String devName = dev.getName();
-            Log.d( TAG, "add(%s)", devName );
+        void add( String devAddress, String devName ) {
             // If it's already there, update it. Otherwise create new
             boolean alreadyHave = false;
-            if ( null != pairs ) {
+            if ( null == pairs ) {
+                pairs = new ArrayList<>();
+            } else {
                 for ( TwoStringPair pair : pairs ) {
                     alreadyHave = pair.str2.equals(devName);
                     if ( alreadyHave ) {
@@ -68,8 +69,9 @@ public class BTInviteDelegate extends InviteDelegate {
                     }
                 }
             }
+
             if ( !alreadyHave ) {
-                pairs = TwoStringPair.add( pairs, dev.getAddress(), devName );
+                pairs.add( new TwoStringPair( devAddress, devName ) );
             }
             stamps.put( devName, System.currentTimeMillis() );
             sort();
@@ -80,7 +82,7 @@ public class BTInviteDelegate extends InviteDelegate {
             for ( InviterItem item : checked ) {
                 TwoStringPair pair = (TwoStringPair)item;
                 stamps.remove( pair.str2 );
-                TwoStringPair.remove( pairs, pair );
+                pairs.remove( pair );
             }
         }
 
@@ -102,8 +104,7 @@ public class BTInviteDelegate extends InviteDelegate {
         {
             String name = "Faker";
             if ( !stamps.containsKey(name) ) {
-                pairs = TwoStringPair.add( pairs, "00:00:00:00:00:00", name );
-                stamps.put( name, System.currentTimeMillis() );
+                add( "00:00:00:00:00:00", name );
             }
         }
     }
@@ -247,7 +248,7 @@ public class BTInviteDelegate extends InviteDelegate {
     {
         DbgUtils.assertOnUIThread();
 
-        mPersisted.add( dev );
+        mPersisted.add( dev.getAddress(), dev.getName() );
         store();
 
         updateListAdapter( mPersisted.pairs );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index 36a322027..deabdb008 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -58,41 +58,24 @@ abstract class InviteDelegate extends ListDelegateBase
     }
 
     protected static class TwoStringPair implements InviterItem, Serializable {
-        public String str1;
+        private String mDev;
         public String str2;
 
-        public TwoStringPair( String str1, String str2 ) {
-            this.str1 = str1; this.str2 = str2;
+        public TwoStringPair( String dev, String str2 ) {
+            mDev = dev; this.str2 = str2;
         }
 
-        public static List<TwoStringPair> add( List<TwoStringPair> pairs, String name,
-                                               String addr )
-        {
-            if ( null == pairs ) {
-                pairs = new ArrayList<>();
-            }
-
-            pairs.add( new TwoStringPair( name, addr ) );
-
-            return pairs;
-        }
-
-        public static void remove( List<TwoStringPair> pairs, InviterItem dead )
-        {
-            pairs.remove(dead);
-        }
-
-        public String getDev() { return str1; }
+        public String getDev() { return mDev; }
 
         public boolean equals( InviterItem item )
         {
             boolean result = false;
             if ( null != item ) {
                 TwoStringPair pair = (TwoStringPair)item;
-                result = str1.equals( pair.str1 )
+                result = mDev.equals( pair.mDev )
                     && ((null == str2 && null == pair.str2)
                         || str2.equals( pair.str2 ) );
-                Log.d( TAG, "%s.equals(%s) => %b", str1, pair.str1, result );
+                Log.d( TAG, "%s.equals(%s) => %b", mDev, pair.mDev, result );
             }
             return result;
         }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
index 7628604f8..eaff78b08 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
@@ -81,7 +81,7 @@ public class WiDirInviteDelegate extends InviteDelegate
     protected void onChildAdded( View child, InviterItem data )
     {
         TwoStringPair pair = (TwoStringPair)data;
-        ((TwoStrsItem)child).setStrings( pair.str2, pair.str1 );
+        ((TwoStrsItem)child).setStrings( pair.str2, pair.getDev() );
     }
 
     @Override
@@ -89,7 +89,7 @@ public class WiDirInviteDelegate extends InviteDelegate
     {
         for ( int ii = 0; ii < selected.length; ++ii ) {
             TwoStringPair pair = (TwoStringPair)selected[ii];
-            devs[ii] = pair.str1;
+            devs[ii] = pair.getDev();
         }
     }
 

From 59f1e1696e3b4214ddf6221b2a33f440b629925e Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 17:04:36 -0800
Subject: [PATCH 128/145] remove unused constant (enum)

---
 xwords4/common/util.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xwords4/common/util.h b/xwords4/common/util.h
index e02ce2322..ef771cb65 100644
--- a/xwords4/common/util.h
+++ b/xwords4/common/util.h
@@ -59,7 +59,6 @@ typedef enum {
     ERR_NO_HINT_FOUND,          /* not really an error... */
 
     ERR_RELAY_BASE,
-    ERR_RELAY_END = ERR_RELAY_BASE + XWRELAY_ERROR_LASTERR
 } UtilErrID;
 
 #define PICKER_PICKALL -1

From 7cccd1a1e6096aaed0ad3a55bf0346840bc1dfe4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sun, 6 Jan 2019 17:12:11 -0800
Subject: [PATCH 129/145] make the fake result random

---
 .../eehouse/android/xw4/BTInviteDelegate.java  | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 56bfc204e..3a6c3fd4c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -99,14 +99,6 @@ public class BTInviteDelegate extends InviteDelegate {
                     }
                 });
         }
-
-        void hackOneIn()
-        {
-            String name = "Faker";
-            if ( !stamps.containsKey(name) ) {
-                add( "00:00:00:00:00:00", name );
-            }
-        }
     }
     private Persisted mPersisted;
 
@@ -230,6 +222,10 @@ public class BTInviteDelegate extends InviteDelegate {
 
     private void scan()
     {
+        if ( BuildConfig.DEBUG && Utils.nextRandomInt() % 5 == 0 ) {
+            mPersisted.add( "00:00:00:00:00:00", "Do Not Invite Me" );
+        }
+
         int count = BTService.getPairedCount( m_activity );
         if ( 0 < count ) {
             String msg = getQuantityString( R.plurals.bt_scan_progress_fmt, count, count );
@@ -265,12 +261,6 @@ public class BTInviteDelegate extends InviteDelegate {
         if ( null == mPersisted ) {
             mPersisted = new Persisted();
         }
-
-        if ( BuildConfig.DEBUG ) {
-            // For testing, let's make there always be something that never
-            // responds to scans so we can see how it ages.
-            mPersisted.hackOneIn();
-        }
     }
 
     private void store()

From 454e3da5786d851b7f6e1a6aebecc757f450771c Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 07:41:22 -0800
Subject: [PATCH 130/145] fix to compile when #define not defined

---
 xwords4/linux/cursesmain.c | 7 +++++--
 xwords4/linux/gtkboard.c   | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/xwords4/linux/cursesmain.c b/xwords4/linux/cursesmain.c
index 823b815ba..4ae3ab22a 100644
--- a/xwords4/linux/cursesmain.c
+++ b/xwords4/linux/cursesmain.c
@@ -2104,8 +2104,11 @@ cursesmain( XP_Bool isServer, LaunchParams* params )
         if ( !opened ) {
             game_makeNewGame( MEMPOOL &cGlobals->game, cGlobals->gi,
                               cGlobals->util, (DrawCtx*)g_globals.draw,
-                              &g_globals.cGlobals.cp, &procs, 
-                              params->gameSeed );
+                              &g_globals.cGlobals.cp, &procs
+#ifdef SET_GAMESEED
+                              ,params->gameSeed
+#endif
+                              );
             g_globals.cGlobals.selRow = -1;
             saveGame( &g_globals.cGlobals );
         }
diff --git a/xwords4/linux/gtkboard.c b/xwords4/linux/gtkboard.c
index 2a09c05f3..e5665c44a 100644
--- a/xwords4/linux/gtkboard.c
+++ b/xwords4/linux/gtkboard.c
@@ -635,7 +635,11 @@ createOrLoadObjects( GtkGameGlobals* globals )
 #endif
         game_makeNewGame( MEMPOOL &cGlobals->game, cGlobals->gi,
                           cGlobals->util, (DrawCtx*)globals->draw,
-                          &cGlobals->cp, &procs, params->gameSeed );
+                          &cGlobals->cp, &procs
+#ifdef SET_GAMESEED
+                          , params->gameSeed
+#endif
+                          );
 
         // addr.conType = params->conType;
         CommsConnType typ;

From db641c4664693cfd3045698a4ea646aee06c8c6f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 08:16:50 -0800
Subject: [PATCH 131/145] log gameSeed; generate on linux too

I'm seeing a rare case where a game connectes to relay specifying a room
and somehow gets both slots, having provided different gameSeeds the two
times. This means an opponent won't connect, the room being full in that
game. I can't reproduce, so am logging seed changes better and switching
linux client to leave seed generation to comms as Android does.
---
 xwords4/common/comms.c | 8 +++++---
 xwords4/linux/Makefile | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/xwords4/common/comms.c b/xwords4/common/comms.c
index af33b24e8..2d3da8487 100644
--- a/xwords4/common/comms.c
+++ b/xwords4/common/comms.c
@@ -676,7 +676,7 @@ comms_makeFromStream( MPFORMAL XWStreamCtxt* stream, XW_UtilCtxt* util,
     } else {
         comms->channelSeed = stream_getU16( stream );
         CNO_FMT( cbuf, comms->channelSeed );
-        XP_LOGF( "%s: loaded seed: %s", __func__, cbuf );
+        XP_LOGF( "%s: loaded seed: %s(%d)", __func__, cbuf, comms->channelSeed );
     }
     if ( STREAM_VERS_COMMSBACKOFF <= version ) {
         comms->resendBackoff = stream_getU16( stream );
@@ -890,7 +890,9 @@ comms_writeToStream( CommsCtxt* comms, XWStreamCtxt* stream,
 
     stream_putU32( stream, comms->connID );
     stream_putU16( stream, comms->nextChannelNo );
-    stream_putU16( stream, comms_getChannelSeed( comms ) ); /* force creation */
+    XP_U16 channelSeed = comms_getChannelSeed( comms ); /* force creation */
+    stream_putU16( stream, channelSeed );
+    XP_LOGF( "%s: stored seed: %x(%d)", __func__, channelSeed, channelSeed );
     stream_putU16( stream, comms->resendBackoff );
     stream_putU32( stream, comms->nextResend );
     if ( addr_hasType( &comms->addr, COMMS_CONN_RELAY ) ) {
@@ -1186,7 +1188,7 @@ comms_getChannelSeed( CommsCtxt* comms )
         comms->channelSeed = XP_RANDOM() & ~CHANNEL_MASK;
         comms->channelSeed |= comms->forceChannel;
         CNO_FMT( cbuf, comms->channelSeed );
-        XP_LOGF( "%s: made seed: %s", __func__, cbuf );
+        XP_LOGF( "%s: made seed: %s(%d)", __func__, cbuf, comms->channelSeed );
     }
     return comms->channelSeed;
 }
diff --git a/xwords4/linux/Makefile b/xwords4/linux/Makefile
index c721d4bdc..123162e71 100644
--- a/xwords4/linux/Makefile
+++ b/xwords4/linux/Makefile
@@ -105,7 +105,7 @@ DEFINES += -DFEATURE_TRAY_EDIT
 DEFINES += -DXWFEATURE_CROSSHAIRS
 DEFINES += -DXWFEATURE_CHAT
 DEFINES += -DDISABLE_TILE_SEL
-DEFINES += -DSET_GAMESEED
+# DEFINES += -DSET_GAMESEED
 DEFINES += -DTEXT_MODEL
 DEFINES += -DXWFEATURE_WALKDICT
 DEFINES += -DXWFEATURE_WALKDICT_FILTER

From c87161307c07a71e2e9a27709d6df145871f043f Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 09:39:58 -0800
Subject: [PATCH 132/145] When rematching an Archived game save in default
 new-game group

---
 .../main/java/org/eehouse/android/xw4/BoardDelegate.java  | 4 +---
 .../src/main/java/org/eehouse/android/xw4/DBUtils.java    | 8 ++++++++
 .../java/org/eehouse/android/xw4/GamesListDelegate.java   | 5 +++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index b71fb3592..b2a8c3bf1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -2650,9 +2650,7 @@ public class BoardDelegate extends DelegateBase
 
     private boolean inArchiveGroup()
     {
-        String archiveName = LocUtils
-            .getString( m_activity, R.string.group_name_archive );
-        long archiveGroup = DBUtils.getGroup( m_activity, archiveName );
+        long archiveGroup = DBUtils.getArchiveGroup( m_activity );
         long curGroup = DBUtils.getGroupForGame( m_activity, m_rowid );
         return curGroup == archiveGroup;
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
index e0f9a1438..d4ff2b8e2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DBUtils.java
@@ -1791,6 +1791,14 @@ public class DBUtils {
         invalGroupsCache();
     }
 
+    public static long getArchiveGroup( Context context )
+    {
+        String archiveName = LocUtils
+            .getString( context, R.string.group_name_archive );
+        long archiveGroup = getGroup( context, archiveName );
+        return archiveGroup;
+    }
+
     // Change group id of a game
     public static void moveGame( Context context, long rowid, long groupID )
     {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 675c25ea4..6dfe22f22 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -2246,7 +2246,12 @@ public class GamesListDelegate extends ListDelegateBase
                 int lang = extras.getInt( REMATCH_LANG_EXTRA, -1 );
                 String json = extras.getString( REMATCH_PREFS_EXTRA );
 
+                // Don't save rematch in Archive group
                 long groupID = DBUtils.getGroupForGame( m_activity, srcRowID );
+                if ( groupID == DBUtils.getArchiveGroup( m_activity ) ) {
+                    groupID = XWPrefs.getDefaultNewGameGroup( m_activity );
+                }
+
                 newid = GameUtils.makeNewMultiGame( m_activity, groupID, dict,
                                                     lang, json, addrs, gameName );
                 DBUtils.addRematchInfo( m_activity, newid, btAddr, phone,

From 4fcc5fd99bd9004a28dc9393152c7abd9d351261 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 09:49:10 -0800
Subject: [PATCH 133/145] turn off faker device (but make easy to enable)

---
 .../main/java/org/eehouse/android/xw4/BTInviteDelegate.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 3a6c3fd4c..547112bb5 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -48,6 +48,8 @@ public class BTInviteDelegate extends InviteDelegate {
                                              R.id.button_settings,
                                              R.id.button_clear,
     };
+    private static final boolean ENABLE_FAKER = false;
+
     private Activity m_activity;
     private ProgressDialog m_progress;
 
@@ -222,7 +224,7 @@ public class BTInviteDelegate extends InviteDelegate {
 
     private void scan()
     {
-        if ( BuildConfig.DEBUG && Utils.nextRandomInt() % 5 == 0 ) {
+        if ( ENABLE_FAKER && Utils.nextRandomInt() % 5 == 0 ) {
             mPersisted.add( "00:00:00:00:00:00", "Do Not Invite Me" );
         }
 

From e9e03a06a3c47199156c14b3a6f4bb97d1c4ceb6 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 10:09:43 -0800
Subject: [PATCH 134/145] show toast when GameLock fails to lock (some cases)

---
 .../org/eehouse/android/xw4/BoardDelegate.java |  7 +++++--
 .../org/eehouse/android/xw4/ChatDelegate.java  |  2 +-
 .../java/org/eehouse/android/xw4/DbgUtils.java | 10 ++++++++++
 .../android/xw4/GameConfigDelegate.java        |  2 +-
 .../org/eehouse/android/xw4/GameUtils.java     | 18 +++++++++++-------
 .../eehouse/android/xw4/XWServiceHelper.java   |  2 +-
 .../org/eehouse/android/xw4/jni/JNIThread.java |  8 +++++---
 7 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index b2a8c3bf1..c671b6ebe 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -590,7 +590,7 @@ public class BoardDelegate extends DelegateBase
         // getRetained() can in threory fail to get the lock and so will
         // return null. Let m_jniThreadRef stay null in that case; doResume()
         // will finish() in that case.
-        m_jniThreadRef = JNIThread.getRetained( m_rowid, true );
+        m_jniThreadRef = JNIThread.getRetained( m_activity, m_rowid, true );
         if ( null != m_jniThreadRef ) {
             // see http://stackoverflow.com/questions/680180/where-to-stop- \
             // destroy-threads-in-android-service-class
@@ -2787,7 +2787,7 @@ public class BoardDelegate extends DelegateBase
         GamePtr gamePtr = null;
         GameSummary summary = null;
         CurGameInfo gi = null;
-        JNIThread thread = JNIThread.getRetained( rowID );
+        JNIThread thread = JNIThread.getRetained( activity, rowID );
         if ( null != thread ) {
             gamePtr = thread.getGamePtr().retain();
             summary = thread.getSummary();
@@ -2798,6 +2798,9 @@ public class BoardDelegate extends DelegateBase
                     summary = DBUtils.getSummary( activity, lock );
                     gi = new CurGameInfo( activity );
                     gamePtr = GameUtils.loadMakeGame( activity, gi, lock );
+                } else {
+                    DbgUtils.toastNoLock( TAG, activity,
+                                          "setupRematchFor(%d)", rowID );
                 }
             }
         }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
index f3239e590..b72506648 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/ChatDelegate.java
@@ -130,7 +130,7 @@ public class ChatDelegate extends DelegateBase {
     protected void onResume()
     {
         super.onResume();
-        m_jniThreadRef = JNIThread.getRetained( m_rowid );
+        m_jniThreadRef = JNIThread.getRetained( m_activity, m_rowid );
         if ( null == m_jniThreadRef ) {
             Log.w( TAG, "onResume(): m_jniThreadRef null; exiting" );
             finish();
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
index 96ab11ec7..d124f66de 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DbgUtils.java
@@ -99,6 +99,16 @@ public class DbgUtils {
         showf( context, LocUtils.getString( context, formatid ), args );
     } // showf
 
+    public static void toastNoLock( String tag, Context context, String format,
+                                    Object... args )
+    {
+        format = "Unable to lock game; " + format;
+        if ( BuildConfig.DEBUG ) {
+            showf( context, format, args );
+        }
+        Log.w( tag, format, args );
+    }
+
     public static void assertOnUIThread()
     {
         assertOnUIThread( true );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
index 8cae19c7b..847964d62 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameConfigDelegate.java
@@ -483,7 +483,7 @@ public class GameConfigDelegate extends DelegateBase
     @Override
     protected void onResume()
     {
-        m_jniThread = JNIThread.getRetained( m_rowid );
+        m_jniThread = JNIThread.getRetained( m_activity, m_rowid );
         super.onResume();
         loadGame();
     }
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 370672797..99f887cfd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -168,7 +168,8 @@ public class GameUtils {
                 Utils.cancelNotification( context, (int)rowidIn );
                 success = true;
             } else {
-                Log.w( TAG, "resetGame: unable to open rowid %d", rowidIn );
+                DbgUtils.toastNoLock( TAG, context, "resetGame(): rowid %d",
+                                      rowidIn );
             }
         }
         return success;
@@ -218,7 +219,7 @@ public class GameUtils {
                                           long maxMillis )
     {
         GameSummary result = null;
-        JNIThread thread = JNIThread.getRetained( rowid );
+        JNIThread thread = JNIThread.getRetained( context, rowid );
         GameLock lock = null;
         if ( null != thread ) {
             lock = thread.getLock();
@@ -251,7 +252,7 @@ public class GameUtils {
         long rowid = DBUtils.ROWID_NOTFOUND;
         GameLock lockSrc = null;
 
-        JNIThread thread = JNIThread.getRetained( rowidIn );
+        JNIThread thread = JNIThread.getRetained( context, rowidIn );
         if ( null != thread ) {
             lockSrc = thread.getLock();
         } else {
@@ -296,7 +297,8 @@ public class GameUtils {
                 deleteGame( context, lock, informNow );
                 success = true;
             } else {
-                Log.w( TAG, "deleteGame: unable to delete rowid %d", rowid );
+                DbgUtils.toastNoLock( TAG, context, "deleteGame(): rowid %d",
+                                      rowid );
                 success = false;
             }
         }
@@ -1008,7 +1010,8 @@ public class GameUtils {
                     }
                 }
             } catch ( GameLock.GameLockedException gle ) {
-                Log.e( TAG, "feedMessage(): game locked; dropping message" );
+                DbgUtils.toastNoLock( TAG, context, "feedMessage(): dropping message "
+                                      + " for %d", rowid );
             }
         }
         return draw;
@@ -1048,7 +1051,8 @@ public class GameUtils {
                 summarizeAndRelease( context, lock, gamePtr, gi );
 
             } else {
-                Log.w( TAG, "replaceDicts: unable to open rowid %d", rowid );
+                DbgUtils.toastNoLock( TAG, context, "replaceDicts(): rowid %d",
+                                      rowid );
             }
         }
         return success;
@@ -1322,7 +1326,7 @@ public class GameUtils {
                                    + " failed for rowid %d", rowid );
                         }
                     } else {
-                        JNIThread jniThread = JNIThread.getRetained( rowid );
+                        JNIThread jniThread = JNIThread.getRetained( m_context, rowid );
                         if ( null != jniThread ) {
                             jniThread.handle( JNIThread.JNICmd.CMD_RESEND, false,
                                               false, false );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
index 3f076f1f8..7594e4fcd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -75,7 +75,7 @@ abstract class XWServiceHelper {
     {
         boolean allConsumed = true;
         boolean[] isLocalP = new boolean[1];
-        JNIThread jniThread = JNIThread.getRetained( rowid );
+        JNIThread jniThread = JNIThread.getRetained( context, rowid );
         boolean consumed = false;
         if ( null != jniThread ) {
             consumed = true;
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
index 0dd797b00..503929cc2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/JNIThread.java
@@ -822,12 +822,12 @@ public class JNIThread extends Thread {
         }
     }
 
-    public static JNIThread getRetained( long rowid )
+    public static JNIThread getRetained( Context context, long rowid )
     {
-        return getRetained( rowid, false );
+        return getRetained( context, rowid, false );
     }
 
-    public static JNIThread getRetained( long rowid, boolean makeNew )
+    public static JNIThread getRetained( Context context, long rowid, boolean makeNew )
     {
         JNIThread result = null;
         synchronized( s_instances ) {
@@ -839,6 +839,8 @@ public class JNIThread extends Thread {
                     if ( lock != null ) {
                         result = new JNIThread( lock );
                         s_instances.put( rowid, result );
+                    } else {
+                        DbgUtils.toastNoLock( TAG, context, "getRetained(%d)", rowid );
                     }
                 }
             }

From 7c7b80deaecbd18861604416ab9cedfbd50174a3 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 11:37:57 -0800
Subject: [PATCH 135/145] add net-stats dialog to log-tap games menu

So I don't have to open a game to see e.g. how it's connecting, refactor
the network status stuff so it can be called from both board and
gameslist views. Then add new context menuitem that calls it.
---
 .../eehouse/android/xw4/BoardDelegate.java    | 54 ++--------
 .../org/eehouse/android/xw4/DelegateBase.java | 99 ++++++++++++++++++-
 .../android/xw4/GamesListDelegate.java        |  8 +-
 .../org/eehouse/android/xw4/jni/XwJNI.java    |  2 +
 .../main/res/menu/games_list_game_menu.xml    |  3 +
 .../app/src/main/res/values/strings.xml       |  3 +
 6 files changed, 115 insertions(+), 54 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
index c671b6ebe..8d0b26788 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BoardDelegate.java
@@ -187,16 +187,14 @@ public class BoardDelegate extends DelegateBase
         }
             break;
 
-        case GAME_OVER:
-        case DLG_CONNSTAT: {
+        case GAME_OVER: {
             GameSummary summary = (GameSummary)params[0];
             int title = (Integer)params[1];
             String msg = (String)params[2];
             ab.setTitle( title )
                 .setMessage( msg )
                 .setPositiveButton( android.R.string.ok, null );
-            if ( DlgID.GAME_OVER == dlgID
-                        && rematchSupported( m_activity, true, summary ) ) {
+            if ( rematchSupported( m_activity, true, summary ) ) {
                 lstnr = new OnClickListener() {
                         public void onClick( DialogInterface dlg,
                                              int whichButton ) {
@@ -215,25 +213,6 @@ public class BoardDelegate extends DelegateBase
                         };
                     ab.setNeutralButton( R.string.button_archive, lstnr );
                 }
-
-            } else if ( DlgID.DLG_CONNSTAT == dlgID
-                        && BuildConfig.DEBUG && null != m_connTypes
-                        && (m_connTypes.contains( CommsConnType.COMMS_CONN_RELAY )
-                            || m_connTypes.contains( CommsConnType.COMMS_CONN_P2P )) ) {
-
-                lstnr = new OnClickListener() {
-                        public void onClick( DialogInterface dlg,
-                                             int whichButton ) {
-                            NetStateCache.reset( m_activity );
-                            if ( m_connTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) {
-                                RelayService.reset( m_activity );
-                            }
-                            if ( m_connTypes.contains( CommsConnType.COMMS_CONN_P2P ) ) {
-                                WiDirService.reset( m_activity );
-                            }
-                        }
-                    };
-                ab.setNegativeButton( R.string.button_reconnect, lstnr );
             }
             dialog = ab.create();
         }
@@ -1473,6 +1452,7 @@ public class BoardDelegate extends DelegateBase
     //////////////////////////////////////////////////
     // ConnStatusHandler.ConnStatusCBacks
     //////////////////////////////////////////////////
+    @Override
     public void invalidateParent()
     {
         runOnUiThread(new Runnable() {
@@ -1483,26 +1463,13 @@ public class BoardDelegate extends DelegateBase
             });
     }
 
+    @Override
     public void onStatusClicked()
     {
-        CommsAddrRec[] addrs = XwJNI.comms_getAddrs( m_jniGamePtr );
-        CommsAddrRec addr = null != addrs && 0 < addrs.length ? addrs[0] : null;
-        final String msg = ConnStatusHandler
-            .getStatusText( m_activity, m_connTypes, addr );
-
-        post( new Runnable() {
-                @Override
-                public void run() {
-                    if ( null == msg ) {
-                        askNoAddrsDelete();
-                    } else {
-                        showDialogFragment( DlgID.DLG_CONNSTAT, null,
-                                            R.string.info_title, msg );
-                    }
-                }
-            } );
+        onStatusClicked( m_jniGamePtr );
     }
 
+    @Override
     public Handler getHandler()
     {
         return m_handler;
@@ -1515,15 +1482,6 @@ public class BoardDelegate extends DelegateBase
         finish();
     }
 
-    private void askNoAddrsDelete()
-    {
-        makeConfirmThenBuilder( R.string.connstat_net_noaddr,
-                                Action.DELETE_AND_EXIT )
-            .setPosButton( R.string.list_item_delete )
-            .setNegButton( R.string.button_close_game )
-            .show();
-    }
-
     private void askDropRelay()
     {
         String msg = getString( R.string.confirm_drop_relay );
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 0bd011297..0900cb3cd 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -22,12 +22,15 @@ package org.eehouse.android.xw4;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.support.v4.app.DialogFragment;
+import android.content.Context;
 import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.ContextMenu;
 import android.view.LayoutInflater;
@@ -40,7 +43,6 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
-
 import org.eehouse.android.xw4.DlgDelegate.Action;
 import org.eehouse.android.xw4.DlgDelegate.ActionPair;
 import org.eehouse.android.xw4.DlgDelegate.ConfirmThenBuilder;
@@ -48,6 +50,12 @@ import org.eehouse.android.xw4.DlgDelegate.DlgClickNotify;
 import org.eehouse.android.xw4.DlgDelegate.NotAgainBuilder;
 import org.eehouse.android.xw4.DlgDelegate.OkOnlyBuilder;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
+import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnType;
+import org.eehouse.android.xw4.jni.CommsAddrRec.CommsConnTypeSet;
+import org.eehouse.android.xw4.jni.CommsAddrRec;
+import org.eehouse.android.xw4.jni.GameSummary;
+import org.eehouse.android.xw4.jni.XwJNI.GamePtr;
+import org.eehouse.android.xw4.jni.XwJNI;
 import org.eehouse.android.xw4.loc.LocUtils;
 
 import java.lang.ref.WeakReference;
@@ -414,10 +422,44 @@ public class DelegateBase implements DlgClickNotify,
 
     protected Dialog makeDialog( DBAlert alert, Object[] params )
     {
+        Dialog dialog = null;
         DlgID dlgID = alert.getDlgID();
-        Log.d( TAG, "%s.makeDialog(): not handling %s", getClass().getSimpleName(),
-               dlgID.toString() );
-        return null;
+        switch ( dlgID ) {
+        case DLG_CONNSTAT: {
+            AlertDialog.Builder ab = makeAlertBuilder();
+            GameSummary summary = (GameSummary)params[0];
+            int title = (Integer)params[1];
+            String msg = (String)params[2];
+            final CommsConnTypeSet conTypes = summary.conTypes;
+            ab.setTitle( title )
+                .setMessage( msg )
+                .setPositiveButton( android.R.string.ok, null );
+            if ( BuildConfig.DEBUG && null != conTypes
+                 && (conTypes.contains( CommsConnType.COMMS_CONN_RELAY )
+                     || conTypes.contains( CommsConnType.COMMS_CONN_P2P )) ) {
+                OnClickListener lstnr = new OnClickListener() {
+                        public void onClick( DialogInterface dlg,
+                                             int whichButton ) {
+                            NetStateCache.reset( m_activity );
+                            if ( conTypes.contains( CommsConnType.COMMS_CONN_RELAY ) ) {
+                                RelayService.reset( getActivity() );
+                            }
+                            if ( conTypes.contains( CommsConnType.COMMS_CONN_P2P ) ) {
+                                WiDirService.reset( getActivity() );
+                            }
+                        }
+                    };
+                ab.setNegativeButton( R.string.button_reconnect, lstnr );
+            }
+            dialog = ab.create();
+        }
+            break;
+        default:
+            Log.d( TAG, "%s.makeDialog(): not handling %s", getClass().getSimpleName(),
+                   dlgID.toString() );
+            break;
+        }
+        return dialog;
     }
 
     protected void showDialogFragment( final DlgID dlgID, final Object... params )
@@ -593,6 +635,53 @@ public class DelegateBase implements DlgClickNotify,
         runIfVisible();
     }
 
+    public void onStatusClicked( GamePtr gamePtr )
+    {
+        Context context = getActivity();
+        CommsAddrRec[] addrs = XwJNI.comms_getAddrs( gamePtr );
+        CommsAddrRec addr = null != addrs && 0 < addrs.length ? addrs[0] : null;
+        final GameSummary summary = GameUtils.getSummary( context, gamePtr.getRowid(), 1 );
+        if ( null != summary ) {
+            final String msg = ConnStatusHandler
+                .getStatusText( context, summary.conTypes, addr );
+
+            post( new Runnable() {
+                    @Override
+                    public void run() {
+                        if ( null == msg ) {
+                            askNoAddrsDelete();
+                        } else {
+                            showDialogFragment( DlgID.DLG_CONNSTAT, summary,
+                                                R.string.info_title, msg );
+                        }
+                    }
+                } );
+        }
+    }
+
+    public void onStatusClicked( long rowid )
+    {
+        Log.d( TAG, "onStatusClicked(%d)", rowid );
+        try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
+            if ( null != lock ) {
+                GamePtr gamePtr = GameUtils.loadMakeGame( getActivity(), lock );
+                if ( null != gamePtr ) {
+                    onStatusClicked( gamePtr );
+                    gamePtr.release();
+                }
+            }
+        }
+    }
+
+    protected void askNoAddrsDelete()
+    {
+        makeConfirmThenBuilder( R.string.connstat_net_noaddr,
+                                Action.DELETE_AND_EXIT )
+            .setPosButton( R.string.list_item_delete )
+            .setNegButton( R.string.button_close_game )
+            .show();
+    }
+
     //////////////////////////////////////////////////
     // MultiService.MultiEventListener interface
     //////////////////////////////////////////////////
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index 6dfe22f22..e4c7eae9d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1671,9 +1671,11 @@ public class GamesListDelegate extends ListDelegateBase
                 enable = BoardDelegate.rematchSupported( m_activity, rowID );
                 Utils.setItemVisible( menu, R.id.games_game_rematch, enable );
 
-                enable = item.getSummary().isMultiGame()
+                boolean isMultiGame = item.getSummary().isMultiGame();
+                enable = isMultiGame
                     && (BuildConfig.DEBUG || XWPrefs.getDebugEnabled( m_activity ));
                 Utils.setItemVisible( menu, R.id.games_game_invites, enable );
+                Utils.setItemVisible( menu, R.id.games_game_netstats, isMultiGame );
 
                 enable = !m_launchedGames.contains( rowID );
                 Utils.setItemVisible( menu, R.id.games_game_delete, enable );
@@ -1848,6 +1850,10 @@ public class GamesListDelegate extends ListDelegateBase
             showDialogFragment( DlgID.RENAME_GAME, selRowIDs[0] );
             break;
 
+        case R.id.games_game_netstats:
+            onStatusClicked( selRowIDs[0] );
+            break;
+
             // DEBUG only
         case R.id.games_game_invites:
             msg = GameUtils.getSummary( m_activity, selRowIDs[0] )
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
index bd51c2f92..93fc6592f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/jni/XwJNI.java
@@ -58,6 +58,8 @@ public class XwJNI {
             return this;
         }
 
+        public long getRowid() { return m_rowid; }
+
         // Force (via an assert in finalize() below) that this is called. It's
         // better if jni stuff isn't being done on the finalizer thread
         public synchronized void release()
diff --git a/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml b/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml
index 8627fe01c..97bf85a39 100644
--- a/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml
+++ b/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml
@@ -25,6 +25,9 @@
     <item android:id="@+id/games_game_copy"
           android:title="@string/list_item_copy"
           />
+    <item android:id="@+id/games_game_netstats"
+          android:title="@string/list_item_netstats"
+          />
     <item android:id="@+id/games_game_select"
           android:title="@string/list_item_select"
           />
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index 41331f79f..c7f91bc9f 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -148,6 +148,9 @@
     <!-- Title of dialog for renaming game (triggered by selecting
          list_item_rename) -->
 
+    <!-- long-tap game list menuitem for showing info about game's connectivity -->
+    <string name="list_item_netstats">Connections…</string>
+
     <!-- If you try to copy a networked game you get this error
     message. -->
     <string name="no_copy_network">Games that have already connected

From 24fad52cd8393e8311f3ca6a742f67f041f9d115 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 11:52:31 -0800
Subject: [PATCH 136/145] use second resolution in bt device display

Useful to see that a scan really did just happen
---
 .../main/java/org/eehouse/android/xw4/BTInviteDelegate.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
index 547112bb5..57622e655 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTInviteDelegate.java
@@ -203,8 +203,10 @@ public class BTInviteDelegate extends InviteDelegate {
 
         String msg = null;
         if ( mPersisted.stamps.containsKey( devName ) ) {
-            long lastSeenMS = mPersisted.stamps.get( devName );
-            CharSequence elapsed = DateUtils.getRelativeTimeSpanString( lastSeenMS );
+            CharSequence elapsed = DateUtils
+                .getRelativeTimeSpanString( mPersisted.stamps.get( devName ),
+                                            System.currentTimeMillis(),
+                                            DateUtils.SECOND_IN_MILLIS );
             msg = getString( R.string.bt_scan_age_fmt, elapsed );
         }
 

From e0f4a028d134a7ae0fcaca5d221b5f591010246b Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Tue, 8 Jan 2019 19:42:44 -0800
Subject: [PATCH 137/145] remove a bunch of unused methods

---
 .../org/eehouse/android/xw4/GameUtils.java    | 51 -------------------
 1 file changed, 51 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
index 99f887cfd..4069b1b23 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GameUtils.java
@@ -658,57 +658,6 @@ public class GameUtils {
         return rowid;
     }
 
-    public static long makeNewGame( Context context, MultiMsgSink sink,
-                                    int gameID, CommsAddrRec addr, int lang,
-                                    String dict, int nPlayersT,
-                                    int nPlayersH, int forceChannel,
-                                    String gameName )
-    {
-        return makeNewGame( context, sink, DBUtils.GROUPID_UNSPEC, gameID, addr,
-                            lang, dict, nPlayersT, nPlayersH, forceChannel,
-                            gameName );
-    }
-
-    public static long makeNewGame( Context context, int gameID,
-                                    CommsAddrRec addr, int lang,
-                                    String dict, int nPlayersT,
-                                    int nPlayersH, int forceChannel,
-                                    String gameName )
-    {
-        return makeNewGame( context, DBUtils.GROUPID_UNSPEC, gameID, addr,
-                            lang, dict, nPlayersT, nPlayersH, forceChannel,
-                            gameName );
-    }
-
-    public static long makeNewGame( Context context, long groupID,  int gameID,
-                                    CommsAddrRec addr, int lang, String dict,
-                                    int nPlayersT, int nPlayersH,
-                                    int forceChannel, String gameName )
-    {
-        return makeNewGame( context, null, groupID, gameID, addr, lang, dict,
-                            nPlayersT, nPlayersH, forceChannel, gameName );
-    }
-
-    public static long makeNewGame( Context context, MultiMsgSink sink,
-                                    long groupID,  int gameID, CommsAddrRec addr,
-                                    int lang, String dict,
-                                    int nPlayersT, int nPlayersH,
-                                    int forceChannel, String gameName )
-    {
-        long rowid = DBUtils.ROWID_NOTFOUND;
-        int[] langa = { lang };
-        String[] dicta = { dict };
-        boolean isHost = null == addr;
-        if ( isHost ) {
-            addr = new CommsAddrRec( null, null );
-        }
-        String inviteID = GameUtils.formatGameID( gameID );
-        return makeNewMultiGame( context, sink, (UtilCtxt)null, groupID, addr,
-                                 langa, dicta, null, nPlayersT, nPlayersH,
-                                 forceChannel, inviteID, gameID, gameName,
-                                 isHost );
-    }
-
     // @SuppressLint({ "NewApi", "NewApi", "NewApi", "NewApi" })
     // @SuppressWarnings("deprecation")
     // @TargetApi(11)

From 2c73f4ca7777f4a234317262ebfdac48ef205ee6 Mon Sep 17 00:00:00 2001
From: Eric House <eehouse@eehouse.org>
Date: Tue, 8 Jan 2019 20:02:01 -0800
Subject: [PATCH 138/145] don't handle duplicate invitations in DEBUG case

Was creating a second game in some cases in response to duplicated
invitations. Add a test for forceChannel: if there's already a game with
the same gameID *and* forceChannel assume the invitation is a dupe and
drop it.
---
 .../eehouse/android/xw4/XWServiceHelper.java  | 52 ++++++++++++++-----
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
index 7594e4fcd..d9c6a8f2d 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -27,14 +27,15 @@ import android.content.Intent;
 import org.eehouse.android.xw4.MultiService.DictFetchOwner;
 import org.eehouse.android.xw4.MultiService.MultiEvent;
 import org.eehouse.android.xw4.jni.CommsAddrRec;
+import org.eehouse.android.xw4.jni.CurGameInfo;
 import org.eehouse.android.xw4.jni.JNIThread;
 import org.eehouse.android.xw4.jni.UtilCtxt;
 import org.eehouse.android.xw4.jni.UtilCtxtImpl;
+import org.eehouse.android.xw4.jni.XwJNI.GamePtr;
 
 import java.util.HashMap;
 import java.util.Map;
 
-
 abstract class XWServiceHelper {
     private static final String TAG = XWServiceHelper.class.getSimpleName();  
     private Service mService;
@@ -121,14 +122,36 @@ abstract class XWServiceHelper {
     protected boolean handleInvitation( NetLaunchInfo nli, String device,
                                         DictFetchOwner dfo )
     {
-        boolean success = false;
-        long[] rowids = DBUtils.getRowIDsFor( mService, nli.gameID() );
-        if ( 0 == rowids.length
-             || ( rowids.length < nli.nPlayersT // will break for two-per-device game
-                  && XWPrefs.getSecondInviteAllowed( mService ) ) ) {
+        boolean success = nli.isValid() && checkNotInFlight( nli );
+        if ( success ) {
+            long[] rowids = DBUtils.getRowIDsFor( mService, nli.gameID() );
+            if ( 0 == rowids.length ) {
+                // cool: we're good
+            } else if ( rowids.length < nli.nPlayersT ) {
+                success = XWPrefs.getSecondInviteAllowed( mService );
 
-            if ( nli.isValid() && checkNotDupe( nli ) ) {
+                // Allowing a second game allows the common testing action of
+                // sending invitation to myself. But we still need to check
+                // for duplicates! forceChannel's hard to dig up, but works
+                for ( int ii = 0; success && ii < rowids.length; ++ii ) {
+                    long rowid = rowids[ii];
+                    try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
+                        // drop invite if can't open game; likely a dupe!
+                        success = null != lock;
+                        if ( success ) {
+                            CurGameInfo gi = new CurGameInfo( mService );
+                            GamePtr gamePtr = GameUtils
+                                .loadMakeGame( mService, gi, lock );
+                            success = gi.forceChannel != nli.forceChannel;
+                            gamePtr.release();
+                        }
+                    }
+                }
+            } else {
+                success = false;
+            }
 
+            if ( success ) {
                 if ( DictLangCache.haveDict( mService, nli.lang, nli.dict ) ) {
                     long rowid = GameUtils.makeNewMultiGame( mService, nli,
                                                              getSink( 0 ),
@@ -139,12 +162,12 @@ abstract class XWServiceHelper {
                     }
 
                     postNotification( device, nli.gameID(), rowid );
-                    success = true;
                 } else {
                     Intent intent = MultiService
                         .makeMissingDictIntent( mService, nli, dfo );
                     MultiService.postMissingDictNotification( mService, intent,
                                                               nli.gameID() );
+                    success = false;
                 }
             }
         }
@@ -163,20 +186,21 @@ abstract class XWServiceHelper {
     
     // Check that we aren't already processing an invitation with this
     // inviteID.
-    private static final long SEEN_INTERVAL_MS = 1000 * 5;
+    private static final long SEEN_INTERVAL_MS = 1000 * 2;
     private static Map<String, Long> s_seen = new HashMap<>();
-    private boolean checkNotDupe( NetLaunchInfo nli )
+    private boolean checkNotInFlight( NetLaunchInfo nli )
     {
+        boolean inProcess;
         String inviteID = nli.inviteID();
         synchronized( s_seen ) {
             long now = System.currentTimeMillis();
             Long lastSeen = s_seen.get( inviteID );
-            boolean seen = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
-            if ( !seen ) {
+            inProcess = null != lastSeen && lastSeen + SEEN_INTERVAL_MS > now;
+            if ( !inProcess ) {
                 s_seen.put( inviteID, now );
             }
-            Log.d( TAG, "checkNotDupe('%s') => %b", inviteID, !seen );
-            return !seen;
         }
+        Log.d( TAG, "checkNotInFlight('%s') => %b", inviteID, !inProcess );
+        return !inProcess;
     }
 }

From f18a957ed500865a9d80ca9f7379062e6cda7c1a Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 13:55:55 -0800
Subject: [PATCH 139/145] kill progress when owner view goes away

BT Invite progress was sticking around when Board left because it wasn't
foreground.
---
 .../main/java/org/eehouse/android/xw4/DelegateBase.java   | 1 +
 .../main/java/org/eehouse/android/xw4/DlgDelegate.java    | 5 +++++
 .../main/java/org/eehouse/android/xw4/InviteDelegate.java | 8 +-------
 .../java/org/eehouse/android/xw4/WiDirInviteDelegate.java | 6 ++++++
 xwords4/android/app/src/main/res/values/strings.xml       | 2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
index 0900cb3cd..c5b4cf300 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DelegateBase.java
@@ -159,6 +159,7 @@ public class DelegateBase implements DlgClickNotify,
     {
         m_isVisible = false;
         XWServiceHelper.setListener( null );
+        m_dlgDelegate.onPausing();
     }
 
     protected DelegateBase curThis()
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
index 09bba0785..2d2238ee1 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/DlgDelegate.java
@@ -326,6 +326,11 @@ public class DlgDelegate {
         m_handler = new Handler();
     }
 
+    void onPausing()
+    {
+        stopProgress();
+    }
+
     private void showOKOnlyDialogThen( String msg, Action action,
                                        Object[] params, int titleId )
     {
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
index deabdb008..a6e8be4ac 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/InviteDelegate.java
@@ -171,13 +171,7 @@ abstract class InviteDelegate extends ListDelegateBase
         }
     }
 
-    protected void onBarButtonClicked( int id )
-    {
-        Assert.fail();          // subclass must implement
-    }
-
-    // Subclasses can do something here
-    protected void addToButtonBar( FrameLayout container ) {}
+    abstract void onBarButtonClicked( int id );
 
     ////////////////////////////////////////
     // View.OnClickListener
diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
index eaff78b08..0a9c6418c 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/WiDirInviteDelegate.java
@@ -77,6 +77,12 @@ public class WiDirInviteDelegate extends InviteDelegate
         WiDirService.unregisterDevSetListener( this );
     }
 
+    protected void onBarButtonClicked( int id )
+    {
+        // not implemented yet as there's no bar button
+        Assert.assertFalse( BuildConfig.DEBUG );
+    }
+
     @Override
     protected void onChildAdded( View child, InviterItem data )
     {
diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index c7f91bc9f..bdcb737ac 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -1835,7 +1835,7 @@
     <string name="button_scan">Rescan</string>
 
       <!--  -->
-    <string name="invite_progress_title">Connecting...</string>
+    <string name="invite_progress_title">Connecting…</string>
     <string name="invite_progress_fmt">Sending invitation to CrossWords on %1$s</string>
       <!--  -->
     <string name="summary_wait_host">Waiting for connection[s]</string>

From a665df7840db971022556736b59246c9f7119de8 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 13:58:19 -0800
Subject: [PATCH 140/145] cleanup: test's done already

---
 .../app/src/main/java/org/eehouse/android/xw4/Utils.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9e6ec2df2..8252bb8f4 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
@@ -577,7 +577,7 @@ public class Utils {
 
     public static void testSerialization( Serializable obj )
     {
-        if ( BuildConfig.DEBUG ) {
+        if ( false && BuildConfig.DEBUG ) {
             String as64 = serializableToString64( obj );
             Object other = string64ToSerializable( as64 );
             Assert.assertTrue( other.equals( obj ) );

From 250583caea9666a3f4fd3037d078212421c1d014 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Tue, 8 Jan 2019 20:34:22 -0800
Subject: [PATCH 141/145] log when invite response comes back

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

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
index b7044d97f..d14c2e40f 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/BTService.java
@@ -1171,12 +1171,13 @@ public class BTService extends XWService {
                             outStream.writeShort( nliData.length );
                             outStream.write( nliData, 0, nliData.length );
                         }
-                        Log.i( TAG, "<eeh>sending invite" );
+                        Log.i( TAG, "sending invite" );
                         outStream.flush();
 
                         DataInputStream inStream =
                             new DataInputStream( socket.getInputStream() );
                         reply = BTCmd.values()[inStream.readByte()];
+                        Log.i( TAG, "got invite reply: %s", reply );
                     }
 
                     if ( null == reply ) {

From 302a3a502583a0d6ece0d29946b3bfcfca321b70 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Jan 2019 09:51:15 -0800
Subject: [PATCH 142/145] accept invite even if same-gameID game open

more dev-only code, likely: if the game that's sending the invitation is
open when the invitation arrives, should still check if it's a dupe or
should be accepted.
---
 .../eehouse/android/xw4/XWServiceHelper.java    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
index d9c6a8f2d..a624dc047 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/XWServiceHelper.java
@@ -135,17 +135,26 @@ abstract class XWServiceHelper {
                 // for duplicates! forceChannel's hard to dig up, but works
                 for ( int ii = 0; success && ii < rowids.length; ++ii ) {
                     long rowid = rowids[ii];
+                    CurGameInfo gi = null;
                     try ( GameLock lock = GameLock.getFor( rowid ).tryLockRO() ) {
                         // drop invite if can't open game; likely a dupe!
-                        success = null != lock;
-                        if ( success ) {
-                            CurGameInfo gi = new CurGameInfo( mService );
+                        if ( null != lock ) {
+                            gi = new CurGameInfo( mService );
                             GamePtr gamePtr = GameUtils
                                 .loadMakeGame( mService, gi, lock );
-                            success = gi.forceChannel != nli.forceChannel;
                             gamePtr.release();
                         }
                     }
+
+                    if ( null == gi ) {
+                        // locked. Maybe it's open?
+                        JNIThread thread = JNIThread.getRetained( mService, rowid );
+                        if ( null != thread ) {
+                            gi = thread.getGI();
+                            thread.release( false );
+                        }
+                    }
+                    success = null != gi && gi.forceChannel != nli.forceChannel;
                 }
             } else {
                 success = false;

From 011825e4a93b443a8e1ebcf170f59626129513f1 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Jan 2019 18:18:27 -0800
Subject: [PATCH 143/145] cleanup

---
 .../java/org/eehouse/android/xw4/GamesListDelegate.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
index e4c7eae9d..2b1504fa2 100644
--- a/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
+++ b/xwords4/android/app/src/main/java/org/eehouse/android/xw4/GamesListDelegate.java
@@ -1779,7 +1779,7 @@ public class GamesListDelegate extends ListDelegateBase
         return handled;
     }
 
-    private boolean handleSelGamesItem( int itemID, final long[] selRowIDs )
+    private boolean handleSelGamesItem( int itemID, long[] selRowIDs )
     {
         boolean handled = true;
         boolean dropSels = false;
@@ -1818,8 +1818,9 @@ public class GamesListDelegate extends ListDelegateBase
                 .show();
             break;
         case R.id.games_game_copy:
+            final long selRowID = selRowIDs[0];
             final GameSummary smry = GameUtils.getSummary( m_activity,
-                                                           selRowIDs[0] );
+                                                           selRowID );
             if ( smry.inRelayGame() ) {
                 makeOkOnlyBuilder( R.string.no_copy_network ).show();
             } else {
@@ -1828,7 +1829,7 @@ public class GamesListDelegate extends ListDelegateBase
                         public void run() {
                             Activity self = m_activity;
                             byte[] stream =
-                                GameUtils.savedGame( self, selRowIDs[0] );
+                                GameUtils.savedGame( self, selRowID );
                             long groupID = XWPrefs
                                 .getDefaultNewGameGroup( self );
                             try ( GameLock lock =

From d257369639e32427b8a5cd9a1fd696bc5c13ebb3 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Jan 2019 18:25:52 -0800
Subject: [PATCH 144/145] use same invite prefix for all variants

I want to be able to invite one app to the other's games to better test
relay. Since I'm the only one using the Dbg variant should be no impact.
---
 xwords4/android/app/build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 21bc531e4..91b797cd4 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -63,6 +63,7 @@ android {
     productFlavors {
         all {
             buildConfigField "String", "BUILD_INFO_NAME", "\"${BUILD_INFO_NAME}\""
+            resValue "string", "invite_prefix", "/and/"
         }
 
         xw4 {
@@ -71,7 +72,6 @@ android {
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossWords"
             resValue "string", "nbs_port", "3344"
-            resValue "string", "invite_prefix", "/and/"
             buildConfigField "boolean", "WIDIR_ENABLED", "false"
             buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false"
 
@@ -84,7 +84,6 @@ android {
             manifestPlaceholders = [ APP_ID: applicationId ]
             resValue "string", "app_name", "CrossWords"
             resValue "string", "nbs_port", "3344"
-            resValue "string", "invite_prefix", "/and/"
             buildConfigField "boolean", "WIDIR_ENABLED", "false"
             buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "false"
 
@@ -96,7 +95,6 @@ android {
             manifestPlaceholders = [ FABRIC_API_KEY: "$FABRIC_API_KEY", APP_ID: applicationId, ]
             resValue "string", "app_name", "CrossDbg"
             resValue "string", "nbs_port", "3345"
-            resValue "string", "invite_prefix", "/anddbg/"
             buildConfigField "boolean", "WIDIR_ENABLED", "true"
             buildConfigField "boolean", "RELAYINVITE_SUPPORTED", "true"
 

From d2cbcf1e71746bdaeaa4dea6a4045b19a59f58e4 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Wed, 9 Jan 2019 18:57:50 -0800
Subject: [PATCH 145/145] tweak BT background notification icon and expl. text

The BT icon part was too thick. And the explanation was TMI.
---
 .../src/main/res/drawable/notify_btservice.png  | Bin 313 -> 308 bytes
 .../android/app/src/main/res/values/strings.xml |   6 +++---
 .../src/xw4d/res/drawable/notify_btservice.png  | Bin 472 -> 471 bytes
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xwords4/android/app/src/main/res/drawable/notify_btservice.png b/xwords4/android/app/src/main/res/drawable/notify_btservice.png
index 99209ad54c28cdc894b71a142c34128a1f59581a..c1f6aa86e2f2e66757bfcc58e70d22140d1d6869 100644
GIT binary patch
delta 206
zcmV;<05Si$0<;2<Zhzwe3IZ%R9BvH;0001_Nkl<ZD9^ppI}XDj3<hARL?yNi@qJ(@
za|XO;&M7+e99ff77CQv~4y^Tn@(KJv#F%mL6+yl&!d0w)0U_)V6X|$@7tc;>$Qqeq
z!@?9AGQm!Ebme#{7H8@RhC8xFIKYBCVFEa)R+{!cZ5)q-dPluNJ@z=ygSi$k3K=J^
z^;M*4x*;jg8zm(-Nauw3>>bep0%F5soDiF$jHmH~_xPXs0_RbN8fk#-IsgCw07*qo
IM6N<$f+Xfux&QzG

delta 211
zcmV;^04)Es0=WW^Zhztn8xt5WP&!GE0001~Nkl<ZD9^3ZI}U>|3<hAkYAUgH>3zab
z<{%||W=_$m=jd8aSwCWMB-rYOe8O>l1pv;gXhmM5M`)=3!|ahd1P}Cp4ng8IpiE~x
z(-j^DB-on_z76j3s4&QW-qMiuCKN>vI6&4rIv5bajiz(ZkW9BYLkqf(wrrPm{StH<
zC}=%a{VIvOCIfff44la@Gpvm(zdt)hbch~{Z!43>BA|Fu9bV`E)DI#mfBnlhpe+CZ
N002ovPDHLkV1nfkSyBK1

diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml
index bdcb737ac..55019e2db 100644
--- a/xwords4/android/app/src/main/res/values/strings.xml
+++ b/xwords4/android/app/src/main/res/values/strings.xml
@@ -2669,9 +2669,9 @@
   name before you create this game?</string>
 
   <string name="btservice_expl">This notification is present whenever
-  CrossWords is running in the background to accept Bluetooth messages.
-  Because messages come in clusters, it usually runs for
-  about 15 minutes after the last message is received.
+  CrossWords is running in the background to accept Bluetooth
+  messages. It usually runs for about 15 minutes after CrossWords
+  starts or a Bluetooth message is received.
   </string>
 
   <string name="no_invites">This game has sent no invitations</string>
diff --git a/xwords4/android/app/src/xw4d/res/drawable/notify_btservice.png b/xwords4/android/app/src/xw4d/res/drawable/notify_btservice.png
index 43be5ea612a7932b2b38786951463905023e31b1..9f97effce2aba6c588f7e666155a5af609266fa4 100644
GIT binary patch
delta 307
zcmcb?e4Tm1+WN<gTuerSU2|7$Wnf@f=IP=XqH%ujB}cwy1p(FouS>@&gbr!$X;~NT
z?_}X<e%F83ubIJOZb#oY<)$n9rzbefd3`MRUec-^@f%jS8m;NM?&L9VqNVP<iZwmy
zj8dnvGc!$}JIp<^vhLZ=1wDd1lN}e_|5PDuWMW?N;)a4lj)Opb?uCQGmpmq%h?nTg
z64-RfDomx?+G68&<vTCfIJdEG^fbJ|*!gzPJV*9~7x53K{`=SXZ*GzOL*Eat^?ILj
z0G+H_;u=wsl30>zm0Xkxq!^403@vpH40R1GLkumfOf0Mnfouya1B1gmgKSVV<mRVj
f>ZDbo>oBu2F@WfB+I9aiPzQsjtDnm{r-UW|7VUW)

delta 308
zcmcc4e1mzy+WJS_vdjva)4SKaWnf@f?&;zfqH%uhB}2Z$3OuX<;wwXsYFZU{#WbDC
z^-D@Ub7kr7tDHZl992_GI}zq@^D(uD;lUQYomW+M@Xd(i7VSQsU3TEX#$ORu1<@?G
z`<5$6z1k)5M8?F!xZ}^solZf#lbN)$_KJS!i0AiVYq9<!%fwMH%euwc`Rr0=mKvsl
zjSCsK7N1C)Ec3N6XZf4vN&A^z2Bb`w{h8s50>9jb$`AhqZtUIn@Q?pN{>2Aw-2Qxc
zFALDkswJ)wB`Jv|saDBFsX&Us$iUD-*U(Vc$Rfnh(#put3dl9Eure^1&QoZNq9Hdw
bMK?3861R?LfhYTcIv6}%{an^LB{Ts5jQ4l4