fix(android): support non-rooted OnePlus 12 / OxygenOS 16

.github/workflows/ci-android.yml

@@ -33,22 +33,55 @@ jobs:
           distribution: zulu
           java-version: 21
       - uses: gradle/actions/setup-gradle@v4
-      - name: Decode keystore
-        run: echo "${{ secrets.RELEASE_KEYSTORE_FILE }}" | base64 --decode > android/release.keystore
+      - name: Prepare signing config
+        env:
+          RELEASE_KEYSTORE_FILE: ${{ secrets.RELEASE_KEYSTORE_FILE }}
+          RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
+          RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+          RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
+        run: |
+          set -euo pipefail
+
+          store_password="${RELEASE_STORE_PASSWORD:-}"
+          key_alias="${RELEASE_KEY_ALIAS:-}"
+          key_password="${RELEASE_KEY_PASSWORD:-}"
+
+          if [ -n "${RELEASE_KEYSTORE_FILE:-}" ] &&
+             [ -n "$store_password" ] &&
+             [ -n "$key_alias" ] &&
+             [ -n "$key_password" ] &&
+             echo "$RELEASE_KEYSTORE_FILE" | base64 --decode > android/release.keystore &&
+             keytool -list -keystore android/release.keystore -storepass "$store_password" -alias "$key_alias" >/dev/null 2>&1; then
+            echo "Using release signing key from repository secrets"
+          else
+            echo "Release signing secrets are missing or invalid; generating disposable CI signing key"
+            rm -f android/release.keystore
+            store_password="ci-release-password"
+            key_alias="ci-release-key"
+            key_password="ci-release-password"
+            keytool -genkeypair \
+              -keystore android/release.keystore \
+              -storepass "$store_password" \
+              -alias "$key_alias" \
+              -keypass "$key_password" \
+              -keyalg RSA \
+              -keysize 2048 \
+              -validity 10000 \
+              -dname "CN=LibrePods CI, OU=CI, O=LibrePods, L=CI, S=CI, C=US"
+          fi
+
+          cat <<EOF > android/local.properties
+          RELEASE_STORE_FILE=../release.keystore
+          RELEASE_STORE_PASSWORD=$store_password
+          RELEASE_KEY_ALIAS=$key_alias
+          RELEASE_KEY_PASSWORD=$key_password
+          EOF
       - name: Setup Android SDK
         uses: android-actions/setup-android@v3
       - name: Accept Licenses
         run: yes | sdkmanager --licenses
       - name: Install NDK
         run: sdkmanager "ndk;30.0.14904198"
-      - name: Create local.properties
-        run: |
-          cat <<EOF > android/local.properties
-          RELEASE_STORE_FILE=../release.keystore
-          RELEASE_STORE_PASSWORD=${{ secrets.RELEASE_STORE_PASSWORD }}
-          RELEASE_KEY_ALIAS=${{ secrets.RELEASE_KEY_ALIAS }}
-          RELEASE_KEY_PASSWORD=${{ secrets.RELEASE_KEY_PASSWORD }}
-          EOF
       - name: Build
         run: ./gradlew packageReleaseArtifacts
         working-directory: android

.gitignore

@@ -1,3 +1,4 @@
+.worktrees/
 release
 .vscode
 .DS_Store

README.md

@@ -4,7 +4,7 @@
   <img src="https://img.shields.io/github/v/release/kavishdevar/librepods?style=for-the-badge&logoColor=white&label=Release" />
   <img src="https://img.shields.io/github/downloads/kavishdevar/librepods/total?style=for-the-badge&label=Downloads" />
   <img src="https://img.shields.io/github/issues/kavishdevar/librepods?style=for-the-badge" />
-  
+
   <a href="https://discord.gg/HhG4ycVum4">
     <img src="https://img.shields.io/discord/1441416992027574375?style=for-the-badge&logoColor=white&color=5865F2&label=Discord" />
   </a>
@@ -85,6 +85,27 @@ LibrePods **may** require root depending on your device/OS and what features you
 > [!IMPORTANT]
 > This workaround with Xposed is not guaranteed to work on all devices.
 
+### Setup for OxygenOS/ColorOS 16 (Non-rooted)
+
+For multi-device audio switching to work properly on non-rooted OxygenOS 16, you need to inject your phone's Bluetooth MAC address into the app's settings. This is a one-time setup.
+
+> [!IMPORTANT]
+> The `run-as` command only works with **debug builds** (e.g., the nightly APK from CI). If you installed a release build, reinstall with the debug APK first.
+
+1. **Get your phone's Bluetooth MAC address:**
+   - Go to Settings -> About -> Device Details -> Bluetooth Address
+
+2. **Inject the MAC address via adb:**
+   ```bash
+   adb shell "run-as me.kavishdevar.librepods sed -i 's|<string name=\"self_mac_address\"></string>|<string name=\"self_mac_address\">XX:XX:XX:XX:XX:XX</string>|' shared_prefs/settings.xml"
+   ```
+   Replace `XX:XX:XX:XX:XX:XX` with your actual Bluetooth MAC address (e.g., `AC:C0:48:67:E6:EA`)
+
+3. **Restart the app** for the changes to take effect
+
+> [!NOTE]
+> This is needed because non-rooted apps on SDK 36+ cannot access the system's `bluetooth_address` setting. Without this, audio source switching between devices won't work correctly, and the app will lose ANC/transparency control when you switch to another device.
+
 ### Troubleshooting steps for common errors
 - Ensure the correct scope is set in LSPosed/Vector.
 - Ensure there is no root-hiding module preventing the hook from loading on the Bluetooth app.
