From 0450a3852cbac4922d237e13fd44bd46ad77b69a Mon Sep 17 00:00:00 2001
From: hoeveid <iddo.hoeve@intensec.be>
Date: Sat, 20 Jan 2024 14:20:06 +0100
Subject: [PATCH] BLE initial

---
 res/layout-land/ble_scan_result.xml           |  67 +++++++
 res/layout-land/constraint.xml                |   1 +
 res/layout/ble_scan_result.xml                |   4 +-
 res/layout/constraint.xml                     |   2 +-
 res/values/bluetooth.xml                      |   7 +
 .../scoreboard/bluetooth_le/BLEHandler.java   |  14 +-
 .../bluetooth_le/BLEReceiverManager.java      |   4 +-
 .../scoreboard/bluetooth_le/BLEUtil.java      |   9 +
 .../selectdevice/BLEActivity.java             | 177 ++++++++++++++----
 .../scoreboard/main/ScoreBoard.java           |  74 ++++----
 .../doubleyellow/scoreboard/vico/IBoard.java  |   8 +-
 11 files changed, 279 insertions(+), 88 deletions(-)
 create mode 100644 res/layout-land/ble_scan_result.xml

diff --git a/res/layout-land/ble_scan_result.xml b/res/layout-land/ble_scan_result.xml
new file mode 100644
index 00000000..9bdd632b
--- /dev/null
+++ b/res/layout-land/ble_scan_result.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="8dp"
+    >
+
+    <TextView
+        android:id="@+id/device_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="Wrist Band Name" />
+
+    <TextView
+        android:id="@+id/mac_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        app:layout_constraintTop_toBottomOf="@id/device_name"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:text="MAC: XX:XX:XX:XX:XX" />
+
+    <Button
+        android:id="@+id/use_as_device_b"
+        style="@style/SBButton"
+        android:layout_width="44dp"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:text="B"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+    <Button
+        android:id="@+id/use_as_device_a"
+        style="@style/SBButton"
+        android:layout_width="44dp"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        android:text="A"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/use_as_device_b" />
+    <TextView
+        android:id="@+id/signal_strength"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/use_as_device_a"
+        tools:text="-58 dBm" />
+    <TextView
+        android:id="@+id/device_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="14sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/use_as_device_a"
+        tools:text="0.1 m" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout-land/constraint.xml b/res/layout-land/constraint.xml
index ac98aa27..d239d5f5 100644
--- a/res/layout-land/constraint.xml
+++ b/res/layout-land/constraint.xml
@@ -331,6 +331,7 @@
         app:layout_constraintEnd_toEndOf="@id/btn_score2"
         app:layout_constraintHorizontal_bias="0.95"
         app:layout_constraintVertical_bias="0.05"
+        android:contentDescription="showing if bluetooth connection is active"
         android:gravity="center"
         android:visibility="visible"
         app:layout_constraintHeight_percent="@fraction/ls_fr_bluetooth_icon_height"
diff --git a/res/layout/ble_scan_result.xml b/res/layout/ble_scan_result.xml
index 0f49ef86..e0bc9dbf 100644
--- a/res/layout/ble_scan_result.xml
+++ b/res/layout/ble_scan_result.xml
@@ -51,8 +51,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textSize="14sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/use_as_device_a"
+        app:layout_constraintTop_toBottomOf="@id/mac_address"
+        app:layout_constraintStart_toStartOf="@id/mac_address"
         tools:text="-58 dBm" />
     <TextView
         android:id="@+id/device_distance"
diff --git a/res/layout/constraint.xml b/res/layout/constraint.xml
index be94e65e..f3c20155 100644
--- a/res/layout/constraint.xml
+++ b/res/layout/constraint.xml
@@ -358,7 +358,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:gravity="center"
         android:visibility="visible"
