Rename hasCustomFilter to usesCustomFilters (#115)
This commit is contained in:
@@ -102,7 +102,7 @@ class UniversalBleFilterUtil {
|
||||
}
|
||||
}
|
||||
|
||||
fun UniversalScanFilter.hasCustomFilter(): Boolean {
|
||||
fun UniversalScanFilter.usesCustomFilters(): Boolean {
|
||||
// NamePrefix Filtering is not supported in native filters
|
||||
return withNamePrefix.isNotEmpty()
|
||||
}
|
||||
|
||||
@@ -117,14 +117,14 @@ class UniversalBlePlugin : UniversalBlePlatformChannel, BluetoothGattCallback(),
|
||||
}
|
||||
val settings = builder.build()
|
||||
|
||||
val hasCustomFilters = filter?.hasCustomFilter() ?: false;
|
||||
val usesCustomFilters = filter?.usesCustomFilters() ?: false;
|
||||
|
||||
try {
|
||||
val filterServices = filter?.withServices?.filterNotNull()?.toUUIDList() ?: emptyList()
|
||||
var scanFilters = emptyList<ScanFilter>()
|
||||
|
||||
// Set custom scan filter only if required
|
||||
if (hasCustomFilters) {
|
||||
if (usesCustomFilters) {
|
||||
Log.e(TAG, "Using Custom Filters")
|
||||
universalBleFilterUtil.scanFilter = filter
|
||||
universalBleFilterUtil.serviceFilterUUIDS = filterServices
|
||||
|
||||
@@ -101,7 +101,7 @@ public class UniversalBleFilterUtil {
|
||||
}
|
||||
|
||||
extension UniversalScanFilter {
|
||||
var hasCustomFilters: Bool {
|
||||
var usesCustomFilters: Bool {
|
||||
return !withManufacturerData.isEmpty || !withNamePrefix.isEmpty
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,12 +55,12 @@ private class BleCentralDarwin: NSObject, UniversalBlePlatformChannel, CBCentral
|
||||
|
||||
func startScan(filter: UniversalScanFilter?) throws {
|
||||
// If filter has any other filter other than official one
|
||||
let hasCustomFilter = filter?.hasCustomFilters ?? false
|
||||
let usesCustomFilters = filter?.usesCustomFilters ?? false
|
||||
|
||||
// Apply services filter
|
||||
var withServices: [CBUUID] = try filter?.withServices.compactMap { $0 }.toCBUUID() ?? []
|
||||
|
||||
if hasCustomFilter {
|
||||
if usesCustomFilters {
|
||||
print("Using Custom Filters")
|
||||
universalBleFilterUtil.scanFilter = filter
|
||||
universalBleFilterUtil.scanFilterServicesUUID = withServices
|
||||
|
||||
@@ -125,9 +125,9 @@ namespace universal_ble
|
||||
if (filter != nullptr)
|
||||
{
|
||||
// Native filter supports only 1 service
|
||||
bool hasCustomFilters = filter->with_services().size() > 1 || filter->with_manufacturer_data().size() > 0 || filter->with_name_prefix().size() > 0;
|
||||
bool usesCustomFilters = filter->with_services().size() > 1 || filter->with_manufacturer_data().size() > 0 || filter->with_name_prefix().size() > 0;
|
||||
|
||||
if (hasCustomFilters)
|
||||
if (usesCustomFilters)
|
||||
{
|
||||
std::cout << "Using Custom Scan Filter" << std::endl;
|
||||
setScanFilter(*filter);
|
||||
|
||||
Reference in New Issue
Block a user