mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-08-28 12:47:43 +00:00
Code Issues Releases Wiki Activity

Simplify regex

Browse Source
This commit is contained in:
Albert Vaca Cintora 2025-01-13 13:24:50 +00:00
parent 818b99774d
commit 7bc90fbe85
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/kde/kdeconnect/DeviceInfo.kt
View File

@ -108,7 +108,7 @@ class DeviceInfo(
isValidDeviceId(getString("deviceId", "")); isValidDeviceId(getString("deviceId", ""));
} }
private val DEVICE_ID_REGEX = "^_?[a-fA-F0-9]{8}_?[a-fA-F0-9]{4}_?[a-fA-F0-9]{4}_?[a-fA-F0-9]{4}_?[a-fA-F0-9]{12}_?\$".toRegex() private val DEVICE_ID_REGEX = "^[a-zA-Z0-9_]{32,38}\$".toRegex()
@JvmStatic @JvmStatic
fun isValidDeviceId(deviceId: String): Boolean = deviceId.matches(DEVICE_ID_REGEX) fun isValidDeviceId(deviceId: String): Boolean = deviceId.matches(DEVICE_ID_REGEX)

7
tests/org/kde/kdeconnect/DeviceTest.kt
View File

@ -144,15 +144,12 @@ class DeviceTest {
@Test @Test
fun testIsValidDeviceId() { fun testIsValidDeviceId() {
Assert.assertTrue(isValidDeviceId("27456E3C_fE5C_4208_96A7_c0CAEEC5E5A0"))
Assert.assertTrue(isValidDeviceId("27456e3c_fe5c_4208_96a7_c0caeec5e5a0")) Assert.assertTrue(isValidDeviceId("27456e3c_fe5c_4208_96a7_c0caeec5e5a0"))
Assert.assertFalse(isValidDeviceId("7456e3c_fe5c_4208_96a7_c0caeec5e5a0"))
Assert.assertFalse(isValidDeviceId("127456e3cfe5c420896a7c0caeec5e5a0"))
Assert.assertTrue(isValidDeviceId("27456e3cfe5c420896a7c0caeec5e5a0")) Assert.assertTrue(isValidDeviceId("27456e3cfe5c420896a7c0caeec5e5a0"))
Assert.assertFalse(isValidDeviceId("7456e3cfe5c420896a7c0caeec5e5a0")) Assert.assertFalse(isValidDeviceId("7456e3cfe5c420896a7c0caeec5e5a0"))
Assert.assertTrue(isValidDeviceId("_27456e3c_fe5c_4208_96a7_c0caeec5e5a0_")) Assert.assertTrue(isValidDeviceId("_27456e3c_fe5c_4208_96a7_c0caeec5e5a0_"))
Assert.assertFalse(isValidDeviceId("_7456e3c_fe5c_4208_96a7_c0caeec5e5a0_")) Assert.assertTrue(isValidDeviceId("z7456e3c_fe5c_4208_96a7_c0caeec5e5a0"))
Assert.assertFalse(isValidDeviceId("_7456e3c_fe5c_4208_96a7_c0caeec_e5a0_"))
Assert.assertFalse(isValidDeviceId("_7456z3c_fe5c_4208_96a7_c0caeec_e5a0_"))
Assert.assertFalse(isValidDeviceId("")) Assert.assertFalse(isValidDeviceId(""))
Assert.assertFalse(isValidDeviceId("______")) Assert.assertFalse(isValidDeviceId("______"))
Assert.assertFalse(isValidDeviceId("____")) Assert.assertFalse(isValidDeviceId("____"))