-        android:text="Some information about ble connected devices"
+        android:text="Some information about or from ble connected devices"
         app:layout_constraintHeight_percent="0.04"
         android:layout_width="0dp" android:layout_height="0dp"
         android:textColor="@android:color/white"
diff --git a/res/values/bluetooth.xml b/res/values/bluetooth.xml
index 1752eff4..3b62e757 100644
--- a/res/values/bluetooth.xml
+++ b/res/values/bluetooth.xml
@@ -3,12 +3,19 @@
 
     <string name="ble_start_scan">Start scan</string>
     <string name="ble_stop_scan">Stop scan</string>
+    <string name="ble_scanning">Scanning</string>
     <string name="ble_start_scoring_with_devices">Start scoring with devices</string>
     <string name="ble_score_cancelled_by_opponent_x_by_pressing_y">Score cancelled by opponent %1$s by pressing %2$s</string>
     <string name="ble_score_cancelled_by_initiator_x_by_pressing_y">Score cancelled by initiator %1$s by pressing %2$s</string>
     <string name="ble_score_confirmed_by_opponent_x_by_pressing_y">Score confirmed by opponent %1$s by pressing %2$s</string>
     <string name="ble_x_confirm_score_for_y_by_pressing_z">%1$s, confirm score for %2$s by pressing %3$s</string>
     <string name="ble_score_for_X_changed_by_ble">Score for %1$s changed by BLE</string>
+    <plurals name="ble_ready_for_scoring_with_devices">
+        <item quantity="one">Ready for scoring with the BLE device</item>
+        <item quantity="other">Ready for scoring with both BLE devices</item>
+    </plurals>
+    <string name="ble_only_one_of_two_devices_connected">Only one of 2 devices connected</string>
+    <string name="ble_Lost_connection_to_a_device">Lost connection to a BLE device</string>
 
     <string name="bt_disconnect">Disconnect</string>
     <string name="bt_pull_or_push">Choose</string>
diff --git a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEHandler.java b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEHandler.java
index d5cc5b03..c751e1cc 100644
--- a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEHandler.java
+++ b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEHandler.java
@@ -26,6 +26,7 @@
 import com.doubleyellow.scoreboard.bluetooth.BTMessage;
 import com.doubleyellow.scoreboard.bluetooth.MessageSource;
 import com.doubleyellow.scoreboard.main.ScoreBoard;
