Merge branch 'master' of https://github.com/andijakl/universal-beacon

Author: andijakl

UniversalBeaconLibrary/Beacon/Beacon.cs

@@ -163,6 +163,8 @@ public Beacon(BeaconTypeEnum beaconType)
         /// the Windows Bluetooth LE API.</param>
         public void UpdateBeacon(BluetoothLEAdvertisementReceivedEventArgs btAdv)
         {
+            if (btAdv == null) return;
+
             if (btAdv.BluetoothAddress != BluetoothAddress)
             {
                 throw new BeaconException("Bluetooth address of beacon does not match - not updating beacon information");

UniversalBeaconLibrary/Beacon/BeaconManager.cs

@@ -49,6 +49,8 @@ public class BeaconManager
         /// the Windows Bluetooth LE API.</param>
         public void ReceivedAdvertisement(BluetoothLEAdvertisementReceivedEventArgs btAdv)
         {
+            if (btAdv == null) return;
+
             // Check if we already know this bluetooth address
             foreach (var bluetoothBeacon in BluetoothBeacons)
             {

WindowsBeacons/Strings/en-US/Resources.resw

@@ -179,6 +179,12 @@ Make sure your device supports Bluetooth Smart (LE) and that Bluetooth is activa
   <data name="LibraryUrlButton.NavigateUri" xml:space="preserve">
     <value>https://github.com/andijakl/universal-beacon</value>
   </data>
+  <data name="MajorId.Text" xml:space="preserve">
+    <value>Major ID</value>
+  </data>
+  <data name="MinorId.Text" xml:space="preserve">
+    <value>Minor ID</value>
+  </data>
   <data name="NamespaceId.Text" xml:space="preserve">
     <value>Namespace ID: </value>
   </data>
@@ -236,6 +242,9 @@ Make sure your device supports Bluetooth Smart (LE) and that Bluetooth is activa
   <data name="Url.Text" xml:space="preserve">
     <value>URL: </value>
   </data>
+  <data name="Uuid.Text" xml:space="preserve">
+    <value>UUID</value>
+  </data>
   <data name="Version.Text" xml:space="preserve">
     <value>Version: </value>
   </data>