From cccd677224ea33c7c44bfb4bc6dbb5126f50b676 Mon Sep 17 00:00:00 2001 From: Ivan Baranov Date: Fri, 27 Nov 2015 17:25:27 +0300 Subject: [PATCH] Provide context via constructor. --- .../ivbaranov/rxbluetooth/RxBluetooth.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/rxbluetooth/src/main/java/com/github/ivbaranov/rxbluetooth/RxBluetooth.java b/rxbluetooth/src/main/java/com/github/ivbaranov/rxbluetooth/RxBluetooth.java index dad3f2a..c6c1a35 100644 --- a/rxbluetooth/src/main/java/com/github/ivbaranov/rxbluetooth/RxBluetooth.java +++ b/rxbluetooth/src/main/java/com/github/ivbaranov/rxbluetooth/RxBluetooth.java @@ -38,9 +38,11 @@ */ public class RxBluetooth { private BluetoothAdapter mBluetoothAdapter; + private Context context; - public RxBluetooth() { + public RxBluetooth(Context context) { this.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); + this.context = context; } /** @@ -138,10 +140,9 @@ public void enableDiscoverability(Activity activity, int requestCode, int durati /** * Observes Bluetooth devices found while discovering. * - * @param context Context of the activity or an application * @return RxJava Observable with BluetoothDevice found */ - public Observable observeDevices(final Context context) { + public Observable observeDevices() { final IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND); return Observable.create(new Observable.OnSubscribe() { @@ -172,10 +173,9 @@ public Observable observeDevices(final Context context) { * Observes DiscoveryState, which can be ACTION_DISCOVERY_STARTED or ACTION_DISCOVERY_FINISHED * from {@link BluetoothAdapter}. * - * @param context Context of the activity or an application * @return RxJava Observable with DiscoveryState */ - public Observable observeDiscovery(final Context context) { + public Observable observeDiscovery() { final IntentFilter filter = new IntentFilter(); filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_STARTED); filter.addAction(BluetoothAdapter.ACTION_DISCOVERY_FINISHED); @@ -207,10 +207,9 @@ public Observable observeDiscovery(final Context context) { * {@link BluetoothAdapter#STATE_ON}, * {@link BluetoothAdapter#STATE_TURNING_OFF}, * - * @param context Context of the activity or an application * @return RxJava Observable with BluetoothState */ - public Observable observeBluetoothState(final Context context) { + public Observable observeBluetoothState() { final IntentFilter filter = new IntentFilter(); filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED); @@ -240,10 +239,9 @@ public Observable observeBluetoothState(final Context context) { * {@link BluetoothAdapter#SCAN_MODE_CONNECTABLE}, * {@link BluetoothAdapter#SCAN_MODE_CONNECTABLE_DISCOVERABLE} * - * @param context Context of the activity or an application * @return RxJava Observable with scan mode */ - public Observable observeScanMode(final Context context) { + public Observable observeScanMode() { final IntentFilter filter = new IntentFilter(); filter.addAction(BluetoothAdapter.ACTION_SCAN_MODE_CHANGED); @@ -270,14 +268,12 @@ public Observable observeScanMode(final Context context) { /** * Observes connection to specified profile. See also {@link BluetoothProfile.ServiceListener}. * - * @param context Context of the activity or an application * @param bluetoothProfile bluetooth profile to connect to. Can be either {@link * BluetoothProfile#HEALTH},{@link BluetoothProfile#HEADSET}, {@link BluetoothProfile#A2DP}, * {@link BluetoothProfile#GATT} or {@link BluetoothProfile#GATT_SERVER}. * @return RxJava Observable with {@link ServiceEvent} */ - public Observable observeBluetoothProfile(final Context context, - final int bluetoothProfile) { + public Observable observeBluetoothProfile(final int bluetoothProfile) { return Observable.create(new Observable.OnSubscribe() { @Override public void call(final Subscriber subscriber) { if (!mBluetoothAdapter.getProfileProxy(context, new BluetoothProfile.ServiceListener() {