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 39cb3ff17..8e96882d0 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 @@ -56,6 +56,7 @@ public class BTInviteDelegate extends InviteDelegate { private Activity m_activity; private ProgressBar mProgressBar; private Handler m_handler = new Handler(); + private int mNDevsThisScan; private static class Persisted implements Serializable { List pairs; @@ -178,7 +179,7 @@ public class BTInviteDelegate extends InviteDelegate { public void run() { hideProgress(); - if ( mPersisted.empty() ) { + if ( mPersisted.empty() || 0 == mNDevsThisScan ) { makeNotAgainBuilder( R.string.not_again_emptybtscan, R.string.key_notagain_emptybtscan ) .show(); @@ -235,6 +236,7 @@ public class BTInviteDelegate extends InviteDelegate { int count = BTService.getPairedCount( m_activity ); if ( 0 < count ) { + mNDevsThisScan = 0; showProgress( count, SCAN_SECONDS ); BTService.scan( m_activity, 1000 * SCAN_SECONDS ); } else { @@ -249,6 +251,7 @@ public class BTInviteDelegate extends InviteDelegate { { DbgUtils.assertOnUIThread(); + ++mNDevsThisScan; mPersisted.add( dev.getAddress(), dev.getName() ); store(); diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 8da2dbaad..e8dc5c0c4 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -2763,8 +2763,9 @@ In-game events 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 + • First, just Rescan\n + • Make sure Bluetooth is enabled on the other device\n • Launch CrossWords on the other device\n + • If all else fails, reboot this device\n