+import com.doubleyellow.scoreboard.R;
 
 /**
  * Handler specific for BluetoothLE messages.
@@ -63,20 +64,21 @@ public BLEHandler(ScoreBoard scoreBoard) {
                 case CONNECTED_DiscoveringServices:
                     break;
                 case CONNECTED_TO_1_of_2:
-                    sb.setBluetoothBLEIconVisibility(View.VISIBLE, 1);
+                    sb.updateBLEConnectionStatus(View.VISIBLE, 1, sb.getString(R.string.ble_only_one_of_two_devices_connected), -1);
                     break;
                 case CONNECTED_ALL:
-                    sb.setBluetoothBLEIconVisibility(View.VISIBLE, iNrOfDevices);
+                    String sUIMsg = sb.getResources().getQuantityString(R.plurals.ble_ready_for_scoring_with_devices, iNrOfDevices);
+                    sb.updateBLEConnectionStatus(View.VISIBLE, iNrOfDevices, sUIMsg, 10);
                     break;
                 case DISCONNECTED:
-                    sb.setBluetoothBLEIconVisibility(View.INVISIBLE, -1);
+                    sb.updateBLEConnectionStatus(View.INVISIBLE, -1, "Oeps 3", -1);
                     break;
                 case CONNECTING:
-                    sb.setBluetoothBLEIconVisibility(View.VISIBLE, iNrOfDevices);
+                    sb.updateBLEConnectionStatus(View.VISIBLE, iNrOfDevices, null, -1);
                     break;
                 case DISCONNECTED_Gatt:
-                    // if one of the two devices
-                    sb.setBluetoothBLEIconVisibility(View.VISIBLE, iNrOfDevices);
+                    // if one of the two devices disconnects
+                    sb.updateBLEConnectionStatus(View.VISIBLE, iNrOfDevices, sb.getString(R.string.ble_Lost_connection_to_a_device), -1);
                     break;
                 default:
                     Toast.makeText(sb, sMsg, Toast.LENGTH_LONG).show();
diff --git a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEReceiverManager.java b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEReceiverManager.java
index 85b7af55..16949131 100644
--- a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEReceiverManager.java
+++ b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEReceiverManager.java
@@ -284,8 +284,8 @@ private class MyBluetoothGattCallback extends BluetoothGattCallback
         }
         void translateToBTMessageAndSendToMain(BluetoothGattCharacteristic characteristic, byte[] value) {
             if ( false ) {
-                Log.d(TAG, "iValue : " + value[0]);
-                Log.d(TAG, "sValue : " + new String(value));
+                Log.d(TAG, "value[0] : " + value[0]);
+                Log.d(TAG, "sValue   : " + new String(value));
                 for (int i = 0; i < value.length; i++) {
                     Log.d(TAG, "b[" + i + "] : " + value[i]);
                 }
diff --git a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEUtil.java b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEUtil.java
index 9a636032..ccaba586 100644
--- a/src/com/doubleyellow/scoreboard/bluetooth_le/BLEUtil.java
+++ b/src/com/doubleyellow/scoreboard/bluetooth_le/BLEUtil.java
@@ -44,6 +44,15 @@ public class BLEUtil
 {
     private final static String TAG = "SB.BLEUtil";
 
+    @NonNull
+    public static String[] getPermissions() {
+        String[] permissions = {Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION};
+        if ( Build.VERSION.SDK_INT < Build.VERSION_CODES.S ) {
+            permissions = new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION };
+        }
+        return permissions;
+    }
+
     public enum Keys {
         DeviceNameMustMatch,
         DeviceNameStartsWith,
diff --git a/src/com/doubleyellow/scoreboard/bluetooth_le/selectdevice/BLEActivity.java b/src/com/doubleyellow/scoreboard/bluetooth_le/selectdevice/BLEActivity.java
index 5f36cb6f..6a5d3fdd 100644
--- a/src/com/doubleyellow/scoreboard/bluetooth_le/selectdevice/BLEActivity.java
+++ b/src/com/doubleyellow/scoreboard/bluetooth_le/selectdevice/BLEActivity.java
@@ -16,6 +16,8 @@
  */
 package com.doubleyellow.scoreboard.bluetooth_le.selectdevice;
 
+import android.Manifest;
+import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.le.BluetoothLeScanner;
@@ -23,23 +25,28 @@
 import android.bluetooth.le.ScanResult;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
+import android.os.CountDownTimer;
 import android.util.Log;
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import com.doubleyellow.scoreboard.R;
 
 import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.doubleyellow.scoreboard.activity.XActivity;
 import com.doubleyellow.scoreboard.bluetooth_le.BLEUtil;
 import com.doubleyellow.scoreboard.model.Player;
+import com.doubleyellow.scoreboard.prefs.ColorPrefs;
 import com.doubleyellow.scoreboard.prefs.PreferenceKeys;
 import com.doubleyellow.scoreboard.prefs.PreferenceValues;
+import com.doubleyellow.util.ListUtil;
+import com.doubleyellow.util.MapUtil;
 import com.doubleyellow.util.StringUtil;
 
 import org.json.JSONObject;
