Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for Extended Advertisements for Android #406

Merged
merged 2 commits into from
Dec 21, 2024
+13 −4
Merged

Added support for Extended Advertisements for Android #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc13281
fixing build
Jakouf Nov 12, 2024
e88fd4d
Added support for Extended Advertising on Android
Jakouf Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/droidplug/java/src/main/java/com/nonpolynomial/btleplug/android/impl/Adapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.bluetooth.le.ScanFilter.Builder;
import android.bluetooth.le.ScanResult;
import android.bluetooth.le.ScanSettings;
import android.os.Build;
import android.os.ParcelUuid;

import java.util.ArrayList;
Expand Down Expand Up @@ -35,9 +36,17 @@ public void startScan(ScanFilter filter) {
filters.add(new Builder().setServiceUuid(ParcelUuid.fromString(uuid)).build());
}
}
ScanSettings settings = new ScanSettings.Builder()
.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
.build();
ScanSettings settings;
if (Build.VERSION.SDK_INT >= 26) {
settings = new ScanSettings.Builder()
.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
.setLegacy(false)
.build();
} else {
settings = new ScanSettings.Builder()
.setCallbackType(ScanSettings.CALLBACK_TYPE_ALL_MATCHES)
.build();
}
BluetoothLeScanner scanner = bluetoothAdapter.getBluetoothLeScanner();
if (scanner == null) {
throw new RuntimeException("No bluetooth scanner available for adapter");
Expand Down
2 changes: 1 addition & 1 deletion src/droidplug/java/src/main/java/com/nonpolynomial/btleplug/android/impl/Peripheral.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class Peripheral {
private CommandCallback commandCallback;

public Peripheral(Adapter adapter, String address) {
this.device = BluetoothAdapter.getAdapter().getRemoteDevice(address);
this.device = BluetoothAdapter.getDefaultAdapter().getRemoteDevice(address);
this.adapter = adapter;
this.callback = new Callback();
}
Expand Down
Loading