From b6166fbd331d266eafbee4bd00a0ab56647c0eae Mon Sep 17 00:00:00 2001 From: geeksville Date: Fri, 24 Jan 2020 17:47:32 -0800 Subject: [PATCH] progress on file debug logs --- app/src/main/AndroidManifest.xml | 3 +++ .../main/java/com/geeksville/mesh/MainActivity.kt | 3 ++- .../com/geeksville/mesh/RadioInterfaceService.kt | 14 +++++++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 782380cc9..e14921688 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,6 +24,9 @@ --> + + + diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 8e5f3ef1c..c78198be6 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -57,7 +57,8 @@ class MainActivity : AppCompatActivity(), Logging { Manifest.permission.ACCESS_BACKGROUND_LOCATION, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN, - Manifest.permission.WAKE_LOCK + Manifest.permission.WAKE_LOCK, + Manifest.permission.WRITE_EXTERNAL_STORAGE ) val missingPerms = perms.filter { diff --git a/app/src/main/java/com/geeksville/mesh/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/RadioInterfaceService.kt index 6257bb1ee..8124090de 100644 --- a/app/src/main/java/com/geeksville/mesh/RadioInterfaceService.kt +++ b/app/src/main/java/com/geeksville/mesh/RadioInterfaceService.kt @@ -3,6 +3,7 @@ package com.geeksville.mesh import android.content.Context import android.content.Intent import androidx.core.app.JobIntentService +import com.geeksville.android.DebugLogFile import com.geeksville.android.Logging const val EXTRA_CONNECTED = "$prefix.Connected" @@ -59,6 +60,8 @@ class RadioInterfaceService : JobIntentService(), Logging { } } + val sentPacketsLog = DebugLogFile(this, "sent_log.json") + private fun broadcastReceivedFromRadio(payload: ByteArray) { val intent = Intent(RECEIVE_FROMRADIO_ACTION) intent.putExtra("$prefix.Payload", payload) @@ -73,7 +76,11 @@ class RadioInterfaceService : JobIntentService(), Logging { /// Send a packet/command out the radio link private fun sendToRadio(p: ByteArray) { - info("Simulating sending to radio size=$p.size") + + // For debugging/logging purposes ONLY we convert back into a protobuf for readability + val proto = MeshProtos.ToRadio.parseFrom(p) + info("TODO sending to radio: $proto") + sentPacketsLog.log("FIXME JSON") } // Handle an incoming packet from the radio, broadcasts it as an android intent @@ -81,6 +88,11 @@ class RadioInterfaceService : JobIntentService(), Logging { broadcastReceivedFromRadio(p) } + override fun onDestroy() { + sentPacketsLog.close() + super.onDestroy() + } + override fun onHandleWork(intent: Intent) { // We have received work to do. The system or framework is already // holding a wake lock for us at this point, so we can just go. debug("Executing work: $intent")