Skip to content

Improve deep analysis #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 1, 2025
Merged

Improve deep analysis #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e66c7f
Improve deep analysis
Semper-Viventem Apr 1, 2025
85f39ea
Improve deep analysis
Semper-Viventem Apr 1, 2025
4c07485
Update app version
Semper-Viventem Apr 1, 2025
3f3e5cf
Update app version
Semper-Viventem Apr 1, 2025
d9a43e5
Update app version
Semper-Viventem Apr 1, 2025
b0d29c8
Update app version
Semper-Viventem Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ android {
minSdk = 29
targetSdk = 35

versionCode = 1708536371
versionName = "0.29.1-beta"
versionCode = 1708536372
versionName = "0.29.2-beta"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

Expand Down
83 changes: 65 additions & 18 deletions app/src/main/java/f/cking/software/data/helpers/BleScannerHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,11 @@ class BleScannerHelper(
return callbackFlow {
val services = mutableSetOf<BluetoothGattService>()
val device = requireAdapter().getRemoteDevice(address)
var gatt: BluetoothGatt? = null

val callback = object : BluetoothGattCallback() {
override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
super.onServicesDiscovered(gatt, status)
connections.put(gatt.device.address, gatt)

if (status == BluetoothGatt.GATT_SUCCESS) {
Timber.tag(TAG_CONNECT).d("Services discovered. ${gatt.services.size} services for device $address")
services.addAll(gatt.services.orEmpty())
Expand Down Expand Up @@ -129,49 +128,81 @@ class BleScannerHelper(
}
}

override fun onConnectionStateChange(gatt: BluetoothGatt?, status: Int, newState: Int) {
override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
super.onConnectionStateChange(gatt, status, newState)
checkStatus(newState, gatt, status)
}

private fun checkStatus(newState: Int, gatt: BluetoothGatt?, status: Int) {
private fun checkStatus(newState: Int, gatt: BluetoothGatt, status: Int) {
connections[address] = gatt
when (newState) {
BluetoothProfile.STATE_CONNECTING -> {
Timber.tag(TAG_CONNECT).d("Connecting to device $address")
trySend(DeviceConnectResult.Connecting)
}
BluetoothProfile.STATE_CONNECTED -> {
Timber.tag(TAG_CONNECT).d("Connected to device $address")
trySend(DeviceConnectResult.Connected(gatt!!))
trySend(DeviceConnectResult.Connected(gatt))
}
BluetoothProfile.STATE_DISCONNECTING -> {
Timber.tag(TAG_CONNECT).d("Disconnecting from device $address")
trySend(DeviceConnectResult.Disconnecting)
gatt.close()
}
BluetoothProfile.STATE_DISCONNECTED -> {
Timber.tag(TAG_CONNECT).d("Disconnected from device $address")
if (status == 0x85) {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.MaxGattConnectionsReached)
} else {
trySend(DeviceConnectResult.Disconnected)
}
handleDisconnect(status, gatt)
}
else -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.UnspecifiedConnectionError(gatt, status))
}
}
}

private fun handleDisconnect(status: Int, gatt: BluetoothGatt) {
when (status) {
BluetoothGatt.GATT_SUCCESS -> {
trySend(DeviceConnectResult.Disconnected)
}
CONNECTION_FAILED_TO_ESTABLISH -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedToEstablish(gatt, status))
}
CONNECTION_FAILED_BEFORE_INITIALIZING -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedBeforeInitializing(gatt, status))
}
CONNECTION_TERMINATED -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionTerminated(gatt, status))
}
BluetoothGatt.GATT_CONNECTION_TIMEOUT -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionTimeout(gatt, status))
}
BluetoothGatt.GATT_FAILURE -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError.ConnectionFailedTooManyClients(gatt, status))
}
else -> {
Timber.tag(TAG_CONNECT).e("Error while connecting to device $address. Error code: $status")
trySend(DeviceConnectResult.DisconnectedWithError(status))
false
trySend(DeviceConnectResult.DisconnectedWithError.UnspecifiedConnectionError(gatt, status))
}
}
}
}

Timber.tag(TAG_CONNECT).d("Connecting to device $address")
connections[address] = device.connectGatt(appContext, false, callback)
gatt = device.connectGatt(appContext, false, callback, BluetoothDevice.TRANSPORT_LE)

awaitClose {
Timber.tag(TAG_CONNECT).d("Closing connection to device $address")
closeDeviceConnection(address)
if (requireBluetoothManager().getConnectionState(device, BluetoothProfile.GATT) != BluetoothProfile.STATE_DISCONNECTED) {
gatt.disconnect()
} else {
gatt.close()
}
}
}
}
Expand Down Expand Up @@ -229,8 +260,17 @@ class BleScannerHelper(
data class Connected(val gatt: BluetoothGatt) : DeviceConnectResult
data object Disconnecting : DeviceConnectResult
data object Disconnected : DeviceConnectResult
data class DisconnectedWithError(val errorCode: Int) : DeviceConnectResult
data object MaxGattConnectionsReached : DeviceConnectResult
sealed interface DisconnectedWithError : DeviceConnectResult {
val errorCode: Int
val gatt: BluetoothGatt

class UnspecifiedConnectionError(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
class ConnectionTimeout(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
class ConnectionTerminated(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
class ConnectionFailedToEstablish(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
class ConnectionFailedBeforeInitializing(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
class ConnectionFailedTooManyClients(override val gatt: BluetoothGatt, override val errorCode: Int) : DisconnectedWithError
}
}

fun isBluetoothEnabled(): Boolean {
Expand Down Expand Up @@ -306,10 +346,14 @@ class BleScannerHelper(
}

private fun tryToInitBluetoothScanner() {
bluetoothAdapter = appContext.getSystemService(BluetoothManager::class.java).adapter
bluetoothAdapter = requireBluetoothManager().adapter
bluetoothScanner = bluetoothAdapter?.bluetoothLeScanner
}

private fun requireBluetoothManager(): BluetoothManager {
return appContext.getSystemService(BluetoothManager::class.java)
}

private fun requireScanner(): BluetoothLeScanner {
if (bluetoothScanner == null) {
tryToInitBluetoothScanner()
Expand Down Expand Up @@ -346,5 +390,8 @@ class BleScannerHelper(
companion object {
private const val TAG = "BleScannerHelper"
private const val TAG_CONNECT = "BleScannerHelperConnect"
private const val CONNECTION_FAILED_BEFORE_INITIALIZING = 0x85
private const val CONNECTION_FAILED_TO_ESTABLISH = 0x3E
private const val CONNECTION_TERMINATED = 0x16
}
}
5 changes: 4 additions & 1 deletion app/src/main/java/f/cking/software/domain/interactor/BuildDeviceClassFromSystemInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,10 @@ object BuildDeviceClassFromSystemInfo {
" TV" to DeviceClass.AudioVideo.VideoDisplayAndLoudspeaker,
"TV " to DeviceClass.AudioVideo.VideoDisplayAndLoudspeaker,
"MacBook" to DeviceClass.Computer.Laptop,
"Mac" to DeviceClass.Computer.Desktop,
"iMac" to DeviceClass.Computer.Desktop,
"Macmini" to DeviceClass.Computer.Desktop,
"Mac1" to DeviceClass.Computer.Desktop,
"Mac2" to DeviceClass.Computer.Desktop,
"iPad" to DeviceClass.Phone.Smartphone,
)
}
Loading