mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-01 12:42:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mesh service needs to collect on Flow instances

Browse Source
This commit is contained in:
Mike Cumings
2022-05-06 12:17:17 -07:00
parent 0acf037000
commit 7cd1e7fc96
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View File

@@ -39,7 +39,6 @@ import com.google.protobuf.InvalidProtocolBufferException
import dagger.Lazy
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.*
import kotlinx.coroutines.flow.onEach
import kotlinx.serialization.json.Json
import java.util.*
import javax.inject.Inject
@@ -326,14 +325,17 @@ class MeshService : Service(), Logging {
serviceScope.handledLaunch {
loadSettings() // Load our last known node DB
radioInterfaceService.receivedData.onEach(::onReceiveFromRadio)
radioInterfaceService.connectionState.onEach(::onRadioConnectionState)
// We in turn need to use the radiointerface service
radioInterfaceService.connect()
// the rest of our init will happen once we are in radioConnection.onServiceConnected
}
serviceScope.handledLaunch {
radioInterfaceService.connectionState.collect(::onRadioConnectionState)
}
serviceScope.handledLaunch {
radioInterfaceService.receivedData.collect(::onReceiveFromRadio)
}
// the rest of our init will happen once we are in radioConnection.onServiceConnected
}
/**