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 765a2ca86..39cb3ff17 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 @@ -159,12 +159,11 @@ public class BTInviteDelegate extends InviteDelegate { BTService.openBTSettings( m_activity ); break; case R.id.button_clear: - mPersisted.remove( getChecked() ); - store(); - - clearChecked(); - updateListAdapter( mPersisted.pairs ); - tryEnable(); + int count = getChecked().size(); + String msg = getQuantityString( R.plurals.confirm_clear_bt_fmt, + count, count ) + + getString( R.string.confirm_clear_bt_postscript ); + makeConfirmThenBuilder( msg, Action.CLEAR_ACTION ).show(); break; } } @@ -323,6 +322,14 @@ public class BTInviteDelegate extends InviteDelegate { case OPEN_BT_PREFS_ACTION: BTService.openBTSettings( m_activity ); break; + case CLEAR_ACTION: + mPersisted.remove( getChecked() ); + store(); + + clearChecked(); + updateListAdapter( mPersisted.pairs ); + tryEnable(); + break; default: handled = super.onPosButton( action, params ); } 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 873470bc6..1f69862d0 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 @@ -196,12 +196,13 @@ public class RelayService extends JobIntentService enqueueWork( context, intent ); } - // Must use the same lobID for all work enqueued for the same class + // Must use the same jobID for all work enqueued for the same class private final static int sJobID = RelayService.class.hashCode(); private static void enqueueWork( Context context, Intent intent ) { - Log.d( TAG, "calling enqueueWork(cmd=%s)", cmdFrom( intent ) ); + Log.d( TAG, "calling enqueueWork(id=%d, cmd=%s)", sJobID, + cmdFrom( intent ) ); enqueueWork( context, RelayService.class, sJobID, intent ); } diff --git a/xwords4/android/app/src/main/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml index 76db90450..8da2dbaad 100644 --- a/xwords4/android/app/src/main/res/values/strings.xml +++ b/xwords4/android/app/src/main/res/values/strings.xml @@ -1871,8 +1871,9 @@ - \n\n(The list is of devices you\'ve - paired and on which CrossWords has been detected.) + \n\n(The list is of + paired devices on which CrossWords has been detected via a + scan.) Scanning for CrossWords @@ -1969,6 +1970,14 @@ Are you sure you want to delete the %1$d checked RelayID records? + + Are you sure you want to forget the checked + device? + Are you sure you want to forget %1$d + checked devices? + + \n\n(You can re-add devices + only when they are within BlueTooth range.) Game in play with %1$s