From d627d0c1fff254c8f1585ae101345e88b1a15600 Mon Sep 17 00:00:00 2001 From: Anton Weber <anton@antweb.me> Date: Thu, 22 Aug 2019 15:03:48 +0200 Subject: [PATCH] LowEfforService: Move logging to ConnectionService. --- .../ccc/events/badge/card10/common/ConnectionService.kt | 8 +++++++- .../events/badge/card10/filetransfer/LowEffortService.kt | 8 +------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt b/app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt index 6051251..eb7f58e 100644 --- a/app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt +++ b/app/src/main/java/de/ccc/events/badge/card10/common/ConnectionService.kt @@ -165,7 +165,13 @@ object ConnectionService { } fun writeCharacteristic(characteristic: BluetoothGattCharacteristic): Boolean { - return connection?.writeCharacteristic(characteristic) ?: false + val status = connection?.writeCharacteristic(characteristic) ?: false + + if (!status) { + Log.d(TAG, "Write status: $status") + } + + return status } } \ No newline at end of file diff --git a/app/src/main/java/de/ccc/events/badge/card10/filetransfer/LowEffortService.kt b/app/src/main/java/de/ccc/events/badge/card10/filetransfer/LowEffortService.kt index c77e23c..560de67 100644 --- a/app/src/main/java/de/ccc/events/badge/card10/filetransfer/LowEffortService.kt +++ b/app/src/main/java/de/ccc/events/badge/card10/filetransfer/LowEffortService.kt @@ -80,13 +80,7 @@ class LowEffortService( val bytes = packet.getBytes() centralTx.value = bytes - val status = ConnectionService.writeCharacteristic(centralTx) - - if (!status) { - Log.d(TAG, "Write status: $status") - } - - return status + return ConnectionService.writeCharacteristic(centralTx) } fun setOnPacketReceivedListener(packetListener: OnPacketReceivedListener) { -- GitLab