fix crashlytics: if user shuts off bluetooth during scan, ignore failure

# Conflicts:
#	app/src/main/java/com/geeksville/mesh/ui/BTScanScreen.kt
1.2-legacy
geeksville 2020-03-12 12:03:40 -07:00
rodzic 3bf285e77f
commit 04720e2f0e
2 zmienionych plików z 4 dodań i 4 usunięć

Wyświetl plik

@ -5,7 +5,6 @@ Work items for soon alpha builds
* make link sharing work
* finish map view
* run services in sim mode on emulator
* track radio brands/regions as a user property (include no-radio as an option)
* show offline nodes as greyed out
* show time since last contact on the node info card
* show pointer arrow on the outside of the user icons, always pointing towoards them
@ -214,3 +213,5 @@ Transition powerFSM transition=Screen-on timeout, from=ON to=DARK
NOTE: no debug messages on device, though we see in radio interface service we are repeatedly reading FromRadio and getting
the same seven bytes. It sure seems like the old service is still sort of alive...
* track radio brands/regions as a user property (include no-radio as an option)

Wyświetl plik

@ -1,10 +1,9 @@
package com.geeksville.mesh
import android.content.Context
import com.google.protobuf.util.JsonFormat
import com.geeksville.mesh.service.RadioInterfaceService
class SimRadio(private val context: Context) {
private val jsonParser = JsonFormat.parser()
/**
* When simulating we parse these MeshPackets as if they arrived at startup
@ -42,7 +41,7 @@ class SimRadio(private val context: Context) {
simInitPackets.forEach { json ->
val fromRadio = MeshProtos.FromRadio.newBuilder().apply {
packet = MeshProtos.MeshPacket.newBuilder().apply {
jsonParser.merge(json, this)
// jsonParser.merge(json, this)
}.build()
}.build()