From f9b44824acc5aa6444594e3c699204dcd6fce3c7 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Thu, 25 Jan 2024 17:00:54 +0530 Subject: [PATCH 1/3] Using PairState enum for paired status --- commons/passive/phone/phone_bluetooth_device_scanned.avsc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/commons/passive/phone/phone_bluetooth_device_scanned.avsc b/commons/passive/phone/phone_bluetooth_device_scanned.avsc index 80f52d35..ec2fac7b 100644 --- a/commons/passive/phone/phone_bluetooth_device_scanned.avsc +++ b/commons/passive/phone/phone_bluetooth_device_scanned.avsc @@ -8,6 +8,11 @@ {"name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)."}, {"name": "macAddressHash", "type": ["null", "bytes"], "default": null, "doc":"Hash of Nearby Bluetooth device MAC address."}, {"name": "hashSaltReference", "type": ["null", "int"], "doc": "Random identifier associated with the device or installation of the app. If the app gets reinstalled or installed on another device, it's clear during analysis that the mac addresses between iterations are not comparable.", "default": null}, - {"name": "isPaired", "type": ["null","boolean"], "doc": "Whether the bluetooth device is paired.", "default": null} + {"name": "pairedState", "type": ["null", { + "name": "PairedState", + "type": "enum", + "doc": "Represent the bond state of the remote device. \nNOT_PAIRED indicates the remote device is not paired. \nPAIRING indicates pairing is in progress with the remote device. \nPAIRED Indicates the remote device is paired.", + "symbols": ["NOT_PAIRED", "PAIRING", "PAIRED"] + }], "doc": "Indicates the current paired status of the remote device", "default": null } ] } From 7726b9b3858740f20e8d509d3f37dbc973d56a55 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Thu, 25 Jan 2024 17:18:53 +0530 Subject: [PATCH 2/3] minor change for CI passing --- commons/passive/phone/phone_bluetooth_device_scanned.avsc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commons/passive/phone/phone_bluetooth_device_scanned.avsc b/commons/passive/phone/phone_bluetooth_device_scanned.avsc index ec2fac7b..8824511f 100644 --- a/commons/passive/phone/phone_bluetooth_device_scanned.avsc +++ b/commons/passive/phone/phone_bluetooth_device_scanned.avsc @@ -13,6 +13,6 @@ "type": "enum", "doc": "Represent the bond state of the remote device. \nNOT_PAIRED indicates the remote device is not paired. \nPAIRING indicates pairing is in progress with the remote device. \nPAIRED Indicates the remote device is paired.", "symbols": ["NOT_PAIRED", "PAIRING", "PAIRED"] - }], "doc": "Indicates the current paired status of the remote device", "default": null } + }], "doc": "Indicates the current paired status of the remote device.", "default": null } ] } From 0ee56a62c6855b2c5525c9706c4956e5fcb85520 Mon Sep 17 00:00:00 2001 From: this-Aditya Date: Wed, 13 Mar 2024 20:25:28 +0530 Subject: [PATCH 3/3] Added field for backward compatibility --- commons/passive/phone/phone_bluetooth_device_scanned.avsc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commons/passive/phone/phone_bluetooth_device_scanned.avsc b/commons/passive/phone/phone_bluetooth_device_scanned.avsc index 8824511f..2f0f9e44 100644 --- a/commons/passive/phone/phone_bluetooth_device_scanned.avsc +++ b/commons/passive/phone/phone_bluetooth_device_scanned.avsc @@ -8,11 +8,12 @@ {"name": "timeReceived", "type": "double", "doc": "Device receiver timestamp in UTC (s)."}, {"name": "macAddressHash", "type": ["null", "bytes"], "default": null, "doc":"Hash of Nearby Bluetooth device MAC address."}, {"name": "hashSaltReference", "type": ["null", "int"], "doc": "Random identifier associated with the device or installation of the app. If the app gets reinstalled or installed on another device, it's clear during analysis that the mac addresses between iterations are not comparable.", "default": null}, + {"name": "isPaired", "type": ["null","boolean"], "doc": "Whether the bluetooth device is paired. This has been deprecated in favor of pairedState in newer versions.", "default": null}, {"name": "pairedState", "type": ["null", { "name": "PairedState", "type": "enum", - "doc": "Represent the bond state of the remote device. \nNOT_PAIRED indicates the remote device is not paired. \nPAIRING indicates pairing is in progress with the remote device. \nPAIRED Indicates the remote device is paired.", - "symbols": ["NOT_PAIRED", "PAIRING", "PAIRED"] + "doc": "Represent the bond state of the remote device. \nNOT_PAIRED indicates the remote device is not paired. \nPAIRING indicates pairing is in progress with the remote device. \nPAIRED Indicates the remote device is paired. \nUNKNOWN indicates the pairing status is not known.", + "symbols": ["NOT_PAIRED", "PAIRING", "PAIRED", "UNKNOWN"] }], "doc": "Indicates the current paired status of the remote device.", "default": null } ] }