From de3b23fb19256e19c5737fa1d208981411beaf08 Mon Sep 17 00:00:00 2001 From: Aleksander Nowakowski Date: Thu, 15 Sep 2016 11:33:53 +0200 Subject: [PATCH] Debug logging fixed --- .../main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java | 8 +++----- .../java/no/nordicsemi/android/dfu/DfuBaseService.java | 8 +++++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java b/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java index 887dbfc..e3a1efa 100644 --- a/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java +++ b/dfu/src/main/java/no/nordicsemi/android/dfu/BaseDfuImpl.java @@ -48,8 +48,6 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException; /* package */ abstract class BaseDfuImpl implements DfuService { public static final String TAG = "DfuImpl"; - public static final boolean DEBUG = true; // TODO change me to false! - protected static final UUID GENERIC_ATTRIBUTE_SERVICE_UUID = new UUID(0x0000180100001000L, 0x800000805F9B34FBL); protected static final UUID SERVICE_CHANGED_UUID = new UUID(0x00002A0500001000L, 0x800000805F9B34FBL); protected static final UUID CLIENT_CHARACTERISTIC_CONFIG = new UUID(0x0000290200001000L, 0x800000805f9b34fbL); @@ -681,17 +679,17 @@ import no.nordicsemi.android.dfu.internal.exception.UploadAbortedException; } protected void logw(final String message) { - if (DEBUG) + if (DfuBaseService.DEBUG) Log.w(TAG, message); } protected void logi(final String message) { - if (DEBUG) + if (DfuBaseService.DEBUG) Log.i(TAG, message); } protected void logd(final String message) { - if (DEBUG) + if (DfuBaseService.DEBUG) Log.d(TAG, message); } } diff --git a/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java b/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java index ef42abb..46877c7 100644 --- a/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java +++ b/dfu/src/main/java/no/nordicsemi/android/dfu/DfuBaseService.java @@ -91,6 +91,8 @@ import no.nordicsemi.android.error.GattError; public abstract class DfuBaseService extends IntentService implements DfuProgressInfo.ProgressListener { private static final String TAG = "DfuBaseService"; + public static final boolean DEBUG = true; // TODO change me to false! + public static final int NOTIFICATION_ID = 283; // a random number /** @@ -1447,17 +1449,17 @@ public abstract class DfuBaseService extends IntentService implements DfuProgres } private void logw(final String message) { -// if (BuildConfig.DEBUG) // TODO + if (DfuBaseService.DEBUG) Log.w(TAG, message); } private void logi(final String message) { -// if (BuildConfig.DEBUG) + if (DfuBaseService.DEBUG) Log.i(TAG, message); } private void logd(final String message) { -// if (BuildConfig.DEBUG) + if (DfuBaseService.DEBUG) Log.d(TAG, message); } }