chore: more code clean up (#293)

Author: ashishb

adbe/adb_enhanced.py

@@ -920,29 +920,35 @@ def get_permission_group(args) -> str | None:
 # Android keeps emptying these groups so that granted permissions are denied
 # but the expectation of this tool is to do the right mapping
 def _get_hardcoded_permissions_for_group(permission_group) -> list[str]:
-    if permission_group == "android.permission-group.CONTACTS":
-        return ["android.permission.READ_CONTACTS", "android.permission.WRITE_CONTACTS"]
-    if permission_group == "android.permission-group.PHONE":
-        return ["android.permission.READ_PHONE_STATE", "android.permission.READ_PHONE_NUMBERS",
-                "android.permission.CALL_PHONE", "android.permission.ANSWER_PHONE_CALLS"]
-    if permission_group == "android.permission-group.CALENDAR":
-        return ["android.permission.READ_CALENDAR", "android.permission.WRITE_CALENDAR"]
-    if permission_group == "android.permission-group.CAMERA":
-        return ["android.permission.CAMERA"]
-    if permission_group == "android.permission-group.SENSORS":
-        return ["android.permission.BODY_SENSORS"]
-    if permission_group == "android.permission-group.LOCATION":
-        return ["android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"]
-    if permission_group == "android.permission-group.STORAGE":
-        return ["android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"]
-    if permission_group == "android.permission-group.MICROPHONE":
-        return ["android.permission.RECORD_AUDIO"]
-    if permission_group == "android.special-permission-group.NOTIFICATIONS":
-        return ["android.permission.POST_NOTIFICATIONS"]
-    if permission_group == "android.permission-group.SMS":
-        return ["android.permission.READ_SMS", "android.permission.RECEIVE_SMS", "android.permission.SEND_SMS"]
-    print_verbose(f"Unexpected permission group: {permission_group}")
-    return []
+    match permission_group:
+        case "android.permission-group.CONTACTS":
+            return ["android.permission.READ_CONTACTS", "android.permission.WRITE_CONTACTS"]
+        case "android.permission-group.PHONE":
+            return [
+                "android.permission.READ_PHONE_STATE",
+                "android.permission.READ_PHONE_NUMBERS",
+                "android.permission.CALL_PHONE",
+                "android.permission.ANSWER_PHONE_CALLS"
+            ]
+        case "android.permission-group.CALENDAR":
+            return ["android.permission.READ_CALENDAR", "android.permission.WRITE_CALENDAR"]
+        case "android.permission-group.CAMERA":
+            return ["android.permission.CAMERA"]
+        case "android.permission-group.SENSORS":
+            return ["android.permission.BODY_SENSORS"]
+        case "android.permission-group.LOCATION":
+            return ["android.permission.ACCESS_FINE_LOCATION", "android.permission.ACCESS_COARSE_LOCATION"]
+        case "android.permission-group.STORAGE":
+            return ["android.permission.READ_EXTERNAL_STORAGE", "android.permission.WRITE_EXTERNAL_STORAGE"]
+        case "android.permission-group.MICROPHONE":
+            return ["android.permission.RECORD_AUDIO"]
+        case "android.special-permission-group.NOTIFICATIONS":
+            return ["android.permission.POST_NOTIFICATIONS"]
+        case "android.permission-group.SMS":
+            return ["android.permission.READ_SMS", "android.permission.RECEIVE_SMS", "android.permission.SEND_SMS"]
+        case _:
+            print_verbose(f"Unexpected permission group: {permission_group}")
+            return []  # Default case if no match found
 
 
 # Pass the full-qualified permission group name to this method.

tests/adbe_tests.py

@@ -171,19 +171,12 @@ def test_permissions_grant_revoke() -> None:
 
 
 # Cache the SDK version after first use
-_sdk_version = None
-
-
+@functools.lru_cache(maxsize=1)
 def _get_device_sdk_version():
-    global _sdk_version
-    # Return the cached value, if available
-    if _sdk_version is not None:
-        return _sdk_version
     stdout_data, _ = _assert_success("devices")
     regex_result = re.search(r"SDK version: ([0-9]+)", stdout_data)
     assert regex_result is not None
-    _sdk_version = int(regex_result.group(1))
-    return _sdk_version
+    return int(regex_result.group(1))
 
 
 def test_apps() -> None: