From 6560546af0f49f795b3f194eba44ecc98c71f289 Mon Sep 17 00:00:00 2001
From: Azalea Gui <me@hydev.org>
Date: Tue, 24 Jan 2023 10:26:26 -0500
Subject: [PATCH] [-] Remove main activity instance

---
 app/src/main/java/org/hydev/wearsync/MainActivity.kt | 6 ------
 app/src/main/java/org/hydev/wearsync/MyService.kt    | 8 +++++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/hydev/wearsync/MainActivity.kt b/app/src/main/java/org/hydev/wearsync/MainActivity.kt
index a3412a8..254a1fd 100644
--- a/app/src/main/java/org/hydev/wearsync/MainActivity.kt
+++ b/app/src/main/java/org/hydev/wearsync/MainActivity.kt
@@ -21,10 +21,6 @@ import java.util.*
 
 class MainActivity : AppCompatActivity()
 {
-    companion object {
-        var instance: MainActivity? = null
-    }
-
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     lateinit var binding: ActivityMainBinding
@@ -62,8 +58,6 @@ class MainActivity : AppCompatActivity()
             NotificationManager.IMPORTANCE_MIN)
         getSysServ<NotificationManager>().createNotificationChannel(chan)
 
-        instance = this
-
         if (!hasPermissions()) permissionCallback.launch(intent<ActivityPermissions>())
         else afterPermissions()
     }
diff --git a/app/src/main/java/org/hydev/wearsync/MyService.kt b/app/src/main/java/org/hydev/wearsync/MyService.kt
index 8786ec0..536f336 100644
--- a/app/src/main/java/org/hydev/wearsync/MyService.kt
+++ b/app/src/main/java/org/hydev/wearsync/MyService.kt
@@ -6,6 +6,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.BatteryManager
 import androidx.core.app.NotificationCompat
 import com.influxdb.client.kotlin.InfluxDBClientKotlin
 import kotlinx.coroutines.CoroutineScope
@@ -22,6 +23,7 @@ import timber.log.Timber
 class MyService : Service()
 {
     private lateinit var influx: InfluxDBClientKotlin
+    private val bm by lazy { getSysServ<BatteryManager>() }
 
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
@@ -47,11 +49,11 @@ class MyService : Service()
         scope.launch {
             channel.consumeAsFlow().collect {
                 try {
-                    MainActivity.instance?.addRecord(it)
+                    println("Adding ${it.javaClass.simpleName} to influxdb")
                     influx add it
                 }
                 catch (e: Exception) {
-                    MainActivity.instance?.addRecord(e)
+                    e.printStackTrace()
                 }
             }
         }
@@ -60,7 +62,7 @@ class MyService : Service()
     private val mBatInfoReceiver: BroadcastReceiver = object : BroadcastReceiver()
     {
         override fun onReceive(ctxt: Context, intent: Intent) {
-            val bi = intent.batteryInfo()
+            val bi = intent.batteryInfo(bm)
             Timber.d("Battery info recorded: $bi")
             scope.launch { influx add bi }
         }