UpdateClockJob, ScannerFragment: Apply Bluetooth MAC filter for CA:4D:10 prefix.

app/src/main/java/de/ccc/events/badge/card10/Constants.kt

@@ -24,6 +24,8 @@ package de.ccc.events.badge.card10
 
 import java.util.*
 
+const val CARD10_BLUETOOTH_MAC_PREFIX = "CA:4D:10"
+
 val GENERIC_ACCESS_SERVICE_UUID = UUID.fromString("00001800-0000-1000-8000-00805f9b34fb")
 val DEVICE_NAME_CHARACTERISTIC_UUID = UUID.fromString("00002a00-0000-1000-8000-00805f9b34fb")
 

app/src/main/java/de/ccc/events/badge/card10/background/UpdateClockJob.kt

@@ -29,6 +29,7 @@ import android.bluetooth.BluetoothGattCharacteristic
 import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
+import de.ccc.events.badge.card10.CARD10_BLUETOOTH_MAC_PREFIX
 import de.ccc.events.badge.card10.CARD10_SERVICE_UUID
 import de.ccc.events.badge.card10.TIME_CHARACTERISTIC_UUID
 import java.nio.ByteBuffer
@@ -41,6 +42,7 @@ class UpdateClockJob(context: Context, workerParameters: WorkerParameters) : Wor
     override fun doWork(): Result {
         System.out.println("=== doWork() job started")
         for (device in bluetoothAdapter.bondedDevices) {
+            if (device.address.startsWith(CARD10_BLUETOOTH_MAC_PREFIX, true)) {
                 System.out.println("=== doWork() ${device}")
                 var gatt: BluetoothGatt? = null
                 try {
@@ -86,10 +88,11 @@ class UpdateClockJob(context: Context, workerParameters: WorkerParameters) : Wor
                     x.printStackTrace()
                 } finally {
                     gatt?.close();
-                System.out.println("=== doWork() job finished")
+                }
             }
         }
 
+        System.out.println("=== doWork() job finished (success)")
         return Result.success()
     }
 }

app/src/main/java/de/ccc/events/badge/card10/mood/MoodFragment.kt

@@ -40,7 +40,7 @@ import java.util.concurrent.CountDownLatch
 class MoodFragment : Fragment() {
 
     // TODO pick from list of paired card10s, possibly present selection
-    private val REMOTE_DEVICE_BLUETOOTH_MAC = "00:05:8B:44:02:03"
+    private val REMOTE_DEVICE_BLUETOOTH_MAC = "CA:4D:10:44:02:03"
 
     private lateinit var gatt: BluetoothGatt
     private var rocketsCharacteristic: BluetoothGattCharacteristic? = null

app/src/main/java/de/ccc/events/badge/card10/scanner/ScannerFragment.kt

@@ -36,6 +36,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
+import de.ccc.events.badge.card10.CARD10_BLUETOOTH_MAC_PREFIX
 import de.ccc.events.badge.card10.R
 import kotlinx.android.synthetic.main.scanner_fragment.*
 
@@ -47,8 +48,7 @@ class ScannerFragment : Fragment() {
     val callback = object : ScanCallback() {
         override fun onScanResult(callbackType: Int, result: ScanResult) {
             val device = result.device
-            if (device.name == null)
-                return
+            if (device.address.startsWith(CARD10_BLUETOOTH_MAC_PREFIX, true)) {
                 listAdapter.put(
                     Device(
                         btMac = device.address,
@@ -58,6 +58,7 @@ class ScannerFragment : Fragment() {
                 )
             }
         }
+    }
 
     val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {