Merge pull request #6 from tyler-pugmire/master

Add support for Samsung devices
Mygod · Aug 26, 2022 · 53043b8 · 53043b8
2 parents 8b49bbf + 8769f34
commit 53043b8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/src/main/java/be/mygod/pogoplusplus/BluetoothPairingService.kt b/app/src/main/java/be/mygod/pogoplusplus/BluetoothPairingService.kt
@@ -34,12 +34,13 @@ class BluetoothPairingService : AccessibilityService() {
             }
             AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED -> {
                 val root = rootInActiveWindow ?: return
-                if (root.findAccessibilityNodeInfosByViewId(
-                        "$PACKAGE_SETTINGS:id/phonebook_sharing_message_confirm_pin").size != 1) return
                 val confirm = root.findAccessibilityNodeInfosByViewId("android:id/button1")
                 if (confirm.size != 1) return
                 val title = root.findAccessibilityNodeInfosByViewId("$PACKAGE_SETTINGS:id/alertTitle")
-                if (title.size != 1 || !title[0].text.contains(BluetoothReceiver.DEVICE_NAME_PGP)) return
+                val message = root.findAccessibilityNodeInfosByViewId("$PACKAGE_SETTINGS:id/message")
+                val titleHasDevice = title.size == 1 && title[0].text.contains(BluetoothReceiver.DEVICE_NAME_PGP)
+                val messageHasDevice = message.size == 1 && message[0].text.contains(BluetoothReceiver.DEVICE_NAME_PGP)
+                if (!titleHasDevice && !messageHasDevice) return
                 confirm[0].performAction(AccessibilityNodeInfo.ACTION_CLICK)
             }
             else -> Timber.e(Exception("Unknown event ${event.eventType}"))