brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle bluetooth error message correctly

Browse Source
This commit is contained in:
Mygod
2020-06-11 06:24:12 +08:00
parent 2223082841
commit b656b71577
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/vpnhotspot/manage/BluetoothTethering.kt
View File

@@ -19,12 +19,11 @@ import timber.log.Timber
import java.io.IOException
import java.lang.reflect.InvocationTargetException
class BluetoothTethering(context: Context, val stateListener: (Int) -> Unit) :
class BluetoothTethering(context: Context, val stateListener: () -> Unit) :
BluetoothProfile.ServiceListener, AutoCloseable {
companion object : BroadcastReceiver() {
/**
* PAN Profile
* From BluetoothProfile.java.
*/
private const val PAN = 5
private val isTetheringOn by lazy {
@@ -33,7 +32,6 @@ class BluetoothTethering(context: Context, val stateListener: (Int) -> Unit) :
private fun registerBluetoothStateListener(receiver: BroadcastReceiver) =
app.registerReceiver(receiver, IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED))
private val Intent.bluetoothState get() = getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)
private var pendingCallback: TetheringManager.StartTetheringCallback? = null
@@ -42,7 +40,7 @@ class BluetoothTethering(context: Context, val stateListener: (Int) -> Unit) :
*/
@TargetApi(24)
override fun onReceive(context: Context?, intent: Intent?) {
when (intent?.bluetoothState) {
when (intent?.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
BluetoothAdapter.STATE_ON -> try {
TetheringManager.startTethering(TetheringManager.TETHERING_BLUETOOTH, true, pendingCallback!!)
} catch (e: IOException) {
@@ -100,7 +98,7 @@ class BluetoothTethering(context: Context, val stateListener: (Int) -> Unit) :
}
}
private val receiver = broadcastReceiver { _, intent -> stateListener(intent.bluetoothState) }
private val receiver = broadcastReceiver { _, _ -> stateListener() }
init {
try {
@@ -117,6 +115,7 @@ class BluetoothTethering(context: Context, val stateListener: (Int) -> Unit) :
}
override fun onServiceConnected(profile: Int, proxy: BluetoothProfile) {
pan = proxy
stateListener()
}
override fun close() {
app.unregisterReceiver(receiver)