permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 12:25:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

variable mtu clientside fix

Browse Source
This commit is contained in:
callebtc
2025-07-09 21:39:12 +02:00
parent 90750c2635
commit 3c0d145406
1 changed files with 56 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/mesh/BluetoothConnectionManager.kt
+54 -66
View File
@@ -676,64 +676,64 @@ class BluetoothConnectionManager(
val deviceAddress = device.address val deviceAddress = device.address
val gattCallback = object : BluetoothGattCallback() { val gattCallback = object : BluetoothGattCallback() {
override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) { override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
// FIXED: Enhanced error logging to diagnose connection failures
Log.d(TAG, "Client: Connection state change - Device: $deviceAddress, Status: $status, NewState: $newState") Log.d(TAG, "Client: Connection state change - Device: $deviceAddress, Status: $status, NewState: $newState")
when (newState) { if (newState == BluetoothProfile.STATE_CONNECTED && status == BluetoothGatt.GATT_SUCCESS) {
BluetoothProfile.STATE_CONNECTED -> { Log.i(TAG, "Client: Successfully connected to $deviceAddress. Requesting MTU...")
if (status == BluetoothGatt.GATT_SUCCESS) { // FIX: Request a larger MTU. Must be done before any data transfer.
Log.i(TAG, "Client: Successfully connected to $deviceAddress") // 517 is the maximum supported MTU size on Android.
val deviceConn = DeviceConnection( connectionScope.launch {
device = device, delay(200) // A small delay can improve reliability of MTU request.
gatt = gatt, gatt.requestMtu(517)
rssi = rssi, }
isClient = true } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
) if (status != BluetoothGatt.GATT_SUCCESS) {
connectedDevices[deviceAddress] = deviceConn Log.w(TAG, "Client: Disconnected from $deviceAddress with error status $status")
pendingConnections.remove(deviceAddress) if (status == 147) {
Log.e(TAG, "Client: Connection establishment failed (status 147) for $deviceAddress")
}
} else {
Log.d(TAG, "Client: Cleanly disconnected from $deviceAddress")
}
connectionScope.launch { cleanupDeviceConnection(deviceAddress)
delay(500) // FIXED: Increased delay for better stability
Log.d(TAG, "Starting service discovery for $deviceAddress") connectionScope.launch {
gatt.discoverServices() delay(CLEANUP_DELAY)
} try {
} else { gatt.close()
Log.w(TAG, "Client: Connection failed to $deviceAddress with status $status") } catch (e: Exception) {
// CRITICAL FIX: Clean up failed connection attempt immediately Log.w(TAG, "Error closing GATT: ${e.message}")
pendingConnections.remove(deviceAddress)
gatt.disconnect()
} }
} }
BluetoothProfile.STATE_CONNECTING -> { }
Log.d(TAG, "Client: Connecting to $deviceAddress...") }
}
BluetoothProfile.STATE_DISCONNECTING -> {
Log.d(TAG, "Client: Disconnecting from $deviceAddress...")
}
BluetoothProfile.STATE_DISCONNECTED -> {
if (status != BluetoothGatt.GATT_SUCCESS) {
Log.w(TAG, "Client: Disconnected from $deviceAddress with error status $status")
// Special handling for connection establishment failure (status 147)
if (status == 147) {
Log.e(TAG, "Client: Connection establishment failed (status 147) for $deviceAddress - likely due to device compatibility or timing issues")
}
} else {
Log.d(TAG, "Client: Cleanly disconnected from $deviceAddress")
}
cleanupDeviceConnection(deviceAddress) override fun onMtuChanged(gatt: BluetoothGatt, mtu: Int, status: Int) {
val deviceAddress = gatt.device.address
Log.i(TAG, "Client: MTU changed for $deviceAddress to $mtu with status $status")
connectionScope.launch { if (status == BluetoothGatt.GATT_SUCCESS) {
delay(CLEANUP_DELAY) Log.i(TAG, "MTU successfully negotiated for $deviceAddress. Discovering services.")
try {
gatt.close() // Now that MTU is set, connection is fully ready.
} catch (e: Exception) { val deviceConn = DeviceConnection(
Log.w(TAG, "Error closing GATT: ${e.message}") device = gatt.device,
} gatt = gatt,
} rssi = rssi,
} isClient = true
)
connectedDevices[deviceAddress] = deviceConn
pendingConnections.remove(deviceAddress)
// Start service discovery only AFTER MTU is set.
gatt.discoverServices()
} else {
Log.w(TAG, "MTU negotiation failed for $deviceAddress with status: $status. Disconnecting.")
pendingConnections.remove(deviceAddress)
gatt.disconnect()
} }
} }
@@ -742,35 +742,23 @@ class BluetoothConnectionManager(
if (status == BluetoothGatt.GATT_SUCCESS) { if (status == BluetoothGatt.GATT_SUCCESS) {
val service = gatt.getService(SERVICE_UUID) val service = gatt.getService(SERVICE_UUID)
Log.d(TAG, "Client: Service found: ${service != null} for $deviceAddress")
if (service != null) { if (service != null) {
val characteristic = service.getCharacteristic(CHARACTERISTIC_UUID) val characteristic = service.getCharacteristic(CHARACTERISTIC_UUID)
Log.d(TAG, "Client: Characteristic found: ${characteristic != null} for $deviceAddress")
if (characteristic != null) { if (characteristic != null) {
// Update device connection with characteristic
connectedDevices[deviceAddress]?.let { deviceConn -> connectedDevices[deviceAddress]?.let { deviceConn ->
val updatedConn = deviceConn.copy(characteristic = characteristic) val updatedConn = deviceConn.copy(characteristic = characteristic)
connectedDevices[deviceAddress] = updatedConn connectedDevices[deviceAddress] = updatedConn
Log.d(TAG, "Client: Updated device connection with characteristic for $deviceAddress") Log.d(TAG, "Client: Updated device connection with characteristic for $deviceAddress")
} }
// Enable notifications gatt.setCharacteristicNotification(characteristic, true)
val notificationEnabled = gatt.setCharacteristicNotification(characteristic, true) val descriptor = characteristic.getDescriptor(UUID.fromString("00002902-0000-1000-8000-00805f9b34fb"))
Log.d(TAG, "Client: Notification enabled: $notificationEnabled for $deviceAddress")
val descriptor = characteristic.getDescriptor(
UUID.fromString("00002902-0000-1000-8000-00805f9b34fb")
)
if (descriptor != null) { if (descriptor != null) {
descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
val descriptorWritten = gatt.writeDescriptor(descriptor) gatt.writeDescriptor(descriptor)
Log.d(TAG, "Client: Descriptor write initiated: $descriptorWritten for $deviceAddress")
connectionScope.launch { connectionScope.launch {
delay(200) // Wait for descriptor write to complete delay(200)
Log.i(TAG, "Client: Connection setup complete for $deviceAddress") Log.i(TAG, "Client: Connection setup complete for $deviceAddress")
delegate?.onDeviceConnected(device) delegate?.onDeviceConnected(device)
} }