From 7168b7d067b6bfba04578fe99559824947c184c8 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Mon, 12 Nov 2018 14:07:01 +0100 Subject: [PATCH] Log level -> priority --- .../nrftoolbox/battery/BatteryManager.java | 11 ++++++----- .../android/nrftoolbox/bpm/BPMManager.java | 7 ++++--- .../android/nrftoolbox/cgms/CGMSManager.java | 17 +++++++++-------- .../android/nrftoolbox/csc/CSCManager.java | 3 ++- .../android/nrftoolbox/gls/GlucoseManager.java | 5 +++-- .../android/nrftoolbox/hrs/HRSManager.java | 3 ++- .../nrftoolbox/profile/BleProfileService.java | 3 ++- .../BleMulticonnectProfileService.java | 3 ++- ...MulticonnectProfileServiceReadyActivity.java | 5 +++-- .../nrftoolbox/proximity/ProximityManager.java | 9 +++++---- .../nrftoolbox/template/TemplateManager.java | 17 +++++++++-------- 11 files changed, 47 insertions(+), 36 deletions(-) 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 517b9bac..37e394f6 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 @@ -6,6 +6,7 @@ import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattService; import android.content.Context; import android.support.annotation.NonNull; +import android.util.Log; import java.util.UUID; @@ -52,7 +53,7 @@ public abstract class BatteryManager extends @Override public void onInvalidDataReceived(@NonNull final BluetoothDevice device, final @NonNull Data data) { - log(LogContract.Log.Level.WARNING, "Invalid Battery Level data received: " + data); + log(Log.WARN, "Invalid Battery Level data received: " + data); } }; @@ -60,7 +61,7 @@ public abstract class BatteryManager extends if (isConnected()) { readCharacteristic(mBatteryLevelCharacteristic) .with(mBatteryLevelDataCallback) - .fail((device, status) -> log(LogContract.Log.Level.WARNING,"Battery Level characteristic not found")) + .fail((device, status) -> log(Log.WARN,"Battery Level characteristic not found")) .enqueue(); } } @@ -71,8 +72,8 @@ public abstract class BatteryManager extends setNotificationCallback(mBatteryLevelCharacteristic) .with(mBatteryLevelDataCallback); enableNotifications(mBatteryLevelCharacteristic) - .done(device -> log(LogContract.Log.Level.INFO, "Battery Level notifications enabled")) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Battery Level characteristic not found")) + .done(device -> log(Log.INFO, "Battery Level notifications enabled")) + .fail((device, status) -> log(Log.WARN, "Battery Level characteristic not found")) .enqueue(); } } @@ -83,7 +84,7 @@ public abstract class BatteryManager extends public void disableBatteryLevelCharacteristicNotifications() { if (isConnected()) { disableNotifications(mBatteryLevelCharacteristic) - .done(device -> log(LogContract.Log.Level.INFO, "Battery Level notifications disabled")) + .done(device -> log(Log.INFO, "Battery Level notifications disabled")) .enqueue(); } } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java index 37eaec85..6e4d840a 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/bpm/BPMManager.java @@ -28,6 +28,7 @@ import android.bluetooth.BluetoothGattService; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.Log; import java.util.Calendar; import java.util.UUID; @@ -103,7 +104,7 @@ public class BPMManager extends BatteryManager { @Override public void onInvalidDataReceived(@NonNull final BluetoothDevice device, @NonNull final Data data) { - log(LogContract.Log.Level.WARNING, "Invalid ICP data received: " + data); + log(Log.WARN, "Invalid ICP data received: " + data); } }); setIndicationCallback(mBPMCharacteristic) @@ -128,12 +129,12 @@ public class BPMManager extends BatteryManager { @Override public void onInvalidDataReceived(@NonNull final BluetoothDevice device, @NonNull final Data data) { - log(LogContract.Log.Level.WARNING, "Invalid BPM data received: " + data); + log(Log.WARN, "Invalid BPM data received: " + data); } }); enableNotifications(mICPCharacteristic) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, + .fail((device, status) -> log(Log.WARN, "Intermediate Cuff Pressure characteristic not found")) .enqueue(); enableIndications(mBPMCharacteristic).enqueue(); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java index 72f61643..8195300d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManager.java @@ -29,6 +29,7 @@ import android.bluetooth.BluetoothGattService; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.Log; import android.util.SparseArray; import java.util.UUID; @@ -110,7 +111,7 @@ public class CGMSManager extends BatteryManager { log(LogContract.Log.Level.APPLICATION, "E2E CRC feature " + (mSecured ? "supported" : "not supported")); } }) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Could not read CGM Feature characteristic")) + .fail((device, status) -> log(Log.WARN, "Could not read CGM Feature characteristic")) .enqueue(); // Check if the session is already started. This is not supported in the experimental CGMS from the SDK. @@ -124,7 +125,7 @@ public class CGMSManager extends BatteryManager { } } }) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Could not read CGM Status characteristic")) + .fail((device, status) -> log(Log.WARN, "Could not read CGM Status characteristic")) .enqueue(); // Set notification and indication callbacks @@ -161,7 +162,7 @@ public class CGMSManager extends BatteryManager { @Override public void onContinuousGlucoseMeasurementReceivedWithCrcError(@NonNull final BluetoothDevice device, @NonNull final Data data) { - log(LogContract.Log.Level.WARNING, "Continuous Glucose Measurement record received with CRC error"); + log(Log.WARN, "Continuous Glucose Measurement record received with CRC error"); } }); @@ -209,7 +210,7 @@ public class CGMSManager extends BatteryManager { @Override public void onCGMSpecificOpsResponseReceivedWithCrcError(@NonNull final BluetoothDevice device, @NonNull final Data data) { - log(LogContract.Log.Level.ERROR, "Request failed: CRC error"); + log(Log.ERROR, "Request failed: CRC error"); } }); @@ -264,7 +265,7 @@ public class CGMSManager extends BatteryManager { @Override public void onRecordAccessOperationError(@NonNull final BluetoothDevice device, final int requestCode, final int errorCode) { - log(LogContract.Log.Level.WARNING, "Record Access operation failed (error " + errorCode + ")"); + log(Log.WARN, "Record Access operation failed (error " + errorCode + ")"); if (errorCode == RACP_ERROR_OP_CODE_NOT_SUPPORTED) { mCallbacks.onOperationNotSupported(device); } else { @@ -275,13 +276,13 @@ public class CGMSManager extends BatteryManager { // Enable notifications and indications enableNotifications(mCGMMeasurementCharacteristic) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to enable Continuous Glucose Measurement notifications (" + status + ")")) + .fail((device, status) -> log(Log.WARN, "Failed to enable Continuous Glucose Measurement notifications (" + status + ")")) .enqueue(); enableIndications(mCGMSpecificOpsControlPointCharacteristic) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to enable CGM Specific Ops Control Point indications notifications (" + status + ")")) + .fail((device, status) -> log(Log.WARN, "Failed to enable CGM Specific Ops Control Point indications notifications (" + status + ")")) .enqueue(); enableIndications(mRecordAccessControlPointCharacteristic) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to enabled Record Access Control Point indications (error " + status + ")")) + .fail((device, status) -> log(Log.WARN, "Failed to enabled Record Access Control Point indications (error " + status + ")")) .enqueue(); // Start Continuous Glucose session if hasn't been started before diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java index cdba9c88..255727d5 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/csc/CSCManager.java @@ -30,6 +30,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.support.annotation.NonNull; +import android.util.Log; import java.util.UUID; @@ -102,7 +103,7 @@ public class CSCManager extends BatteryManager { @Override public void onInvalidDataReceived(@NonNull final BluetoothDevice device, final @NonNull Data data) { - log(LogContract.Log.Level.WARNING, "Invalid CSC Measurement data received: " + data); + log(Log.WARN, "Invalid CSC Measurement data received: " + data); } }); enableNotifications(mCSCMeasurementCharacteristic).enqueue(); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java index af5ac118..a779f42a 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/gls/GlucoseManager.java @@ -29,6 +29,7 @@ import android.content.Context; import android.os.Handler; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.Log; import android.util.SparseArray; import java.util.Calendar; @@ -241,7 +242,7 @@ public class GlucoseManager extends BatteryManager { @Override public void onRecordAccessOperationError(@NonNull final BluetoothDevice device, final int requestCode, final int errorCode) { - log(LogContract.Log.Level.WARNING, "Record Access operation failed (error " + errorCode + ")"); + log(Log.WARN, "Record Access operation failed (error " + errorCode + ")"); if (errorCode == RACP_ERROR_OP_CODE_NOT_SUPPORTED) { mCallbacks.onOperationNotSupported(device); } else { @@ -253,7 +254,7 @@ public class GlucoseManager extends BatteryManager { enableNotifications(mGlucoseMeasurementCharacteristic).enqueue(); enableNotifications(mGlucoseMeasurementContextCharacteristic).enqueue(); enableIndications(mRecordAccessControlPointCharacteristic) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to enabled Record Access Control Point indications (error " + status + ")")) + .fail((device, status) -> log(Log.WARN, "Failed to enabled Record Access Control Point indications (error " + status + ")")) .enqueue(); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java index ac8a3952..83d937df 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java @@ -28,6 +28,7 @@ import android.bluetooth.BluetoothGattService; import android.content.Context; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.util.Log; import java.util.List; import java.util.UUID; @@ -98,7 +99,7 @@ public class HRSManager extends BatteryManager { mCallbacks.onBodySensorLocationReceived(device, sensorLocation); } }) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Body Sensor Location characteristic not found")) + .fail((device, status) -> log(Log.WARN, "Body Sensor Location characteristic not found")) .enqueue(); setNotificationCallback(mHeartRateCharacteristic) .with(new HeartRateMeasurementDataCallback() { 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 2cfb8433..b6e94a94 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 @@ -36,6 +36,7 @@ import android.os.IBinder; import android.support.annotation.NonNull; import android.support.annotation.StringRes; import android.support.v4.content.LocalBroadcastManager; +import android.util.Log; import android.widget.Toast; import no.nordicsemi.android.ble.BleManager; @@ -95,7 +96,7 @@ public abstract class BleProfileService extends Service implements BleManagerCal final ILogger logger = getBinder(); final String stateString = "[Broadcast] Action received: " + BluetoothAdapter.ACTION_STATE_CHANGED + ", state changed to " + state2String(state); - logger.log(LogContract.Log.Level.DEBUG, stateString); + logger.log(Log.DEBUG, stateString); switch (state) { case BluetoothAdapter.STATE_ON: 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 deb4cb39..0d9e14c0 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 @@ -35,6 +35,7 @@ import android.os.IBinder; import android.support.annotation.NonNull; import android.support.annotation.StringRes; import android.support.v4.content.LocalBroadcastManager; +import android.util.Log; import android.widget.Toast; import java.util.ArrayList; @@ -395,7 +396,7 @@ public abstract class BleMulticonnectProfileService extends Service implements B for (final BleManager manager : mBleManagers.values()) { // Service is being destroyed, no need to disconnect manually. manager.close(); - manager.log(LogContract.Log.Level.INFO, "Service destroyed"); + manager.log(Log.INFO, "Service destroyed"); } mBleManagers.clear(); mManagedDevices.clear(); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java index 35661427..3b7f232d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/multiconnect/BleMulticonnectProfileServiceReadyActivity.java @@ -38,6 +38,7 @@ import android.os.IBinder; import android.support.v4.content.LocalBroadcastManager; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -164,7 +165,7 @@ public abstract class BleMulticonnectProfileServiceReadyActivity { protected void initialize() { super.initialize(); writeCharacteristic(mLinkLossCharacteristic, AlertLevelData.highAlert()) - .done(device -> log(LogContract.Log.Level.INFO, "Link loss alert level set")) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to set link loss level: " + status)) + .done(device -> log(Log.INFO, "Link loss alert level set")) + .fail((device, status) -> log(Log.WARN, "Failed to set link loss level: " + status)) .enqueue(); } @@ -124,7 +125,7 @@ class ProximityManager extends BatteryManager { return; writeCharacteristic(mAlertLevelCharacteristic, on ? AlertLevelData.highAlert() : AlertLevelData.noAlert()) - .before(device -> log(LogContract.Log.Level.VERBOSE, + .before(device -> log(Log.VERBOSE, on ? "Setting alarm to HIGH..." : "Disabling alarm...")) .with((device, data) -> log(LogContract.Log.Level.APPLICATION, "\"" + AlertLevelParser.parse(data) + "\" sent")) @@ -132,7 +133,7 @@ class ProximityManager extends BatteryManager { mAlertOn = on; mCallbacks.onRemoteAlarmSwitched(device, on); }) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, + .fail((device, status) -> log(Log.WARN, status == FailCallback.REASON_NULL_ATTRIBUTE ? "Alert Level characteristic not found" : GattError.parse(status))) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java index 584ec48b..884fba1b 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/template/TemplateManager.java @@ -27,6 +27,7 @@ import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattService; import android.content.Context; import android.support.annotation.NonNull; +import android.util.Log; import java.util.UUID; @@ -106,7 +107,7 @@ public class TemplateManager extends BatteryManager { // In case of MTU this method is called also when the MTU hasn't changed, or has changed // to a different (lower) value. Use .with(...) to get the MTU value. }) - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "MTU change not supported")) + .fail((device, status) -> log(Log.WARN, "MTU change not supported")) .enqueue(); // Set notification callback @@ -127,18 +128,18 @@ public class TemplateManager extends BatteryManager { @Override public void onInvalidDataReceived(@NonNull final BluetoothDevice device, @NonNull final Data data) { - log(LogContract.Log.Level.WARNING, "Invalid data received: " + data); + log(Log.WARN, "Invalid data received: " + data); } }); // Enable notifications enableNotifications(mRequiredCharacteristic) // Method called after the data were sent (data will contain 0x0100 in this case) - .with((device, data) -> log(LogContract.Log.Level.DEBUG, "Data sent: " + data)) + .with((device, data) -> log(Log.DEBUG, "Data sent: " + data)) // Method called when the request finished successfully. This will be called after .with(..) callback .done(device -> log(LogContract.Log.Level.APPLICATION, "Notifications enabled successfully")) // Methods called in case of an error, for example when the characteristic does not have Notify property - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to enable notifications")) + .fail((device, status) -> log(Log.WARN, "Failed to enable notifications")) .enqueue(); } @@ -199,7 +200,7 @@ public class TemplateManager extends BatteryManager { final Integer value = data.getIntValue(Data.FORMAT_UINT8, 0); log(LogContract.Log.Level.APPLICATION, "Value '" + value + "' has been read!"); } else { - log(LogContract.Log.Level.WARNING, "Value is empty!"); + log(Log.WARN, "Value is empty!"); } }) .enqueue(); @@ -214,7 +215,7 @@ public class TemplateManager extends BatteryManager { * @param parameter parameter to be written. */ void performAction(final String parameter) { - log(LogContract.Log.Level.VERBOSE, "Changing device name to \"" + parameter + "\""); + log(Log.VERBOSE, "Changing device name to \"" + parameter + "\""); // Write some data to the characteristic. writeCharacteristic(mDeviceNameCharacteristic, Data.from(parameter)) // If data are longer than MTU-3, they will be chunked into multiple packets. @@ -222,12 +223,12 @@ public class TemplateManager extends BatteryManager { .split() // Callback called when data were sent, or added to outgoing queue in case // Write Without Request type was used. - .with((device, data) -> log(LogContract.Log.Level.DEBUG, data.size() + " bytes were sent")) + .with((device, data) -> log(Log.DEBUG, data.size() + " bytes were sent")) // Callback called when data were sent, or added to outgoing queue in case // Write Without Request type was used. This is called after .with(...) callback. .done(device -> log(LogContract.Log.Level.APPLICATION, "Device name set to \"" + parameter + "\"")) // Callback called when write has failed. - .fail((device, status) -> log(LogContract.Log.Level.WARNING, "Failed to change device name")) + .fail((device, status) -> log(Log.WARN, "Failed to change device name")) .enqueue(); } }