20240228: PumpX2 api updates

jwoglom · Mar 24, 2024 · 2de562d · 2de562d
1 parent 96d6a5f
commit 2de562d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        controlx2_version = "1.0.0-20230523"
-        pumpx2_version = "1.3.0"
+        controlx2_version = "1.0.0-20240228"
+        pumpx2_version = "1.3.1"
         use_local_pumpx2 = System.properties.getOrDefault('use_local_pumpx2', 'false') == 'true'
         m2_repository = "${System.properties['user.home']}/.m2/repository"
         compose_version = '1.3.1'

diff --git a/mobile/src/main/java/com/jwoglom/controlx2/CommService.kt b/mobile/src/main/java/com/jwoglom/controlx2/CommService.kt
@@ -113,7 +113,7 @@ class CommService : WearableListenerService(), GoogleApiClient.ConnectionCallbac
         private lateinit var pump: Pump
         private lateinit var tandemBTHandler: TandemBluetoothHandler
 
-        private inner class Pump(var filterToBluetoothMac: Optional<String>) : TandemPump(applicationContext, filterToBluetoothMac) {
+        private inner class Pump(var tandemConfig: TandemConfig) : TandemPump(applicationContext, tandemConfig) {
             private val scope = CoroutineScope(SupervisorJob(parent = supervisorJob) + Dispatchers.IO)
             var lastPeripheral: BluetoothPeripheral? = null
             var isConnected = false
@@ -398,8 +398,9 @@ class CommService : WearableListenerService(), GoogleApiClient.ConnectionCallbac
                         if (msg.obj == null && msg.obj != "") {
                             filterToBluetoothMac = Optional.of(msg.obj as String)
                         }
-                        Timber.i("pumpCommHandler: init_pump_comm: $filterToBluetoothMac")
-                        pump = Pump(filterToBluetoothMac)
+                        Timber.i("pumpCommHandler: init_pump_comm: filterToBluetoothMac=$filterToBluetoothMac")
+                        val cfg = TandemConfig().withFilterToBluetoothMac(filterToBluetoothMac)
+                        pump = Pump(cfg)
                         tandemBTHandler =
                             TandemBluetoothHandler.getInstance(applicationContext, pump, null)
                     } catch (e: SecurityException) {

diff --git a/mobile/src/main/java/com/jwoglom/controlx2/presentation/screens/PumpSetup.kt b/mobile/src/main/java/com/jwoglom/controlx2/presentation/screens/PumpSetup.kt
@@ -54,6 +54,7 @@ import com.jwoglom.controlx2.presentation.components.ServiceDisabledMessage
 import com.jwoglom.controlx2.presentation.navigation.Screen
 import com.jwoglom.controlx2.presentation.theme.ControlX2Theme
 import com.jwoglom.pumpx2.pump.messages.models.PairingCodeType
+import com.jwoglom.pumpx2.pump.messages.response.authentication.CentralChallengeResponse
 import timber.log.Timber
 
 @Composable
@@ -120,7 +121,7 @@ fun PumpSetup(
                             try {
                                 val code = PumpChallengeRequestBuilder.processPairingCode(pairingCodeText, ds.setupPairingCodeType.value)
                                 // sanity check builder
-                                PumpChallengeRequestBuilder.create(0, code, ByteArray(0))
+                                PumpChallengeRequestBuilder.create(CentralChallengeResponse(), code)
                                 sendMessage("/to-phone/set-pairing-code", code.toByteArray())
                                 ds.pumpSetupStage.value = setupStage.value!!.nextStage(PumpSetupStage.WAITING_PUMP_FINDER_CLEANUP)
                             } catch (e: Exception) {
@@ -137,7 +138,7 @@ fun PumpSetup(
                             try {
                                 val code = PumpChallengeRequestBuilder.processPairingCode(pairingCodeText, ds.setupPairingCodeType.value)
                                 // sanity check builder
-                                PumpChallengeRequestBuilder.create(0, code, ByteArray(0))
+                                PumpChallengeRequestBuilder.create(CentralChallengeResponse(), code)
                                 sendMessage("/to-phone/set-pairing-code", code.toByteArray())
                                 ds.pumpSetupStage.value = setupStage.value!!.nextStage(PumpSetupStage.PUMPX2_WAITING_TO_PAIR)
                             } catch (e: Exception) {