@@ -51,21 +58,26 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-public class BLEActivity extends XActivity
+/**
+ * Activity in which user can start scanning for BLE devices and select a devices for player A and B.
+ */
+public class BLEActivity extends XActivity implements ActivityCompat.OnRequestPermissionsResultCallback
 {
     BluetoothAdapter   bluetoothAdapter = null;
-    BluetoothLeScanner bleScanner = null;
+    BluetoothLeScanner bleScanner       = null;
 
     private final List<ScanResult>   scanResults          = new ArrayList<>();
     private final Map<String, Long>  mAddress2LastSeen    = new HashMap<>();
     private final Map<Player,String> mSelectedSeenDevices = new HashMap<>();
-    private ScanResultAdapter scanResultAdapter = null;
+    private       ScanResultAdapter  scanResultAdapter    = null;
 
     private boolean m_bIsScanning  = false;
     private Pattern pMustMatch     = null;
     private String  sMustStartWith = null;
     private double  fRssiValueAt1M = -50.0f;
     private Button  btnGo;
+    private Button  btnScan;
+    private    int  m_iProgress = -1;
 
     private static final long lUpdateInterval     = 1000L; // must be smaller then 2 values below
     private static final long lCleanupCheckEvery  = 2000L;
@@ -87,15 +99,15 @@ public class BLEActivity extends XActivity
         btnGo = findViewById(R.id.ble_start_button);
         btnGo.setOnClickListener(v -> {
             bleScanner.stopScan(scanCallback);
-            PreferenceValues.setString(PreferenceKeys.BluetoothLE_Peripheral1, this, "");
-            PreferenceValues.setString(PreferenceKeys.BluetoothLE_Peripheral2, this, "");
-            for(Player p : mSelectedSeenDevices.keySet() ) {
-                String sAddress = mSelectedSeenDevices.get(p);
-                PreferenceKeys key = p.equals(Player.A) ? PreferenceKeys.BluetoothLE_Peripheral1 : PreferenceKeys.BluetoothLE_Peripheral2;
-                PreferenceValues.setString(key, this, sAddress);
-            }
             Intent intent = new Intent();
             setResult(RESULT_OK, intent);
+            for( Player p: Player.values() ) {
+                String sDevice = mSelectedSeenDevices.get(p);
+                if ( StringUtil.isNotEmpty(sDevice) ) {
+                    intent.putExtra(p.toString(), sDevice);
+                }
+            }
+
             finish();
         });
         btnGo.setEnabled(false);
@@ -115,7 +127,7 @@ public class BLEActivity extends XActivity
         Map<Player, String> mSelectedPrefDevices = Collections.unmodifiableMap(mTmp);
         scanResultAdapter = new ScanResultAdapter(scanResults, fRssiValueAt1M, mSelectedSeenDevices, mSelectedPrefDevices);
 
-        Button btnScan = findViewById(R.id.ble_scan_button);
+        btnScan = findViewById(R.id.ble_scan_button);
         btnScan.setOnClickListener(v -> {
             if ( bleScanner == null ) {
                 Toast.makeText(this, "Is bluetooth enabled?", Toast.LENGTH_LONG).show();
@@ -124,17 +136,10 @@ public class BLEActivity extends XActivity
             if ( m_bIsScanning ) {
                 m_bIsScanning = false;
                 bleScanner.stopScan(scanCallback);
-                //stopBleScan();
             } else {
-                m_bIsScanning = true;
-                if ( scanResults.size() > 0 ) {
-                    scanResults.clear();
-                    scanResultAdapter.notifyDataSetChanged();
-                }
-                bleScanner.startScan(null, BLEUtil.scanSettings, scanCallback);
+                m_bIsScanning = startScan(true);
             }
-            TextView btn = (TextView) v;
-            btn.setText(m_bIsScanning ? R.string.ble_stop_scan : R.string.ble_start_scan);
+            updateScanButton(m_iProgress);
         });
 
         RecyclerView recyclerView = findViewById(R.id.scan_results_recycler_view);
@@ -151,6 +156,111 @@ public class BLEActivity extends XActivity
                 Toast.makeText(this, "Devices pattern is not valid: " + sRegExp, Toast.LENGTH_LONG).show();
             }
         }
