support beacons without name

fixes #22
ostrya · Sep 6, 2020 · a0a5420 · a0a5420
1 parent eeef0d0
commit a0a5420
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/app/src/main/java/org/ostrya/presencepublisher/ui/dialog/BeaconScanDialogFragment.java b/app/src/main/java/org/ostrya/presencepublisher/ui/dialog/BeaconScanDialogFragment.java
@@ -163,15 +163,23 @@ private class ScanCallback implements RangeNotifier {
         public void didRangeBeaconsInRegion(Collection<Beacon> beacons, Region region) {
             HyperLog.v(TAG, "Got callback from beacon scan for region " + region);
             for (Beacon beacon : beacons) {
-                if (beacon != null) {
-                    if (beacon.getBluetoothName() != null && beacon.getBluetoothAddress() != null) {
-                        HyperLog.d(TAG, "Found beacon " + beacon);
-                        adapter.addBeacon(beacon);
-                    } else {
-                        HyperLog.d(TAG, "Beacon " + beacon + " is incomplete: " + beacon.getBluetoothName() + "/" + beacon.getBluetoothAddress());
-                    }
+                if (beacon != null && beacon.getBluetoothAddress() != null) {
+                    HyperLog.d(TAG, "Found beacon " + beacon);
+                    adapter.addBeacon(fixEmptyName(beacon));
+                } else {
+                    HyperLog.w(TAG, "Beacon " + beacon + " does not have a Bluetooth address");
                 }
             }
         }
+
+        private Beacon fixEmptyName(Beacon beacon) {
+            if (beacon.getBluetoothName() != null) {
+                return beacon;
+            }
+            return new Beacon.Builder()
+                    .copyBeaconFields(beacon)
+                    .setBluetoothName(beacon.getBluetoothAddress())
+                    .build();
+        }
     }
 }