From d296cbd87819d560848d86c1846b76896e9eb50c Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Mon, 12 Nov 2018 13:29:04 +0100 Subject: [PATCH] Migration to BLE Library 2.0.0 --- app/build.gradle | 2 +- .../nrftoolbox/battery/BatteryManager.java | 3 +- .../android/nrftoolbox/bpm/BPMActivity.java | 10 ++--- .../android/nrftoolbox/cgms/CGMService.java | 6 +-- .../android/nrftoolbox/csc/CSCService.java | 4 +- .../nrftoolbox/gls/GlucoseActivity.java | 4 +- .../android/nrftoolbox/hrs/HRSActivity.java | 10 ++--- .../android/nrftoolbox/hts/HTSService.java | 4 +- .../profile/BleProfileActivity.java | 29 ++++++------ .../BleProfileExpandableListActivity.java | 5 +-- .../nrftoolbox/profile/BleProfileService.java | 4 +- .../profile/LoggableBleManager.java | 45 +++++++++++++++++++ .../BleMulticonnectProfileService.java | 7 +-- .../proximity/ProximityService.java | 4 +- .../android/nrftoolbox/rsc/RSCService.java | 5 +-- .../nrftoolbox/template/TemplateService.java | 4 +- .../android/nrftoolbox/uart/UARTManager.java | 4 +- .../android/nrftoolbox/uart/UARTService.java | 4 +- 18 files changed, 98 insertions(+), 56 deletions(-) create mode 100644 app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java diff --git a/app/build.gradle b/app/build.gradle index 0ed0d0b8..fccb7e99 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,7 +57,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.0-beta5' + implementation 'no.nordicsemi.android:ble-common:2.0.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): diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java index f70d7cde..517b9bac 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/battery/BatteryManager.java @@ -14,6 +14,7 @@ import no.nordicsemi.android.ble.callback.DataReceivedCallback; import no.nordicsemi.android.ble.common.callback.battery.BatteryLevelDataCallback; import no.nordicsemi.android.ble.data.Data; import no.nordicsemi.android.log.LogContract; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; /** * The Ble Manager with Battery Service support. @@ -22,7 +23,7 @@ import no.nordicsemi.android.log.LogContract; * @see BleManager */ @SuppressWarnings("WeakerAccess") -public abstract class BatteryManager extends BleManager { +public abstract class BatteryManager extends LoggableBleManager { /** Battery Service UUID. */ private final static UUID BATTERY_SERVICE_UUID = UUID.fromString("0000180F-0000-1000-8000-00805f9b34fb"); /** Battery Level characteristic UUID. */ diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java index c571699c..c3c32ac2 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMActivity.java @@ -30,11 +30,11 @@ import android.widget.TextView; import java.util.Calendar; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.ble.common.profile.bp.BloodPressureMeasurementCallback; import no.nordicsemi.android.ble.common.profile.bp.IntermediateCuffPressureCallback; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.profile.BleProfileActivity; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; // TODO The BPMActivity should be rewritten to use the service approach, like other do. public class BPMActivity extends BleProfileActivity implements BPMManagerCallbacks { @@ -90,7 +90,7 @@ public class BPMActivity extends BleProfileActivity implements BPMManagerCallbac } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { final BPMManager manager = BPMManager.getBPMManager(getApplicationContext()); manager.setGattCallbacks(this); return manager; @@ -110,17 +110,17 @@ public class BPMActivity extends BleProfileActivity implements BPMManagerCallbac } @Override - public void onServicesDiscovered(final BluetoothDevice device, final boolean optionalServicesFound) { + public void onServicesDiscovered(@NonNull final BluetoothDevice device, final boolean optionalServicesFound) { // this may notify user or show some views } @Override - public void onDeviceReady(final BluetoothDevice device) { + public void onDeviceReady(@NonNull final BluetoothDevice device) { // this may notify user } @Override - public void onDeviceDisconnected(final BluetoothDevice device) { + public void onDeviceDisconnected(@NonNull final BluetoothDevice device) { super.onDeviceDisconnected(device); runOnUiThread(() -> mBatteryLevelView.setText(R.string.not_available)); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java index 05b6f683..515cc897 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMService.java @@ -9,18 +9,16 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; import android.util.SparseArray; -import no.nordicsemi.android.ble.BleManager; -import no.nordicsemi.android.ble.common.profile.cgm.CGMTypes; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; public class CGMService extends BleProfileService implements CGMSManagerCallbacks { private static final String ACTION_DISCONNECT = "no.nordicsemi.android.nrftoolbox.cgms.ACTION_DISCONNECT"; @@ -133,7 +131,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new CGMSManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCService.java index 4707a122..a010c22d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCService.java @@ -34,12 +34,12 @@ import android.support.annotation.NonNull; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; public class CSCService extends BleProfileService implements CSCManagerCallbacks { @SuppressWarnings("unused") @@ -82,7 +82,7 @@ public class CSCService extends BleProfileService implements CSCManagerCallbacks } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new CSCManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java index 04cac1ad..f73a33ca 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseActivity.java @@ -34,9 +34,9 @@ import android.widget.TextView; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.profile.BleProfileExpandableListActivity; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; // TODO The GlucoseActivity should be rewritten to use the service approach, like other do. public class GlucoseActivity extends BleProfileExpandableListActivity implements PopupMenu.OnMenuItemClickListener, GlucoseManagerCallbacks { @@ -80,7 +80,7 @@ public class GlucoseActivity extends BleProfileExpandableListActivity implements } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { GlucoseManager manager = mGlucoseManager = GlucoseManager.getGlucoseManager(getApplicationContext()); manager.setGattCallbacks(this); return manager; diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java index b80ece9c..fd05e602 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java @@ -37,10 +37,10 @@ import org.achartengine.GraphicalView; import java.util.List; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.profile.BleProfileActivity; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; /** * HRSActivity is the main Heart rate activity. It implements HRSManagerCallbacks to receive callbacks from HRSManager class. The activity supports portrait and landscape orientations. The activity @@ -179,19 +179,19 @@ public class HRSActivity extends BleProfileActivity implements HRSManagerCallbac } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { final HRSManager manager = HRSManager.getInstance(getApplicationContext()); manager.setGattCallbacks(this); return manager; } @Override - public void onServicesDiscovered(final BluetoothDevice device, final boolean optionalServicesFound) { + public void onServicesDiscovered(@NonNull final BluetoothDevice device, final boolean optionalServicesFound) { // this may notify user or show some views } @Override - public void onDeviceReady(final BluetoothDevice device) { + public void onDeviceReady(@NonNull final BluetoothDevice device) { startShowGraph(); } @@ -221,7 +221,7 @@ public class HRSActivity extends BleProfileActivity implements HRSManagerCallbac } @Override - public void onDeviceDisconnected(final BluetoothDevice device) { + public void onDeviceDisconnected(@NonNull final BluetoothDevice device) { super.onDeviceDisconnected(device); runOnUiThread(() -> { mHRSValue.setText(R.string.not_available_value); 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 a7a21e48..e088cf24 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 @@ -37,13 +37,13 @@ import android.support.v4.content.LocalBroadcastManager; import java.util.Calendar; -import no.nordicsemi.android.ble.BleManager; 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; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; @SuppressWarnings("FieldCanBeLocal") public class HTSService extends BleProfileService implements HTSManagerCallbacks { @@ -86,7 +86,7 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new HTSManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java index 15c89e2d..ef785eb8 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileActivity.java @@ -41,7 +41,6 @@ import android.widget.Toast; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.ble.BleManagerCallbacks; import no.nordicsemi.android.log.ILogSession; import no.nordicsemi.android.log.LocalLogSession; @@ -59,7 +58,7 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl private static final String SIS_DEVICE_NAME = "device_name"; protected static final int REQUEST_ENABLE_BT = 2; - private BleManager mBleManager; + private LoggableBleManager mBleManager; private TextView mDeviceNameView; private Button mConnectButton; @@ -262,7 +261,7 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl } @Override - public void onDeviceConnecting(final BluetoothDevice device) { + public void onDeviceConnecting(@NonNull final BluetoothDevice device) { runOnUiThread(() -> { mDeviceNameView.setText(mDeviceName != null ? mDeviceName : getString(R.string.not_available)); mConnectButton.setText(R.string.action_connecting); @@ -270,18 +269,18 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl } @Override - public void onDeviceConnected(final BluetoothDevice device) { + public void onDeviceConnected(@NonNull final BluetoothDevice device) { mDeviceConnected = true; runOnUiThread(() -> mConnectButton.setText(R.string.action_disconnect)); } @Override - public void onDeviceDisconnecting(final BluetoothDevice device) { + public void onDeviceDisconnecting(@NonNull final BluetoothDevice device) { runOnUiThread(() -> mConnectButton.setText(R.string.action_disconnecting)); } @Override - public void onDeviceDisconnected(final BluetoothDevice device) { + public void onDeviceDisconnected(@NonNull final BluetoothDevice device) { mDeviceConnected = false; mBleManager.close(); runOnUiThread(() -> { @@ -291,43 +290,43 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl } @Override - public void onLinkLossOccurred(final BluetoothDevice device) { + public void onLinkLossOccurred(@NonNull final BluetoothDevice device) { mDeviceConnected = false; } @Override - public void onServicesDiscovered(final BluetoothDevice device, boolean optionalServicesFound) { + public void onServicesDiscovered(@NonNull final BluetoothDevice device, boolean optionalServicesFound) { // this may notify user or show some views } @Override - public void onDeviceReady(final BluetoothDevice device) { + public void onDeviceReady(@NonNull final BluetoothDevice device) { // empty default implementation } @Override - public void onBondingRequired(final BluetoothDevice device) { + public void onBondingRequired(@NonNull final BluetoothDevice device) { showToast(R.string.bonding); } @Override - public void onBonded(final BluetoothDevice device) { + public void onBonded(@NonNull final BluetoothDevice device) { showToast(R.string.bonded); } @Override - public void onBondingFailed(final BluetoothDevice device) { + public void onBondingFailed(@NonNull final BluetoothDevice device) { showToast(R.string.bonding_failed); } @Override - public void onError(final BluetoothDevice device, final String message, final int errorCode) { + public void onError(@NonNull final BluetoothDevice device, @NonNull final String message, final int errorCode) { DebugLogger.e(TAG, "Error occurred: " + message + ", error code: " + errorCode); showToast(message + " (" + errorCode + ")"); } @Override - public void onDeviceNotSupported(final BluetoothDevice device) { + public void onDeviceNotSupported(@NonNull final BluetoothDevice device) { showToast(R.string.not_supported); } @@ -368,7 +367,7 @@ public abstract class BleProfileActivity extends AppCompatActivity implements Bl * * @return the manager that was created */ - protected abstract BleManager initializeManager(); + protected abstract LoggableBleManager initializeManager(); /** * Restores the default UI before reconnecting diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java index af1a2826..2a2b957e 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java @@ -40,7 +40,6 @@ import android.widget.Toast; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.ble.BleManagerCallbacks; import no.nordicsemi.android.log.ILogSession; import no.nordicsemi.android.log.LocalLogSession; @@ -58,7 +57,7 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct private static final String SIS_DEVICE_NAME = "device_name"; protected static final int REQUEST_ENABLE_BT = 2; - private BleManager mBleManager; + private LoggableBleManager mBleManager; private TextView mDeviceNameView; private Button mConnectButton; @@ -367,7 +366,7 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct * * @return the manager that was created */ - protected abstract BleManager initializeManager(); + protected abstract LoggableBleManager initializeManager(); /** * Restores the default UI before reconnecting diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java index 27065537..2cfb8433 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileService.java @@ -79,7 +79,7 @@ public abstract class BleProfileService extends Service implements BleManagerCal public static final int STATE_CONNECTING = 2; public static final int STATE_DISCONNECTING = 3; - private BleManager mBleManager; + private LoggableBleManager mBleManager; private Handler mHandler; protected boolean mBound; @@ -311,7 +311,7 @@ public abstract class BleProfileService extends Service implements BleManagerCal * @return a new BleManager object */ @SuppressWarnings("rawtypes") - protected abstract BleManager initializeManager(); + protected abstract LoggableBleManager initializeManager(); /** * This method returns whether autoConnect option should be used. diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java new file mode 100644 index 00000000..56ef94b3 --- /dev/null +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/LoggableBleManager.java @@ -0,0 +1,45 @@ +package no.nordicsemi.android.nrftoolbox.profile; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.support.annotation.Nullable; + +import no.nordicsemi.android.ble.BleManager; +import no.nordicsemi.android.ble.BleManagerCallbacks; +import no.nordicsemi.android.log.ILogSession; +import no.nordicsemi.android.log.LogContract; +import no.nordicsemi.android.log.Logger; + +/** + * The manager that logs to nRF Logger. If nRF Logger is not installed, logs are ignored. + * + * @param the callbacks class. + */ +public abstract class LoggableBleManager extends BleManager { + private ILogSession mLogSession; + + /** + * The manager constructor. + *

+ * After constructing the manager, the callbacks object must be set with + * {@link #setGattCallbacks(BleManagerCallbacks)}. + * + * @param context the context. + */ + public LoggableBleManager(@NonNull final Context context) { + super(context); + } + + /** + * Sets the log session to log into. + * @param session + */ + public void setLogger(@Nullable final ILogSession session) { + mLogSession = session; + } + + @Override + public void log(final int priority, @NonNull final String message) { + Logger.log(mLogSession, LogContract.Log.Level.fromPriority(priority), message); + } +} diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java index a946546c..deb4cb39 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileService.java @@ -47,6 +47,7 @@ import no.nordicsemi.android.ble.BleManagerCallbacks; import no.nordicsemi.android.ble.utils.ILogger; import no.nordicsemi.android.log.ILogSession; import no.nordicsemi.android.log.LogContract; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; public abstract class BleMulticonnectProfileService extends Service implements BleManagerCallbacks { @SuppressWarnings("unused") @@ -76,7 +77,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B public static final int STATE_CONNECTING = 2; public static final int STATE_DISCONNECTING = 3; - private HashMap> mBleManagers; + private HashMap> mBleManagers; private List mManagedDevices; private Handler mHandler; @@ -137,7 +138,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B return; mManagedDevices.add(device); - BleManager manager = mBleManagers.get(device); + LoggableBleManager manager = mBleManagers.get(device); if (manager != null) { if (session != null) manager.setLogger(session); @@ -350,7 +351,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B * @return a new BleManager object */ @SuppressWarnings("rawtypes") - protected abstract BleManager initializeManager(); + protected abstract LoggableBleManager initializeManager(); @Override public int onStartCommand(final Intent intent, final int flags, final int startId) { diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java index 2e04a477..fd40494c 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/ProximityService.java @@ -46,11 +46,11 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.log.LogContract; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; 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, ProximityServerManagerCallbacks { @@ -133,7 +133,7 @@ public class ProximityService extends BleMulticonnectProfileService implements P } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return new ProximityManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCService.java index b7441a2b..1c9c51d0 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/rsc/RSCService.java @@ -35,14 +35,13 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; -import android.util.Log; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; public class RSCService extends BleProfileService implements RSCManagerCallbacks { private static final String TAG = "RSCService"; @@ -95,7 +94,7 @@ public class RSCService extends BleProfileService implements RSCManagerCallbacks } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new RSCManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateService.java index 2f340f67..53950e6d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateService.java @@ -34,12 +34,12 @@ import android.support.annotation.NonNull; import android.support.v4.app.NotificationCompat; import android.support.v4.content.LocalBroadcastManager; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; public class TemplateService extends BleProfileService implements TemplateManagerCallbacks { public static final String BROADCAST_TEMPLATE_MEASUREMENT = "no.nordicsemi.android.nrftoolbox.template.BROADCAST_MEASUREMENT"; @@ -80,7 +80,7 @@ public class TemplateService extends BleProfileService implements TemplateManage } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new TemplateManager(this); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java index 6ac61872..86175acb 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTManager.java @@ -31,11 +31,11 @@ import android.text.TextUtils; import java.util.UUID; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.ble.WriteRequest; import no.nordicsemi.android.log.LogContract; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; -public class UARTManager extends BleManager { +public class UARTManager extends LoggableBleManager { /** Nordic UART Service UUID */ private final static UUID UART_SERVICE_UUID = UUID.fromString("6E400001-B5A3-F393-E0A9-E50E24DCCA9E"); /** RX characteristic UUID */ diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTService.java index 98f2a059..5157da07 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTService.java @@ -42,12 +42,12 @@ import com.google.android.gms.wearable.Node; import com.google.android.gms.wearable.NodeApi; import com.google.android.gms.wearable.Wearable; -import no.nordicsemi.android.ble.BleManager; import no.nordicsemi.android.log.Logger; import no.nordicsemi.android.nrftoolbox.FeaturesActivity; import no.nordicsemi.android.nrftoolbox.R; import no.nordicsemi.android.nrftoolbox.ToolboxApplication; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; +import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; import no.nordicsemi.android.nrftoolbox.wearable.common.Constants; public class UARTService extends BleProfileService implements UARTManagerCallbacks { @@ -91,7 +91,7 @@ public class UARTService extends BleProfileService implements UARTManagerCallbac } @Override - protected BleManager initializeManager() { + protected LoggableBleManager initializeManager() { return mManager = new UARTManager(this); }