+
+        //ColorPrefs.setColors(this, findViewById(R.id.ble_activity_root));
+    }
+
+    private CountDownTimer dcUpdateGui;
+    private long           m_lStopScanningAfterXSeconds = 60 * 10; // TODO: preference?
+    private boolean startScan(boolean bCheckPermissions) {
+
+        if ( scanResults.size() > 0 ) {
+            scanResults.clear();
+            scanResultAdapter.notifyDataSetChanged();
+            btnGo.setEnabled(false);
+        }
+        // TODO: check permissions BLUETOOTH_SCAN
+        if ( ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.BLUETOOTH_SCAN)  ) {
+            String[] permissions = BLEUtil.getPermissions();
+            ActivityCompat.requestPermissions(this, permissions, PreferenceKeys.UseBluetoothLE.ordinal());
+        } else {
+            if ( ActivityCompat.checkSelfPermission(this, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED ) {
+                bleScanner.startScan(null, BLEUtil.scanSettings, scanCallback);
+            } else {
+                String sMsg = "The app has not been granted the permission to find nearby devices...";
+                //Toast.makeText(this, sMsg, Toast.LENGTH_LONG).show();
+                (new AlertDialog.Builder(this)).setTitle("Permission").setIcon(android.R.drawable.stat_sys_data_bluetooth).setMessage(sMsg).show();
+                return false;
+            }
+        }
+
+        dcUpdateGui = new CountDownTimer(m_lStopScanningAfterXSeconds * 1000, 500) {
+            @Override public void onTick(long millisUntilFinished) {
+                checkForUnseen();
+                btnGo.setEnabled(mSelectedSeenDevices.size() == 2);
+                updateScanButton(m_iProgress++);
+            }
+            @Override public void onFinish() {
+                m_bIsScanning = false;
+                if ( bleScanner != null ) {
+                    bleScanner.stopScan(scanCallback);
+                }
+                updateScanButton(0);
+            }
+        };
+        dcUpdateGui.start();
+        return true;
+    }
+
+    private long lLastCleanupOfDevicesNoLongerBroadcasting = 0L;
+
+    private void checkForUnseen() {
+        long lNow = System.currentTimeMillis();
+        if ( lNow - lLastCleanupOfDevicesNoLongerBroadcasting > lCleanupCheckEvery ) {
+            Log.i(TAG, "Checking for unseen devices");
+            int iSizeBeforeClean = scanResults.size();
+            for(int i = iSizeBeforeClean -1; i >=0; i--) {
+                String previousFoundAddress = scanResults.get(i).getDevice().getAddress();
+                long lLastSeen = mAddress2LastSeen.get(previousFoundAddress);
+                if ( lNow - lLastSeen > lCleanupIfUnseenFor ) {
+                    Log.w(TAG, "Removing unseen device " + previousFoundAddress);
+                    scanResults.remove(i);
+                    scanResultAdapter.notifyItemRemoved(i);
+                    if (MapUtil.isNotEmpty(mSelectedSeenDevices)) {
+                        List<Player> lPlayersSelectedToUseDevice = new ArrayList<>();
+                        for (Player p : Player.values()) {
+                            String sSelectedForP = mSelectedSeenDevices.get(p);
+                            if ( sSelectedForP.equalsIgnoreCase(previousFoundAddress) ) {
+                                lPlayersSelectedToUseDevice.add(p);
+                            }
+                        }
+                        if (ListUtil.isNotEmpty(lPlayersSelectedToUseDevice) ) {
+                            for(Player p: lPlayersSelectedToUseDevice ) {
+                                mSelectedSeenDevices.remove(p);
+                            }
+                        }
+                    }
+                }
+            }
+            Log.i(TAG, "Selected Seen Devices : " + mSelectedSeenDevices);
+            lLastCleanupOfDevicesNoLongerBroadcasting = lNow;
+        }
+    }
+    private void updateScanButton( int iProgress ) {
+        btnScan.setText(m_bIsScanning ? R.string.ble_stop_scan : R.string.ble_start_scan);
+
+        // some stupid implementation to show scan is still busy
+        if ( m_bIsScanning && iProgress > 0 ) {
+            final String C_PROGRESS = ".....";
+            String sCaption = getString(R.string.ble_scanning);
+            int iSubStr = iProgress % C_PROGRESS.length();
+            String sProgress = C_PROGRESS.substring(0,iSubStr) + " " + C_PROGRESS.substring(iSubStr+1);
+            btnScan.setText(sCaption + " " + sProgress);
+        }
+    }
+
+    @Override public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults); // 225, BLEUtil.permissions, [-1,-1,0,0]
+        boolean bStartScan = true;
+        for (int i = 0; i < permissions.length; i++) {
+            if ( grantResults[i] == PackageManager.PERMISSION_DENIED ) {
+                bStartScan = false;
+                break;
+            }
+        }
+        if ( bStartScan ) {
+            m_bIsScanning = startScan(false);
+        }
     }
 
     @Override protected void onDestroy() {
@@ -158,6 +268,9 @@ public class BLEActivity extends XActivity
         if ( bleScanner != null ) {
             bleScanner.stopScan(scanCallback);
         }
+        if ( dcUpdateGui != null ) {
+            dcUpdateGui.cancel();
+        }
     }
 
     @Override protected void onPause() {
@@ -166,8 +279,6 @@ public class BLEActivity extends XActivity
 
     private final ScanCallback scanCallback = new ScanCallback()
     {
-        private long lLastCleanupOfDevicesNoLongerBroadcasting = 0L;
-
         private final Map mDiscardedBecauseOfRegexp = new HashMap();
 
         @Override public void onScanResult(int callbackType, ScanResult result) {
@@ -219,24 +330,6 @@ public class BLEActivity extends XActivity
                 mAddress2LastSeen.put(address, lNow);
             }
 
-            if ( lNow - lLastCleanupOfDevicesNoLongerBroadcasting > lCleanupCheckEvery ) {
-                Log.i(TAG, "Checking for unseen devices");
-                int iSizeBeforeClean = scanResults.size();
-                for(int i = iSizeBeforeClean -1; i >=0; i--) {
-                    String previousFoundAddress = scanResults.get(i).getDevice().getAddress();
-                    long lLastSeen = mAddress2LastSeen.get(previousFoundAddress);
-                    if ( lNow - lLastSeen > lCleanupIfUnseenFor ) {
-                        Log.w(TAG, "Removing unseen device " + previousFoundAddress);
-                        scanResults.remove(i);
-                        scanResultAdapter.notifyItemRemoved(i);
-
-                        mSelectedSeenDevices.remove(previousFoundAddress);
-                    }
-                }
-                Log.i(TAG, "Selected Seen Devices : " + mSelectedSeenDevices);
-                btnGo.setEnabled(mSelectedSeenDevices.size() == 2);
-                lLastCleanupOfDevicesNoLongerBroadcasting = lNow;
-            }
         }
 
         @Override public void onBatchScanResults(List<ScanResult> results) {
@@ -244,7 +337,9 @@ public class BLEActivity extends XActivity
         }
 
         @Override public void onScanFailed(int errorCode) {
+            Log.w(TAG, "Scanning failed : " + errorCode);
             super.onScanFailed(errorCode);
         }
     };
+
 }
diff --git a/src/com/doubleyellow/scoreboard/main/ScoreBoard.java b/src/com/doubleyellow/scoreboard/main/ScoreBoard.java
index 484348cd..f636e65b 100644
--- a/src/com/doubleyellow/scoreboard/main/ScoreBoard.java
+++ b/src/com/doubleyellow/scoreboard/main/ScoreBoard.java
@@ -5007,10 +5007,19 @@ private boolean _showNewBallsMessage(int iInXGames) {
         super.onActivityResult(requestCode_MenuId, resultCode, data);
 
         if ( requestCode_MenuId == R.id.sb_ble_devices ) {
-            if ( data != null ) {
+            if ( resultCode == RESULT_OK ) {
                 Bundle extras = data.getExtras();
+                PreferenceValues.setString(PreferenceKeys.BluetoothLE_Peripheral1, this, "");
+                PreferenceValues.setString(PreferenceKeys.BluetoothLE_Peripheral2, this, "");
+                for(Player p : Player.values() ) {
+                    String sAddress = extras.getString(p.toString());
+                    PreferenceKeys key = p.equals(Player.A) ? PreferenceKeys.BluetoothLE_Peripheral1 : PreferenceKeys.BluetoothLE_Peripheral2;
+                    PreferenceValues.setString(key, this, sAddress);
+                }
                 m_bBLEDevicesSelected = true;
                 onResumeInitBluetoothBLE();
+            } else {
+                m_bBLEDevicesSelected = false;
             }
         }
         if ( requestCode_MenuId == R.id.sb_settings ) {
@@ -6244,9 +6253,9 @@ private void dbgmsg(String s, int iResId, int iResId2) {
         }
     }
 
-    // ----------------------------------------------------
-    // --------------------- bluetooth BLE-----------------
-    // ----------------------------------------------------
+    // -----------------------------------------------------
+    // --------------------- bluetooth BLE -----------------
+    // -----------------------------------------------------
     private void selectBleDevices() {
         if ( PreferenceValues.useBluetoothLE(this) == false ) { return; }
 
@@ -6268,18 +6277,39 @@ private void selectBleDevices() {
         Intent bleActivity = new Intent(this, BLEActivity.class);
         startActivityForResult(bleActivity, R.id.sb_ble_devices);
     }
+    public void updateBLEConnectionStatus(int visibility, int nrOfDevicesConnected, String sMsg, int iDurationSecs) {
+        if ( iBoard == null ) {
+            return;
+        }
+
+        iBoard.updateBLEConnectionStatusIcon(visibility, nrOfDevicesConnected);
+        if ( visibility == View.INVISIBLE ) {
+            iBoard.showBLEMessage(null, null, -1);
+        } else {
+            if ( StringUtil.isNotEmpty(sMsg) ) {
+                iBoard.showBLEMessage(null, sMsg, iDurationSecs);
+            }
+        }
+    }
 
-    private        JSONObject         m_bleConfig                = null;
-    private        BLEDeviceButton m_eConfirmScoreByOpponentButton = BLEDeviceButton.SECONDARY_BUTTON;
-    private        BLEDeviceButton m_eCancelScoreByInitiatorButton = BLEDeviceButton.SECONDARY_BUTTON;
-    private        BLEReceiverManager m_bleReceiverManager       = null;
-    private static boolean         m_bBLEDevicesSelected                 = false;
-    private static Player          blePlayerWaitingForScoreToBeConfirmed = null;
-    private static BLEDeviceButton bleButtonUsedToIndicate_IScored       = null;
+
+    private boolean notifyBLE(Player p) {
+        if ( m_bleReceiverManager != null ) { return false; }
+        m_bleReceiverManager.writeToBLE(p);
+        return true;
+    }
+
+    private        JSONObject         m_bleConfig                           = null;
+    private        BLEDeviceButton    m_eConfirmScoreByOpponentButton       = BLEDeviceButton.SECONDARY_BUTTON;
+    private        BLEDeviceButton    m_eCancelScoreByInitiatorButton       = BLEDeviceButton.SECONDARY_BUTTON;
+    private        BLEReceiverManager m_bleReceiverManager                  = null;
+    private static boolean            m_bBLEDevicesSelected                 = false;
+    private static Player             blePlayerWaitingForScoreToBeConfirmed = null;
+    private static BLEDeviceButton    bleButtonUsedToIndicate_IScored       = null;
     private void onResumeInitBluetoothBLE()
     {
         final String sMethod = "SB.onCreateInitBLE";
-        setBluetoothBLEIconVisibility(View.INVISIBLE, 0);
+        updateBLEConnectionStatus(View.INVISIBLE, 0, null, -1);
 
         boolean bInitBLE = PreferenceValues.useBluetoothLE(this);
         if ( bInitBLE == false ) {
@@ -6291,16 +6321,7 @@ private void onResumeInitBluetoothBLE()
             return;
         }
 
-        if ( false ) {
-            String[] permissions = {Manifest.permission.BLUETOOTH_SCAN, Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION};
-            if ( Build.VERSION.SDK_INT < Build.VERSION_CODES.S ) {
-                permissions = new String[] { Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION };
-            }
-            ActivityCompat.requestPermissions(this, permissions, PreferenceKeys.UseBluetoothLE.ordinal()); // causes endless onresume
-        }
-
         if ( m_bleReceiverManager == null ) {
-
             String sBluetoothLEDevice1 = PreferenceValues.getString(PreferenceKeys.BluetoothLE_Peripheral1, null, this);
             String sBluetoothLEDevice2 = PreferenceValues.getString(PreferenceKeys.BluetoothLE_Peripheral2, null, this);
             if ( StringUtil.hasEmpty(sBluetoothLEDevice1, sBluetoothLEDevice2) ) {
@@ -6635,17 +6656,6 @@ public void setBluetoothIconVisibility(int visibility) {
 
         iBoard.setBluetoothIconVisibility(visibility);
     }
-    public void setBluetoothBLEIconVisibility(int visibility, int nrOfDevicesConnected) {
-        if ( iBoard == null ) {
-            return;
-        }
-
-        iBoard.setBluetoothBLEIconVisibility(visibility, nrOfDevicesConnected);
-        if ( visibility == View.INVISIBLE ) {
-            iBoard.showBLEMessage(null, null, -1);
-        }
-    }
-
     private static Map<PreferenceKeys, String> mBtPrefSlaveSettings = new HashMap<>();
     static {
         mBtPrefSlaveSettings.put(PreferenceKeys.useOfficialAnnouncementsFeature, String.valueOf(Feature.DoNotUse ));
diff --git a/src/com/doubleyellow/scoreboard/vico/IBoard.java b/src/com/doubleyellow/scoreboard/vico/IBoard.java
index 4c24b60a..e20d4575 100644
--- a/src/com/doubleyellow/scoreboard/vico/IBoard.java
+++ b/src/com/doubleyellow/scoreboard/vico/IBoard.java
@@ -1073,7 +1073,7 @@ public void setBluetoothIconVisibility(int visibility) {
             Log.w(TAG, "No bluetooticon view found ...");
         }
     }
-    public void setBluetoothBLEIconVisibility(int visibility, int nrOfDevicesConnected) {
+    public void updateBLEConnectionStatusIcon(int visibility, int nrOfDevicesConnected) {
         TextView vTxt = m_vRoot.findViewById(R.id.sb_bluetoothble_nrofconnected);
         if ( vTxt != null ) {
             vTxt.setText("\u16E1\u16d2:" + nrOfDevicesConnected);
@@ -1097,11 +1097,11 @@ public void showBLEMessage(Player p, String sMsg, int iMessageDurationSecs) {
                 tvBLEInfo.setText(sMsg);
                 tvBLEInfo.setVisibility(View.VISIBLE);
 
+                if ( m_timerBLEMessage != null ) {
+                    m_timerBLEMessage.cancel();
+                }
                 if ( iMessageDurationSecs > 0 ) {
                     // auto hide in x secs
-                    if ( m_timerBLEMessage != null ) {
-                        m_timerBLEMessage.cancel();
-                    }
                     m_timerBLEMessage = new CountDownTimer(iMessageDurationSecs * 1000, 1000) {
                         @Override public void onTick(long millisUntilFinished) { }
                         @Override public void onFinish() {