From e1773370d648aa0d062e9371bba67d19cd45318e Mon Sep 17 00:00:00 2001
From: Nedifinita <noxylva@gmail.com>
Date: Sat, 26 Jul 2025 00:52:18 +0800
Subject: [PATCH] fix: simplify device name matching logic

---
 app/build.gradle.kts                          |  4 ++--
 .../java/org/noxylva/lbjconsole/BLEClient.kt  | 19 +------------------
 .../org/noxylva/lbjconsole/MainActivity.kt    |  6 +++---
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 93d9afc..5641752 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "org.noxylva.lbjconsole"
         minSdk = 29
         targetSdk = 35
-        versionCode = 6
-        versionName = "0.0.6"
+        versionCode = 7
+        versionName = "0.0.7"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt b/app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt
index 7dd8e00..d475fea 100644
--- a/app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt
+++ b/app/src/main/java/org/noxylva/lbjconsole/BLEClient.kt
@@ -66,24 +66,7 @@ class BLEClient(private val context: Context) : BluetoothGattCallback() {
                     deviceName != null && deviceName.equals(targetDeviceName, ignoreCase = true)
                 }
                 else -> {
-                    deviceName != null && (
-                        deviceName.contains("LBJ", ignoreCase = true) ||
-                        deviceName.contains("Receiver", ignoreCase = true) ||
-                        deviceName.contains("Train", ignoreCase = true) ||
-                        deviceName.contains("Console", ignoreCase = true) ||
-                        deviceName.contains("ESP", ignoreCase = true) ||
-                        deviceName.contains("Arduino", ignoreCase = true) ||
-                        deviceName.contains("BLE", ignoreCase = true) ||
-                        deviceName.contains("UART", ignoreCase = true) ||
-                        deviceName.contains("Serial", ignoreCase = true)
-                    ) && !(
-                        deviceName.contains("Midea", ignoreCase = true) ||
-                        deviceName.contains("TV", ignoreCase = true) ||
-                        deviceName.contains("Phone", ignoreCase = true) ||
-                        deviceName.contains("Watch", ignoreCase = true) ||
-                        deviceName.contains("Headset", ignoreCase = true) ||
-                        deviceName.contains("Speaker", ignoreCase = true)
-                    )
+                    true
                 }
             }
             
diff --git a/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt b/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt
index c38fef6..82a972b 100644
--- a/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt
+++ b/app/src/main/java/org/noxylva/lbjconsole/MainActivity.kt
@@ -639,10 +639,10 @@ class MainActivity : ComponentActivity() {
         
         bleClient.setAutoReconnect(true)
         
-        val targetDeviceName = if (settingsDeviceName.isNotBlank() && settingsDeviceName != "LBJReceiver") {
+        val targetDeviceName = if (settingsDeviceName.isNotBlank()) {
             settingsDeviceName
         } else {
-            "LBJReceiver"
+            null
         }
         
         Log.d(TAG, "Auto scanning for target device: $targetDeviceName")
@@ -680,7 +680,7 @@ class MainActivity : ComponentActivity() {
         isScanning = true
         foundDevices = emptyList()
         
-        val targetDeviceName = if (settingsDeviceName.isNotBlank() && settingsDeviceName != "LBJReceiver") {
+        val targetDeviceName = if (settingsDeviceName.isNotBlank()) {
             settingsDeviceName
         } else {
             null