mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-04 22:23:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update to kotlin 1.4

Browse Source
This commit is contained in:
geeksville
2020-08-18 11:25:16 -07:00
parent 4e6c0140dd
commit 9a73da562c
5 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
View File

@@ -218,20 +218,20 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
/// Send a packet/command out the radio link
override fun handleSendToRadio(a: ByteArray) {
override fun handleSendToRadio(p: ByteArray) {
try {
safe?.let { s ->
val uuid = BTM_TORADIO_CHARACTER
debug("queuing ${a.size} bytes to $uuid")
debug("queuing ${p.size} bytes to $uuid")
// Note: we generate a new characteristic each time, because we are about to
// change the data and we want the data stored in the closure
val toRadio = getCharacteristic(uuid)
s.asyncWriteCharacteristic(toRadio, a) { r ->
s.asyncWriteCharacteristic(toRadio, p) { r ->
try {
r.getOrThrow()
debug("write of ${a.size} bytes to $uuid completed")
debug("write of ${p.size} bytes to $uuid completed")
if (isFirstSend) {
isFirstSend = false

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

@@ -36,7 +36,6 @@ import com.google.protobuf.InvalidProtocolBufferException
import kotlinx.coroutines.*
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonConfiguration
import java.util.*
import java.util.concurrent.TimeUnit
import kotlin.math.absoluteValue
@@ -558,8 +557,8 @@ class MeshService : Service(), Logging {
nodeDB = nodeDBbyNodeNum.values.toTypedArray(),
messages = recentDataPackets.toTypedArray()
)
val json = Json(JsonConfiguration.Default)
val asString = json.stringify(SavedSettings.serializer(), settings)
val json = Json { isLenient = true }
val asString = json.encodeToString(SavedSettings.serializer(), settings)
debug("Saving settings")
getPrefs().edit(commit = true) {
// FIXME, not really ideal to store this bigish blob in preferences
@@ -593,8 +592,8 @@ class MeshService : Service(), Logging {
try {
getPrefs().getString("json", null)?.let { asString ->
val json = Json(JsonConfiguration.Default)
val settings = json.parse(SavedSettings.serializer(), asString)
val json = Json { isLenient = true }
val settings = json.decodeFromString(SavedSettings.serializer(), asString)
installNewNodeDB(settings.myInfo, settings.nodeDB)
// Note: we do not haveNodeDB = true because that means we've got a valid db from a real device (rather than this possibly stale hint)
@@ -866,7 +865,11 @@ class MeshService : Service(), Logging {
}
/// Update our DB of users based on someone sending out a Position subpacket
private fun handleReceivedPosition(fromNum: Int, p: MeshProtos.Position, defaultTime: Int = Position.currentTime()) {
private fun handleReceivedPosition(
fromNum: Int,
p: MeshProtos.Position,
defaultTime: Int = Position.currentTime()
) {
updateNodeInfo(fromNum) {
it.position = Position(p)
updateNodeInfoTime(it, defaultTime)