reorder init of system service to avoid use before init issue

pebble-dev · Jan 6, 2025 · 77323c5 · 77323c5
1 parent 7d931cf
commit 77323c5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/domain/common/PebbleDevice.kt b/android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/domain/common/PebbleDevice.kt
@@ -48,6 +48,9 @@ open class PebbleDevice(
 
     val appMessageTransactionSequence = AppMessageTransactionSequence().iterator()
 
+    // Required for the system handler
+    val systemService: SystemService by inject {parametersOf(protocolHandler)}
+
     init {
         // This will init all the handlers by reading the lazy value causing them to be injected
         negotiationScope.launch {
@@ -68,7 +71,6 @@ open class PebbleDevice(
     val appRunStateService: AppRunStateService by inject {parametersOf(protocolHandler)}
     val blobDBService: BlobDBService by inject {parametersOf(protocolHandler)}
     val appMessageService: AppMessageService by inject {parametersOf(protocolHandler)}
-    val systemService: SystemService by inject {parametersOf(protocolHandler)}
     val musicService: MusicService by inject {parametersOf(protocolHandler)}
     val putBytesService: PutBytesService by inject {parametersOf(protocolHandler)}
     val phoneControlService: PhoneControlService by inject {parametersOf(protocolHandler)}