aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-24 09:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quick migration to Ble library 2.2.0 final

Browse Source
This commit is contained in:
philips77
2020-05-18 21:43:53 +02:00
parent 1767c9e1aa
commit 007ab947e4
18 changed files with 72 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -63,7 +63,7 @@ dependencies {
// Import the BLE Common Library.
// The BLE Common Library depends on BLE Library. It is enough to include the first one.
implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha06'
implementation 'no.nordicsemi.android:ble-common:2.2.0'
// The BLE Common Library may be included from jcenter. If you want to modify the code,
// clone both projects from GitHub and replace the line above with the following
// (and also the according lines in the settings.gradle):

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java
View File

@@ -50,7 +50,7 @@ public abstract class BatteryManager<T extends BatteryManagerCallbacks> extends
@IntRange(from = 0, to = 100) final int batteryLevel) {
log(LogContract.Log.Level.APPLICATION,"Battery Level received: " + batteryLevel + "%");
BatteryManager.this.batteryLevel = batteryLevel;
callbacks.onBatteryLevelChanged(device, batteryLevel);
mCallbacks.onBatteryLevelChanged(device, batteryLevel);
}
@Override

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java
View File

@@ -92,7 +92,7 @@ public class BPMActivity extends BleProfileActivity implements BPMManagerCallbac
@Override
protected LoggableBleManager<BPMManagerCallbacks> initializeManager() {
final BPMManager manager = BPMManager.getBPMManager(getApplicationContext());
manager.setManagerCallbacks(this);
manager.setGattCallbacks(this);
return manager;
}

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java
View File

