Merge pull request google#841 from hayesjordan/multiple-url-beacon

Fix crash when a beacon transmits multiple URLs
aaronkim · Sep 27, 2016 · 80c8028 · 80c8028
2 parents 1c174c7 + 6bb7e44
commit 80c8028
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...id/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BleUrlDeviceDiscoverer.java b/...id/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/BleUrlDeviceDiscoverer.java
@@ -91,7 +91,8 @@ public void onLeScan(final BluetoothDevice device, final int rssi, final byte[]
     if (beacon == null || !URLUtil.isNetworkUrl(beacon.getUrl())) {
       return;
     }
-    UrlDevice urlDevice = createUrlDeviceBuilder(TAG + device.getAddress(), beacon.getUrl())
+    UrlDevice urlDevice = createUrlDeviceBuilder(TAG + device.getAddress() + beacon.getUrl(),
+                                                 beacon.getUrl())
         .setRssi(rssi)
         .setTxPower(beacon.getTxPowerLevel())
         .setDeviceType(Utils.BLE_DEVICE_TYPE)