fix(android): explicitly set looper for handlers

capacitor-community · May 23, 2021 · 4ebe4fe · 4ebe4fe
1 parent 63237e8
commit 4ebe4fe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/Device.kt b/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/Device.kt
@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import java.util.*
 import kotlin.collections.HashMap
@@ -364,15 +365,15 @@ class Device(
     }
 
     private fun setTimeout(key: String, message: String, timeout: Long = DEFAULT_TIMEOUT) {
-        val handler = Handler()
+        val handler = Handler(Looper.getMainLooper())
         timeoutMap[key] = handler
         handler.postDelayed({
             reject(key, message)
         }, timeout)
     }
 
     private fun setConnectionTimeout(key: String, message: String, gatt: BluetoothGatt?, timeout: Long = CONNECTION_TIMEOUT) {
-        val handler = Handler()
+        val handler = Handler(Looper.getMainLooper())
         timeoutMap[key] = handler
         handler.postDelayed({
             gatt?.disconnect()

diff --git a/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/DeviceScanner.kt b/android/src/main/java/com/capacitorjs/community/plugins/bluetoothle/DeviceScanner.kt
@@ -8,6 +8,7 @@ import android.bluetooth.le.ScanResult
 import android.bluetooth.le.ScanSettings
 import android.content.Context
 import android.os.Handler
+import android.os.Looper
 import android.util.Log
 import android.widget.ArrayAdapter
 import androidx.appcompat.app.AlertDialog
@@ -95,7 +96,7 @@ class DeviceScanner(
             isScanning = true
             bluetoothLeScanner?.startScan(scanFilters, scanSettings, scanCallback)
             if (showDialog) {
-                dialogHandler = Handler()
+                dialogHandler = Handler(Looper.getMainLooper())
                 showDeviceList()
             } else {
                 savedCallback?.invoke(ScanResponse(
@@ -173,7 +174,7 @@ class DeviceScanner(
 
     private fun setTimeoutForStopScanning() {
         if (scanDuration != null) {
-            stopScanHandler = Handler()
+            stopScanHandler = Handler(Looper.getMainLooper())
             stopScanHandler?.postDelayed(
                     {
                         stopScanning()