From c5f9200096d19836166b7e5b574cf6b34276332c Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Fri, 25 May 2018 12:50:53 +0200 Subject: [PATCH] Code cleanup, comments updates, adding missing parameters --- .../no/nordicsemi/android/nrftoolbox/hts/HTSManager.java | 5 +++-- .../no/nordicsemi/android/nrftoolbox/hts/HTSService.java | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManager.java index deaeebfd..0f40a867 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManager.java @@ -80,10 +80,11 @@ public class HTSManager extends BatteryManager { } @Override - public void onTemperatureMeasurementReceived(final float temperature, final int unit, + public void onTemperatureMeasurementReceived(@NonNull final BluetoothDevice device, + final float temperature, final int unit, @Nullable final Calendar calendar, @Nullable final Integer type) { - mCallbacks.onTemperatureMeasurementReceived(temperature, unit, calendar, type); + mCallbacks.onTemperatureMeasurementReceived(device, temperature, unit, calendar, type); } }); enableIndications(mHTCharacteristic); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java index 8a0de43c..dd1a0496 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java @@ -38,7 +38,7 @@ import android.support.v4.content.LocalBroadcastManager; import java.util.Calendar; import no.nordicsemi.android.ble.BleManager; -import no.nordicsemi.android.ble.common.callback.ht.TemperatureMeasurementDataCallback; +import no.nordicsemi.android.ble.common.profile.ht.TemperatureMeasurementCallback; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; @@ -59,6 +59,7 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks private final static int OPEN_ACTIVITY_REQ = 0; private final static int DISCONNECT_REQ = 1; + @SuppressWarnings("unused") private HTSManager mManager; private final LocalBinder mBinder = new HTSBinder(); @@ -111,12 +112,13 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks } @Override - public void onTemperatureMeasurementReceived(final float temperature, final int unit, + public void onTemperatureMeasurementReceived(@NonNull final BluetoothDevice device, + final float temperature, final int unit, @Nullable final Calendar calendar, @Nullable final Integer type) { final Intent broadcast = new Intent(BROADCAST_HTS_MEASUREMENT); broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice()); - broadcast.putExtra(EXTRA_TEMPERATURE, TemperatureMeasurementDataCallback.toCelsius(temperature, unit)); + broadcast.putExtra(EXTRA_TEMPERATURE, TemperatureMeasurementCallback.toCelsius(temperature, unit)); // ignore the rest LocalBroadcastManager.getInstance(this).sendBroadcast(broadcast);