diff --git a/android/app/src/main/java/me/kavishdevar/librepods/utils/LogCollector.kt b/android/app/src/main/java/me/kavishdevar/librepods/utils/LogCollector.kt index 02c9235..d03ca48 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/utils/LogCollector.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/utils/LogCollector.kt @@ -53,12 +53,20 @@ class LogCollector(private val context: Context) { } } + private suspend fun getBluetoothUID(): String? { + val pkgs = listOf("com.android.bluetooth", "com.google.android.bluetooth") + for (pkg in pkgs) { + val uid = executeRootCommand( + "dumpsys package $pkg | grep -m 1 \"uid=\" | sed -E 's/.*uid=([0-9]+).*/\\1/'" + ).trim() + if (uid.isNotEmpty()) return uid + } + return null + } + private suspend fun getPackageUIDs(): Pair { return withContext(Dispatchers.IO) { - val btUid = executeRootCommand("dumpsys package com.android.bluetooth | grep -m 1 \"uid=\" | sed -E 's/.*uid=([0-9]+).*/\\1/'") - .trim() - .takeIf { it.isNotEmpty() } - + val btUid = getBluetoothUID() val appUid = executeRootCommand("dumpsys package me.kavishdevar.librepods | grep -m 1 \"uid=\" | sed -E 's/.*uid=([0-9]+).*/\\1/'") .trim() .takeIf { it.isNotEmpty() }