Set GATT MTU before discovering services

HiddenRamblings · Dec 31, 2023 · 73618ce · 73618ce
1 parent 740bc0a
commit 73618ce
Show file tree

Hide file tree

Showing 5 changed files with 10,130 additions and 8,424 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         compileSdk 34
         minSdk 19
         targetSdk 34
-        versionName "4.1.3"
+        versionName "4.1.4"
         versionCode = versionName.replace(".","").toInteger() * 10
 
         vectorDrawables {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -44,6 +44,7 @@
     </queries>
 
     <application
+        android:process=":TagMo"
         android:name=".TagMo"
         android:enableOnBackInvokedCallback="true"
         android:allowBackup="true"
@@ -129,7 +130,8 @@
             android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:launchMode="singleTop" />
         <service
-            android:name=".bluetooth.GattService" />
+            android:name=".bluetooth.GattService"
+            android:process=":TagMo" />
         <receiver
             android:name=".update.UpdateReceiver"
             android:exported="true">

diff --git a/app/src/main/java/com/hiddenramblings/tagmo/bluetooth/GattService.kt b/app/src/main/java/com/hiddenramblings/tagmo/bluetooth/GattService.kt
@@ -443,6 +443,10 @@ class GattService : Service() {
     private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
         override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
             if (newState == BluetoothProfile.STATE_CONNECTED) {
+                if (Version.isLollipop) {
+                    gatt.requestMtu(247) // Nordic
+                    return
+                }
                 mBluetoothGatt?.discoverServices()
             } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
                 listener?.onConnectionLost()
@@ -452,10 +456,6 @@ class GattService : Service() {
         override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
             Debug.verbose(Companion::class.java, "${serviceType.logTag} onServicesDiscovered $status")
             if (status == BluetoothGatt.GATT_SUCCESS) {
-                if (Version.isLollipop) {
-                    gatt.requestMtu(247) // Nordic
-                    return
-                }
                 when (serviceType) {
                     Nordic.DEVICE.BLUUP, Nordic.DEVICE.FLASK, Nordic.DEVICE.SLIDE -> {
                         listener?.onBluupServicesDiscovered()
@@ -475,18 +475,7 @@ class GattService : Service() {
             Debug.verbose(Companion::class.java, "${serviceType.logTag} onMtuChange $mtu $status")
             if (status == BluetoothGatt.GATT_SUCCESS)
                 maxTransmissionUnit = mtu - 3
-            when (serviceType) {
-                Nordic.DEVICE.BLUUP, Nordic.DEVICE.FLASK, Nordic.DEVICE.SLIDE -> {
-                    listener?.onBluupServicesDiscovered()
-                }
-                Nordic.DEVICE.PIXL, Nordic.DEVICE.LOOP, Nordic.DEVICE.LINK -> {
-                    listener?.onPixlServicesDiscovered()
-                }
-                Nordic.DEVICE.PUCK -> {
-                    listener?.onPuckServicesDiscovered()
-                }
-                else -> { }
-            }
+            mBluetoothGatt?.discoverServices()
         }
 
         override fun onCharacteristicRead(