From cdba873abbfe2923b9fd5de0ad936b79876d23ed Mon Sep 17 00:00:00 2001
From: Azalea Gui <me@hydev.org>
Date: Mon, 23 Jan 2023 15:32:05 -0500
Subject: [PATCH] [O] Don't use application context

---
 app/src/main/java/org/hydev/wearsync/ActivityScan.kt  | 11 ++++-------
 .../java/org/hydev/wearsync/bles/BluetoothHandler.kt  |  7 ++-----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/hydev/wearsync/ActivityScan.kt b/app/src/main/java/org/hydev/wearsync/ActivityScan.kt
index 4cd9795..a9640c3 100644
--- a/app/src/main/java/org/hydev/wearsync/ActivityScan.kt
+++ b/app/src/main/java/org/hydev/wearsync/ActivityScan.kt
@@ -46,9 +46,7 @@ class ActivityScan : AppCompatActivity() {
             }
         }
 
-    private val bluetoothManager by lazy {
-        applicationContext.getSystemService(BLUETOOTH_SERVICE) as BluetoothManager
-    }
+    private val bluetoothManager by lazy { getSystemService(BLUETOOTH_SERVICE) as BluetoothManager }
 
     private lateinit var bluetoothHandler: BluetoothHandler
 
@@ -86,7 +84,7 @@ class ActivityScan : AppCompatActivity() {
     @SuppressLint("MissingPermission")
     private fun initBluetoothHandler() {
         if (this::bluetoothHandler.isInitialized) return
-        bluetoothHandler = BluetoothHandler.getInstance(applicationContext)
+        bluetoothHandler = BluetoothHandler.ble(this)
 
         println("OnCreate called, Initializing...")
 
@@ -248,7 +246,7 @@ class ActivityScan : AppCompatActivity() {
     private fun getMissingPermissions(requiredPermissions: Array<String>): Array<String> {
         val missingPermissions: MutableList<String> = ArrayList()
         for (requiredPermission in requiredPermissions) {
-            if (applicationContext.checkSelfPermission(requiredPermission) != PackageManager.PERMISSION_GRANTED) {
+            if (checkSelfPermission(requiredPermission) != PackageManager.PERMISSION_GRANTED) {
                 missingPermissions.add(requiredPermission)
             }
         }
@@ -278,8 +276,7 @@ class ActivityScan : AppCompatActivity() {
     }
 
     private fun areLocationServicesEnabled(): Boolean {
-        val locationManager =
-            applicationContext.getSystemService(LOCATION_SERVICE) as LocationManager
+        val locationManager = getSystemService(LOCATION_SERVICE) as LocationManager
         return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             locationManager.isLocationEnabled
         } else {
diff --git a/app/src/main/java/org/hydev/wearsync/bles/BluetoothHandler.kt b/app/src/main/java/org/hydev/wearsync/bles/BluetoothHandler.kt
index cbef0ee..7f2bf8b 100644
--- a/app/src/main/java/org/hydev/wearsync/bles/BluetoothHandler.kt
+++ b/app/src/main/java/org/hydev/wearsync/bles/BluetoothHandler.kt
@@ -1,6 +1,5 @@
 package org.hydev.wearsync.bles
 
-import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import com.welie.blessed.*
 import kotlinx.coroutines.*
@@ -278,14 +277,12 @@ internal class BluetoothHandler private constructor(context: Context) {
         private val CONTOUR_CLOCK = UUID.fromString("00001026-0002-11E2-9E96-0800200C9A66")
         private var instance: BluetoothHandler? = null
 
-        @JvmStatic
         @Synchronized
-        fun getInstance(context: Context): BluetoothHandler
-        {
+        fun ble(context: Context): BluetoothHandler {
             if (instance == null) {
                 instance = BluetoothHandler(context.applicationContext)
             }
-            return requireNotNull(instance)
+            return instance!!
         }
     }