calvin.erfmann/librepods
1
0
Fork 0
mirror of https://github.com/kavishdevar/librepods.git synced 2026-04-30 18:16:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

android: fix crash on some devices not properly closing socket

Browse Source
This commit is contained in:
Kavish Devar
2026-04-28 12:10:47 +05:30
parent d4ee741224
commit 629b7b917e
1 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
android/app/src/main/java/me/kavishdevar/librepods/services/AirPodsService.kt
View File

@@ -2768,33 +2768,43 @@ class AirPodsService : Service(), SharedPreferences.OnSharedPreferenceChangeList
while (socket.isConnected) { while (socket.isConnected) {
socket.let { it -> socket.let { it ->
val buffer = ByteArray(1024) try {
val bytesRead = it.inputStream.read(buffer) val buffer = ByteArray(1024)
var data: ByteArray val bytesRead = it.inputStream.read(buffer)
if (bytesRead > 0) { var data: ByteArray
data = buffer.copyOfRange(0, bytesRead) if (bytesRead > 0) {
sendBroadcast(Intent(AirPodsNotifications.AIRPODS_DATA).apply { data = buffer.copyOfRange(0, bytesRead)
putExtra("data", buffer.copyOfRange(0, bytesRead)) sendBroadcast(Intent(AirPodsNotifications.AIRPODS_DATA).apply {
setPackage(packageName) putExtra("data", buffer.copyOfRange(0, bytesRead))
}) setPackage(packageName)
val bytes = buffer.copyOfRange(0, bytesRead) })
val formattedHex = bytes.joinToString(" ") { "%02X".format(it) } val bytes = buffer.copyOfRange(0, bytesRead)
val formattedHex = bytes.joinToString(" ") { "%02X".format(it) }
// CrossDevice.sendReceivedPacket(bytes) // CrossDevice.sendReceivedPacket(bytes)
updateNotificationContent( updateNotificationContent(
true, true,
sharedPreferences.getString("name", device.name), sharedPreferences.getString("name", device.name),
batteryNotification.getBattery() batteryNotification.getBattery()
) )
aacpManager.receivePacket(data) aacpManager.receivePacket(data)
if (!isHeadTrackingData(data)) { if (!isHeadTrackingData(data)) {
Log.d("AirPodsData", "Data received: $formattedHex") Log.d("AirPodsData", "Data received: $formattedHex")
logPacket(data, "AirPods") logPacket(data, "AirPods")
}
} else if (bytesRead == -1) {
Log.d("AirPods Service", "Socket closed (bytesRead = -1)")
sendBroadcast(Intent(AirPodsNotifications.AIRPODS_DISCONNECTED).apply {
setPackage(packageName)
})
aacpManager.disconnected()
return@launch
} }
} catch (e: Exception) {
} else if (bytesRead == -1) { Log.w(TAG, "Error reading data, we have probably disconnected.")
Log.d("AirPods Service", "Socket closed (bytesRead = -1)") e.printStackTrace()
sendBroadcast(Intent(AirPodsNotifications.AIRPODS_DISCONNECTED).apply { sendBroadcast(Intent(AirPodsNotifications.AIRPODS_DISCONNECTED).apply {
setPackage(packageName) setPackage(packageName)
}) })