From 113ccfcc26500b61d6bec13b079278b1edc482dc Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 21 Jun 2023 23:12:31 -0300 Subject: [PATCH] refactor: replace Activity with Context parameter --- .../main/java/com/geeksville/mesh/model/BTScanModel.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt index b461d72b2..a85c56cf4 100644 --- a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt +++ b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt @@ -1,7 +1,6 @@ package com.geeksville.mesh.model import android.annotation.SuppressLint -import android.app.Activity import android.app.Application import android.bluetooth.BluetoothDevice import android.bluetooth.le.* @@ -228,7 +227,7 @@ class BTScanModel @Inject constructor( } private var networkDiscovery: Job? = null - fun startScan(activity: Activity?) { + fun startScan(context: Context?) { _spinner.value = true // Start Network Service Discovery (find TCP devices) @@ -236,7 +235,7 @@ class BTScanModel @Inject constructor( .onEach { addDevice(TCPDeviceListEntry(it)) } .launchIn(viewModelScope) - if (activity != null) startCompanionScan(activity) else startClassicScan() + if (context != null) startCompanionScan(context) else startClassicScan() } @SuppressLint("MissingPermission") @@ -315,9 +314,9 @@ class BTScanModel @Inject constructor( } @SuppressLint("NewApi") - private fun startCompanionScan(activity: Activity) { + private fun startCompanionScan(context: Context) { debug("starting companion scan") - activity.companionDeviceManager?.associate( + context.companionDeviceManager?.associate( associationRequest(), @SuppressLint("NewApi") object : CompanionDeviceManager.Callback() {