@@ -114,7 +135,7 @@ Upto two devices can be simultaneously connected to AirPods, for audio and contr
 
 Accessibility settings like customizing transparency mode (amplification, balance, tone, conversation boost, and ambient noise reduction), and loud sound reduction can be configured.
 
-All hearing aid customizations can be done from Android (linux soon), including setting the audiogram result. The app doesn't provide a way to take a hearing test because it requires much more precision. It is much better to use an already available audiogram result. 
+All hearing aid customizations can be done from Android (linux soon), including setting the audiogram result. The app doesn't provide a way to take a hearing test because it requires much more precision. It is much better to use an already available audiogram result.
 
 # Supporters
 

android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt

@@ -74,6 +74,7 @@ import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
@@ -185,14 +186,10 @@ class MainActivity : ComponentActivity() {
 
     override fun onDestroy() {
         try {
-            unbindService(serviceConnection)
-            Log.d("MainActivity", "Unbound service")
-        } catch (e: Exception) {
-            Log.e("MainActivity", "Error while unbinding service: $e")
-        }
-        try {
-            unregisterReceiver(connectionStatusReceiver)
-            Log.d("MainActivity", "Unregistered receiver")
+            if (::connectionStatusReceiver.isInitialized) {
+                unregisterReceiver(connectionStatusReceiver)
+                Log.d("MainActivity", "Unregistered receiver")
+            }
         } catch (e: Exception) {
             Log.e("MainActivity", "Error while unregistering receiver: $e")
         }
@@ -202,14 +199,18 @@ class MainActivity : ComponentActivity() {
 
     override fun onStop() {
         try {
-            unbindService(serviceConnection)
-            Log.d("MainActivity", "Unbound service")
+            if (::serviceConnection.isInitialized) {
+                unbindService(serviceConnection)
+                Log.d("MainActivity", "Unbound service")
+            }
         } catch (e: Exception) {
             Log.e("MainActivity", "Error while unbinding service: $e")
         }
         try {
-            unregisterReceiver(connectionStatusReceiver)
-            Log.d("MainActivity", "Unregistered receiver")
+            if (::connectionStatusReceiver.isInitialized) {
+                unregisterReceiver(connectionStatusReceiver)
+                Log.d("MainActivity", "Unregistered receiver")
+            }
         } catch (e: Exception) {
             Log.e("MainActivity", "Error while unregistering receiver: $e")
         }
@@ -511,7 +512,11 @@ fun Main() {
         canDrawOverlays = Settings.canDrawOverlays(context)
     }
 
-    if (permissionState.allPermissionsGranted && (canDrawOverlays || overlaySkipped.value)) {
+    val bluetoothPermissionsGranted = permissionState.permissions.filter {
+        it.permission.contains("BLUETOOTH") || it.permission.contains("LOCATION")
+    }.all { it.status.isGranted }
+
+    if (bluetoothPermissionsGranted && (canDrawOverlays || overlaySkipped.value)) {
 
         val navController = rememberNavController()
 
@@ -550,7 +555,16 @@ fun Main() {
                         )
                     }) {
                     composable("settings") {
-                        if (airPodsViewModel != null) AirPodsSettingsScreen(airPodsViewModel, navController)
+                        if (airPodsViewModel != null) {
+                            AirPodsSettingsScreen(airPodsViewModel, navController)
+                        } else {
+                            Box(
+                                modifier = Modifier.fillMaxSize(),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                CircularProgressIndicator()
+                            }
+                        }
                     }
                     composable("debug") {
                         DebugScreen(navController = navController)
@@ -692,7 +706,9 @@ fun PermissionsScreen(
 
     val scrollState = rememberScrollState()
 
-    val basicPermissionsGranted = permissionState.permissions.all { it.status.isGranted }
+    val basicPermissionsGranted = permissionState.permissions.filter {
+        it.permission.contains("BLUETOOTH") || it.permission.contains("LOCATION")
+    }.all { it.status.isGranted }
 
     val infiniteTransition = rememberInfiniteTransition(label = "pulse")
     val pulseScale by infiniteTransition.animateFloat(

android/app/src/main/java/me/kavishdevar/librepods/bluetooth/AACPManager.kt

@@ -174,9 +174,9 @@ class AACPManager {
     }
 
     var controlCommandStatusList: MutableList<ControlCommandStatus> =
-        mutableListOf<ControlCommandStatus>()
+        java.util.concurrent.CopyOnWriteArrayList<ControlCommandStatus>()
     var controlCommandListeners: MutableMap<ControlCommandIdentifiers, MutableList<ControlCommandListener>> =
-        mutableMapOf()
+        java.util.concurrent.ConcurrentHashMap<ControlCommandIdentifiers, MutableList<ControlCommandListener>>()
 
     var owns: Boolean = false
         private set
@@ -260,7 +260,7 @@ class AACPManager {
     fun registerControlCommandListener(
         identifier: ControlCommandIdentifiers, callback: ControlCommandListener
     ) {
-        controlCommandListeners.getOrPut(identifier) { mutableListOf() }.add(callback)
+        controlCommandListeners.getOrPut(identifier) { java.util.concurrent.CopyOnWriteArrayList() }.add(callback)
     }
 
     fun unregisterControlCommandListener(