diff --git a/android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt b/android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt index 9696eb9..2c4a54e 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/MainActivity.kt @@ -131,7 +131,6 @@ import kotlin.io.encoding.ExperimentalEncodingApi lateinit var serviceConnection: ServiceConnection lateinit var connectionStatusReceiver: BroadcastReceiver -@ExperimentalHazeMaterialsApi @ExperimentalMaterial3Api class MainActivity : ComponentActivity() { companion object { @@ -427,7 +426,6 @@ fun Main() { } } -@ExperimentalHazeMaterialsApi @OptIn(ExperimentalPermissionsApi::class, ExperimentalMaterial3Api::class) @Composable fun PermissionsScreen( diff --git a/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt index 34208f9..01f3524 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/screens/AppSettingsScreen.kt @@ -173,16 +173,6 @@ fun AppSettingsScreen(navController: NavController) { mutableStateOf(sharedPreferences.getBoolean("use_alternate_head_tracking_packets", false)) } - val bleOnlyMode = remember { - mutableStateOf(sharedPreferences.getBoolean("ble_only_mode", false)) - } - - LaunchedEffect(Unit) { - if (!sharedPreferences.contains("ble_only_mode")) { - sharedPreferences.edit { putBoolean("ble_only_mode", false) } - } - } - fun validateHexInput(input: String): Boolean { val hexPattern = Regex("^[0-9a-fA-F]{32}$") return hexPattern.matches(input) diff --git a/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt b/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt index b5fe15b..cacf285 100644 --- a/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt +++ b/android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt @@ -427,7 +427,6 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList if (!contains("qs_click_behavior")) putString("qs_click_behavior", "cycle") if (!contains("name")) putString("name", "AirPods") - if (!contains("ble_only_mode")) putBoolean("ble_only_mode", false) if (!contains("left_single_press_action")) putString( "left_single_press_action", @@ -612,7 +611,7 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList } Log.d("AirPodsCrossDevice", CrossDevice.isAvailable.toString()) - if (!CrossDevice.isAvailable && !config.bleOnlyMode) { + if (!CrossDevice.isAvailable) { Log.d("AirPodsService", "${config.deviceName} connected") CoroutineScope(Dispatchers.IO).launch { connectToSocket(device!!) @@ -624,12 +623,6 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList sharedPreferences.edit { putString("mac_address", macAddress) } - } else if (config.bleOnlyMode) { - Log.d("AirPodsService", "BLE-only mode: skipping L2CAP connection") - macAddress = device!!.address - sharedPreferences.edit { - putString("mac_address", macAddress) - } } } else if (intent?.action == AirPodsNotifications.AIRPODS_DISCONNECTED) { device = null @@ -695,7 +688,7 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList if (profile == BluetoothProfile.A2DP) { val connectedDevices = proxy.connectedDevices if (connectedDevices.isNotEmpty()) { - if (!CrossDevice.isAvailable && !config.bleOnlyMode) { + if (!CrossDevice.isAvailable) { CoroutineScope(Dispatchers.IO).launch { connectToSocket(device) } @@ -704,12 +697,6 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList sharedPreferences.edit { putString("mac_address", macAddress) } - } else if (config.bleOnlyMode) { - Log.d("AirPodsService", "BLE-only mode: skipping L2CAP connection") - macAddress = device.address - sharedPreferences.edit { - putString("mac_address", macAddress) - } } this@AirPodsService.sendBroadcast( Intent(AirPodsNotifications.AIRPODS_CONNECTED) @@ -1143,7 +1130,6 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList conversationalAwarenessVolume = sharedPreferences.getInt("conversational_awareness_volume", 43), textColor = sharedPreferences.getLong("textColor", -1L), qsClickBehavior = sharedPreferences.getString("qs_click_behavior", "cycle") ?: "cycle", - bleOnlyMode = sharedPreferences.getBoolean("ble_only_mode", false), // AirPods state-based takeover takeoverWhenDisconnected = sharedPreferences.getBoolean("takeover_when_disconnected", true), @@ -1188,7 +1174,6 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList "conversational_awareness_volume" -> config.conversationalAwarenessVolume = preferences.getInt(key, 43) "textColor" -> config.textColor = preferences.getLong(key, -1L) "qs_click_behavior" -> config.qsClickBehavior = preferences.getString(key, "cycle") ?: "cycle" - "ble_only_mode" -> config.bleOnlyMode = preferences.getBoolean(key, false) // AirPods state-based takeover "takeover_when_disconnected" -> config.takeoverWhenDisconnected = preferences.getBoolean(key, true) @@ -1686,7 +1671,7 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) - if (!::socket.isInitialized && !config.bleOnlyMode) { + if (!::socket.isInitialized) { return } if (connected && (config.bleOnlyMode || socket.isConnected)) {