From 2b982dd34968f712e2dad66c83c86a398fa56f69 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 25 Dec 2018 16:26:18 +0800 Subject: [PATCH] Do not store redundant copy of bluetooth adapter --- .../java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt index b858ef78..33901b60 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt @@ -19,19 +19,19 @@ class BluetoothTethering(context: Context) : BluetoothProfile.ServiceListener, A } } - private val adapter = BluetoothAdapter.getDefaultAdapter() private var pan: BluetoothProfile? = null /** * Based on: https://android.googlesource.com/platform/packages/apps/Settings/+/78d5efd/src/com/android/settings/TetherSettings.java */ val active: Boolean? get() { val pan = pan ?: return null - return adapter?.state == BluetoothAdapter.STATE_ON && isTetheringOn.invoke(pan) as Boolean + return BluetoothAdapter.getDefaultAdapter()?.state == BluetoothAdapter.STATE_ON && + isTetheringOn.invoke(pan) as Boolean } init { try { - adapter?.getProfileProxy(context, this, PAN) + BluetoothAdapter.getDefaultAdapter()?.getProfileProxy(context, this, PAN) } catch (e: SecurityException) { Timber.w(e) SmartSnackbar.make(e).show() @@ -45,7 +45,7 @@ class BluetoothTethering(context: Context) : BluetoothProfile.ServiceListener, A pan = proxy } override fun close() { - adapter?.closeProfileProxy(PAN, pan) + BluetoothAdapter.getDefaultAdapter()?.closeProfileProxy(PAN, pan) pan = null } }