@@ -99,7 +99,7 @@ public class BPMManager extends BatteryManager<BPMManagerCallbacks> {
final float cuffPressure, final int unit,
@Nullable final Float pulseRate, @Nullable final Integer userID,
@Nullable final BPMStatus status, @Nullable final Calendar calendar) {
callbacks.onIntermediateCuffPressureReceived(device, cuffPressure, unit, pulseRate, userID, status, calendar);
mCallbacks.onIntermediateCuffPressureReceived(device, cuffPressure, unit, pulseRate, userID, status, calendar);
}
@Override
@@ -123,7 +123,7 @@ public class BPMManager extends BatteryManager<BPMManagerCallbacks> {
final int unit, @Nullable final Float pulseRate,
@Nullable final Integer userID, @Nullable final BPMStatus status,
@Nullable final Calendar calendar) {
callbacks.onBloodPressureMeasurementReceived(device, systolic, diastolic,
mCallbacks.onBloodPressureMeasurementReceived(device, systolic, diastolic,
meanArterialPressure, unit, pulseRate, userID, status, calendar);
}

32
app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManager.java
View File

@@ -91,7 +91,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
}
/**
* BluetoothGatt callbacks for connection/disconnection, service discovery,
* BluetoothGatt mCallbacks for connection/disconnection, service discovery,
* receiving notification, etc.
*/
private class CGMManagerGattCallback extends BatteryManagerGattCallback {
@@ -129,7 +129,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
.fail((device, status) -> log(Log.WARN, "Could not read CGM Status characteristic"))
.enqueue();
// Set notification and indication callbacks
// Set notification and indication mCallbacks
setNotificationCallback(cgmMeasurementCharacteristic)
.with(new ContinuousGlucoseMeasurementDataCallback() {
@Override
@@ -157,7 +157,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
final CGMRecord record = new CGMRecord(timeOffset, glucoseConcentration, timestamp);
records.put(record.sequenceNumber, record);
callbacks.onCGMValueReceived(device, record);
mCallbacks.onCGMValueReceived(device, record);
}
@Override
@@ -234,11 +234,11 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
//noinspection SwitchStatementWithTooFewBranches
switch (requestCode) {
case RACP_OP_CODE_ABORT_OPERATION:
callbacks.onOperationAborted(device);
mCallbacks.onOperationAborted(device);
break;
default:
recordAccessRequestInProgress = false;
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
break;
}
}
@@ -247,12 +247,12 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
public void onRecordAccessOperationCompletedWithNoRecordsFound(@NonNull final BluetoothDevice device,
@RACPOpCode final int requestCode) {
recordAccessRequestInProgress = false;
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
}
@Override
public void onNumberOfRecordsReceived(@NonNull final BluetoothDevice device, final int numberOfRecords) {
callbacks.onNumberOfRecordsRequested(device, numberOfRecords);
mCallbacks.onNumberOfRecordsRequested(device, numberOfRecords);
if (numberOfRecords > 0) {
if (records.size() > 0) {
final int sequenceNumber = records.keyAt(records.size() - 1) + 1;
@@ -266,7 +266,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
}
} else {
recordAccessRequestInProgress = false;
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
}
}
@@ -276,9 +276,9 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
@RACPErrorCode final int errorCode) {
log(Log.WARN, "Record Access operation failed (error " + errorCode + ")");
if (errorCode == RACP_ERROR_OP_CODE_NOT_SUPPORTED) {
callbacks.onOperationNotSupported(device);
mCallbacks.onOperationNotSupported(device);
} else {
callbacks.onOperationFailed(device);
mCallbacks.onOperationFailed(device);
}
}
});
@@ -341,7 +341,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
*/
void clear() {
records.clear();
callbacks.onDataSetCleared(getBluetoothDevice());
mCallbacks.onDataSetCleared(getBluetoothDevice());
}
/**
@@ -354,7 +354,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
mCallbacks.onOperationStarted(getBluetoothDevice());
recordAccessRequestInProgress = true;
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportLastStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
@@ -371,7 +371,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
mCallbacks.onOperationStarted(getBluetoothDevice());
recordAccessRequestInProgress = true;
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportFirstStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
@@ -401,7 +401,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
mCallbacks.onOperationStarted(getBluetoothDevice());
recordAccessRequestInProgress = true;
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportNumberOfAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
@@ -421,7 +421,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
if (records.size() == 0) {
getAllRecords();
} else {
callbacks.onOperationStarted(getBluetoothDevice());
mCallbacks.onOperationStarted(getBluetoothDevice());
// Obtain the last sequence number
final int sequenceNumber = records.keyAt(records.size() - 1) + 1;
@@ -445,7 +445,7 @@ class CGMManager extends BatteryManager<CGMManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(getBluetoothDevice());
mCallbacks.onOperationStarted(getBluetoothDevice());
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.deleteAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java
View File

@@ -95,14 +95,14 @@ public class CSCManager extends BatteryManager<CSCManagerCallbacks> {
@FloatRange(from = 0) final float totalDistance,
@FloatRange(from = 0) final float distance,
@FloatRange(from = 0) final float speed) {
callbacks.onDistanceChanged(device, totalDistance, distance, speed);
mCallbacks.onDistanceChanged(device, totalDistance, distance, speed);
}
@Override
public void onCrankDataChanged(@NonNull final BluetoothDevice device,
@FloatRange(from = 0) final float crankCadence,
final float gearRatio) {
callbacks.onCrankDataChanged(device, crankCadence, gearRatio);
mCallbacks.onCrankDataChanged(device, crankCadence, gearRatio);
}
@Override

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java
View File

@@ -82,7 +82,7 @@ public class GlucoseActivity extends BleProfileExpandableListActivity implements
@Override
protected LoggableBleManager<GlucoseManagerCallbacks> initializeManager() {
final GlucoseManager manager = glucoseManager = GlucoseManager.getGlucoseManager(getApplicationContext());
manager.setManagerCallbacks(this);
manager.setGattCallbacks(this);
return manager;
}

30
app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java
View File

@@ -147,7 +147,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
// if there is no context information following the measurement data,
// notify callback about the new record
if (!contextInformationFollows)
callbacks.onDataSetChanged(device);
mCallbacks.onDataSetChanged(device);
});
}
});
@@ -189,7 +189,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
handler.post(() -> {
// notify callback about the new record
callbacks.onDataSetChanged(device);
mCallbacks.onDataSetChanged(device);
});
}
});
@@ -209,10 +209,10 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
//noinspection SwitchStatementWithTooFewBranches
switch (requestCode) {
case RACP_OP_CODE_ABORT_OPERATION:
callbacks.onOperationAborted(device);
mCallbacks.onOperationAborted(device);
break;
default:
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
break;
}
}
@@ -220,12 +220,12 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
@Override
public void onRecordAccessOperationCompletedWithNoRecordsFound(@NonNull final BluetoothDevice device,
@RACPOpCode final int requestCode) {
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
}
@Override
public void onNumberOfRecordsReceived(@NonNull final BluetoothDevice device, final int numberOfRecords) {
callbacks.onNumberOfRecordsRequested(device, numberOfRecords);
mCallbacks.onNumberOfRecordsRequested(device, numberOfRecords);
if (numberOfRecords > 0) {
if (records.size() > 0) {
final int sequenceNumber = records.keyAt(records.size() - 1) + 1;
@@ -238,7 +238,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
.enqueue();
}
} else {
callbacks.onOperationCompleted(device);
mCallbacks.onOperationCompleted(device);
}
}
@@ -248,9 +248,9 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
@RACPErrorCode final int errorCode) {
log(Log.WARN, "Record Access operation failed (error " + errorCode + ")");
if (errorCode == RACP_ERROR_OP_CODE_NOT_SUPPORTED) {
callbacks.onOperationNotSupported(device);
mCallbacks.onOperationNotSupported(device);
} else {
callbacks.onOperationFailed(device);
mCallbacks.onOperationFailed(device);
}
}
});
@@ -303,7 +303,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
records.clear();
final BluetoothDevice target = getBluetoothDevice();
if (target != null) {
callbacks.onOperationCompleted(target);
mCallbacks.onOperationCompleted(target);
}
}
@@ -320,7 +320,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(target);
mCallbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportLastStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -339,7 +339,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(target);
mCallbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportFirstStoredRecord())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -359,7 +359,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(target);
mCallbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.reportNumberOfAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();
@@ -385,7 +385,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
if (records.size() == 0) {
getAllRecords();
} else {
callbacks.onOperationStarted(target);
mCallbacks.onOperationStarted(target);
// obtain the last sequence number
final int sequenceNumber = records.keyAt(records.size() - 1) + 1;
@@ -426,7 +426,7 @@ public class GlucoseManager extends BatteryManager<GlucoseManagerCallbacks> {
return;
clear();
callbacks.onOperationStarted(target);
mCallbacks.onOperationStarted(target);
writeCharacteristic(recordAccessControlPointCharacteristic, RecordAccessControlPointData.deleteAllStoredRecords())
.with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + RecordAccessControlPointParser.parse(data) + "\" sent"))
.enqueue();

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRActivity.java
View File

@@ -183,7 +183,7 @@ public class HRActivity extends BleProfileActivity implements HRManagerCallbacks
@Override
protected LoggableBleManager<HRManagerCallbacks> initializeManager() {
final HRManager manager = HRManager.getInstance(getApplicationContext());
manager.setManagerCallbacks(this);
manager.setGattCallbacks(this);
return manager;
}

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java
View File

@@ -99,7 +99,7 @@ public class HRManager extends BatteryManager<HRManagerCallbacks> {
@Override
public void onBodySensorLocationReceived(@NonNull final BluetoothDevice device,
@BodySensorLocation final int sensorLocation) {
callbacks.onBodySensorLocationReceived(device, sensorLocation);
mCallbacks.onBodySensorLocationReceived(device, sensorLocation);
}
})
.fail((device, status) -> log(Log.WARN, "Body Sensor Location characteristic not found"))
@@ -118,7 +118,7 @@ public class HRManager extends BatteryManager<HRManagerCallbacks> {
@Nullable final Boolean contactDetected,
@Nullable @IntRange(from = 0) final Integer energyExpanded,
@Nullable final List<Integer> rrIntervals) {
callbacks.onHeartRateMeasurementReceived(device, heartRate, contactDetected, energyExpanded, rrIntervals);
mCallbacks.onHeartRateMeasurementReceived(device, heartRate, contactDetected, energyExpanded, rrIntervals);
}
});
enableNotifications(heartRateCharacteristic).enqueue();

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManager.java
View File

@@ -87,7 +87,7 @@ public class HTManager extends BatteryManager<HTManagerCallbacks> {
@TemperatureUnit final int unit,
@Nullable final Calendar calendar,
@Nullable @TemperatureType final Integer type) {
callbacks.onTemperatureMeasurementReceived(device, temperature, unit, calendar, type);
mCallbacks.onTemperatureMeasurementReceived(device, temperature, unit, calendar, type);
}
});
enableIndications(htCharacteristic).enqueue();

11
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java
View File

@@ -1,12 +1,13 @@
package no.nordicsemi.android.nrftoolbox.profile;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import android.util.Log;
import no.nordicsemi.android.ble.BleManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import no.nordicsemi.android.ble.BleManagerCallbacks;
import no.nordicsemi.android.ble.LegacyBleManager;
import no.nordicsemi.android.log.ILogSession;
import no.nordicsemi.android.log.LogContract;
import no.nordicsemi.android.log.Logger;
@@ -16,14 +17,14 @@ import no.nordicsemi.android.log.Logger;
*
* @param <T> the callbacks class.
*/
public abstract class LoggableBleManager<T extends BleManagerCallbacks> extends BleManager<T> {
public abstract class LoggableBleManager<T extends BleManagerCallbacks> extends LegacyBleManager<T> {
private ILogSession logSession;
/**
* The manager constructor.
* <p>
* After constructing the manager, the callbacks object must be set with
* {@link #setManagerCallbacks(BleManagerCallbacks)}.
* {@link #setGattCallbacks(BleManagerCallbacks)}.
*
* @param context the context.
*/

30
app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java
View File

@@ -141,7 +141,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
LoggableBleManager<BleManagerCallbacks> manager = bleManagers.get(device);
if (manager == null) {
bleManagers.put(device, manager = initializeManager());
manager.setManagerCallbacks(BleMulticonnectProfileService.this);
manager.setGattCallbacks(BleMulticonnectProfileService.this);
}
manager.setLogger(session);
manager.connect(device)
@@ -162,7 +162,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
* @param device target device to disconnect and forget
*/
public void disconnect(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null && manager.isConnected()) {
manager.disconnect().enqueue();
}
@@ -175,7 +175,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
* @return <code>true</code> if device is connected to the sensor, <code>false</code> otherwise
*/
public final boolean isConnected(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
return manager != null && manager.isConnected();
}
@@ -186,7 +186,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
* initializing. False otherwise.
*/
public final boolean isReady(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
return manager != null && manager.isReady();
}
@@ -197,7 +197,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
*/
@SuppressWarnings("unused")
public final int getConnectionState(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
return manager != null ? manager.getConnectionState() : BluetoothGatt.STATE_DISCONNECTED;
}
@@ -210,7 +210,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
@SuppressWarnings("deprecation")
@Deprecated
public int getBatteryValue(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null)
return manager.getBatteryValue();
return 0;
@@ -228,27 +228,27 @@ public abstract class BleMulticonnectProfileService extends Service implements B
@Override
public void log(@NonNull final BluetoothDevice device, final int level, final String message) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null)
manager.log(level, message);
}
@Override
public void log(@NonNull final BluetoothDevice device, final int level, @StringRes final int messageRes, final Object... params) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null)
manager.log(level, messageRes, params);
}
@Override
public void log(final int level, @NonNull final String message) {
for (final BleManager<BleManagerCallbacks> manager : bleManagers.values())
for (final BleManager manager : bleManagers.values())
manager.log(level, message);
}
@Override
public void log(final int level, @StringRes final int messageRes, final Object... params) {
for (final BleManager<BleManagerCallbacks> manager : bleManagers.values())
for (final BleManager manager : bleManagers.values())
manager.log(level, messageRes, params);
}
}
@@ -405,7 +405,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
unregisterReceiver(bluetoothStateBroadcastReceiver);
// The managers map may not be empty if the service was killed by the system
for (final BleManager<BleManagerCallbacks> manager : bleManagers.values()) {
for (final BleManager manager : bleManagers.values()) {
// Service is being destroyed, no need to disconnect manually.
manager.close();
manager.log(Log.INFO, "Service destroyed");
@@ -432,7 +432,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
*/
protected void onBluetoothEnabled() {
for (final BluetoothDevice device : managedDevices) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null && !manager.isConnected())
manager.connect(device).enqueue();
}
@@ -598,7 +598,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
* @param device the target device
* @return the BleManager or null
*/
protected BleManager<? extends BleManagerCallbacks> getBleManager(final BluetoothDevice device) {
protected BleManager getBleManager(final BluetoothDevice device) {
return bleManagers.get(device);
}
@@ -617,7 +617,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
protected List<BluetoothDevice> getConnectedDevices() {
final List<BluetoothDevice> list = new ArrayList<>();
for (BluetoothDevice device : managedDevices) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
if (manager != null && manager.isConnected())
list.add(device);
}
@@ -630,7 +630,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B
* @return <code>true</code> if device is connected to the sensor, <code>false</code> otherwise
*/
protected boolean isConnected(final BluetoothDevice device) {
final BleManager<BleManagerCallbacks> manager = bleManagers.get(device);
final BleManager manager = bleManagers.get(device);
return manager != null && manager.isConnected();
}
}

4
app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityManager.java
View File

@@ -81,7 +81,7 @@ class ProximityManager extends BatteryManager<ProximityManagerCallbacks> {
.with(new AlertLevelDataCallback() {
@Override
public void onAlertLevelChanged(@NonNull final BluetoothDevice device, final int level) {
callbacks.onLocalAlarmSwitched(device, level != ALERT_NONE);
mCallbacks.onLocalAlarmSwitched(device, level != ALERT_NONE);
}
});
// After connection, set the Link Loss behaviour on the tag.
@@ -152,7 +152,7 @@ class ProximityManager extends BatteryManager<ProximityManagerCallbacks> {
"\"" + AlertLevelParser.parse(data) + "\" sent"))
.done(device -> {
alertOn = on;
callbacks.onRemoteAlarmSwitched(device, on);
mCallbacks.onRemoteAlarmSwitched(device, on);
})
.fail((device, status) -> log(Log.WARN,
status == FailCallback.REASON_NULL_ATTRIBUTE ?

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java
View File

@@ -47,7 +47,7 @@ import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.content.ContextCompat;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import no.nordicsemi.android.ble.BleServerManagerCallbacks;
import no.nordicsemi.android.ble.observer.ServerObserver;
import no.nordicsemi.android.log.LogContract;
import no.nordicsemi.android.nrftoolbox.FeaturesActivity;
import no.nordicsemi.android.nrftoolbox.R;
@@ -55,7 +55,7 @@ import no.nordicsemi.android.nrftoolbox.ToolboxApplication;
import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager;
import no.nordicsemi.android.nrftoolbox.profile.multiconnect.BleMulticonnectProfileService;
public class ProximityService extends BleMulticonnectProfileService implements ProximityManagerCallbacks, BleServerManagerCallbacks {
public class ProximityService extends BleMulticonnectProfileService implements ProximityManagerCallbacks, ServerObserver {
@SuppressWarnings("unused")
private static final String TAG = "ProximityService";
@@ -179,7 +179,7 @@ public class ProximityService extends BleMulticonnectProfileService implements P
@Override
protected void onServiceCreated() {
serverManager = new ProximityServerManager(this);
serverManager.setManagerCallbacks(this);
serverManager.setServerObserver(this);
initializeAlarm();

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCManager.java
View File

@@ -78,7 +78,7 @@ public class RSCManager extends BatteryManager<RSCManagerCallbacks> {
final float instantaneousSpeed, final int instantaneousCadence,
@Nullable final Integer strideLength,
@Nullable final Long totalDistance) {
callbacks.onRSCMeasurementReceived(device, running, instantaneousSpeed,
mCallbacks.onRSCMeasurementReceived(device, running, instantaneousSpeed,
instantaneousCadence, strideLength, totalDistance);
}
});

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java
View File

@@ -123,7 +123,7 @@ public class TemplateManager extends BatteryManager<TemplateManagerCallbacks> {
@Override
public void onSampleValueReceived(@NonNull final BluetoothDevice device, final int value) {
// Let's lass received data to the service
callbacks.onSampleValueReceived(device, value);
mCallbacks.onSampleValueReceived(device, value);
}
@Override

2
app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java
View File

@@ -75,7 +75,7 @@ public class UARTManager extends LoggableBleManager<UARTManagerCallbacks> {
.with((device, data) -> {
final String text = data.getStringValue(0);
log(LogContract.Log.Level.APPLICATION, "\"" + text + "\" received");
callbacks.onDataReceived(device, text);
mCallbacks.onDataReceived(device, text);
});
requestMtu(260).enqueue();
enableNotifications(txCharacteristic).enqueue();