From 29d87bffb3f7cbe77906d291e7780a70be2bce96 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 4 Mar 2020 11:16:43 -0800
Subject: [PATCH] analytics tweaks

---
 .../main/java/com/geeksville/mesh/service/MeshService.kt    | 4 ++++
 app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt         | 6 ------
 app/src/main/java/com/geeksville/mesh/ui/Messages.kt        | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
index 74efe56c..72e021a1 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -524,6 +524,8 @@ class MeshService : Service(), Logging {
 
             else -> TODO()
         }
+
+        GeeksvilleApplication.analytics.track("data_receive")
     }
 
     /// Update our DB of users based on someone sending out a User subpacket
@@ -820,6 +822,8 @@ class MeshService : Service(), Logging {
                 sendToRadio(ToRadio.newBuilder().apply {
                     this.packet = packet
                 })
+
+                GeeksvilleApplication.analytics.track("data_send")
             }
 
         override fun getRadioConfig(): ByteArray = toRemoteExceptions {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
index 1d033f00..fdd0f905 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MeshApp.kt
@@ -139,11 +139,6 @@ private fun AppContent(openDrawer: () -> Unit) {
                     }
                 )
 
-                // VerticalScroller breaks flexible layouts - because verticalscrollers have 'infinite' height
-                // VerticalScroller(modifier = LayoutFlexible(1f)) {
-                //if (screen != Screen.settings)
-                //    ScanState.stopScan() // Nasty hack to teardown the bt scanner
-
                 when (screen) {
                     Screen.messages -> MessagesContent()
                     Screen.settings -> SettingsContent()
@@ -151,7 +146,6 @@ private fun AppContent(openDrawer: () -> Unit) {
                     Screen.channel -> ChannelContent()
                     else -> TODO()
                 }
-                //}
             }
         }
     }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
index cb07b731..37504595 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/Messages.kt
@@ -17,7 +17,6 @@ import androidx.ui.material.ProvideEmphasis
 import androidx.ui.text.TextStyle
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
-import com.geeksville.android.GeeksvilleApplication
 import com.geeksville.mesh.model.MessagesState
 import com.geeksville.mesh.model.MessagesState.messages
 import com.geeksville.mesh.model.NodeDB
@@ -106,7 +105,6 @@ fun MessagesContent() {
                 val str = message.value
                 MessagesState.sendMessage(str)
                 message.value = "" // blow away the string the user just entered
-                GeeksvilleApplication.analytics.track("send_text") // track how many times users share channels
             },
             hintText = "Type your message here..."
         )