Skip to content

Commit c366201

Browse files
authored
Fix sendAppMessage erroring out on timeout (#147)
* Fix sendAppMessage erroring out on timeout * Remove unused imports
1 parent 64a4241 commit c366201

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/services/appmessage/AppMessageService.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,17 @@ import io.rebble.libpebblecommon.packets.AppCustomizationSetStockAppTitleMessage
99
import io.rebble.libpebblecommon.packets.AppMessage
1010
import io.rebble.libpebblecommon.packets.AppMessageTuple
1111
import io.rebble.libpebblecommon.services.ProtocolService
12-
import kotlinx.coroutines.CompletableDeferred
1312
import kotlinx.coroutines.async
1413
import kotlinx.coroutines.channels.Channel
1514
import kotlinx.coroutines.flow.Flow
1615
import kotlinx.coroutines.flow.asFlow
17-
import kotlinx.coroutines.flow.filter
1816
import kotlinx.coroutines.flow.first
1917
import kotlinx.coroutines.flow.flatMapConcat
2018
import kotlinx.coroutines.flow.launchIn
2119
import kotlinx.coroutines.flow.onEach
2220
import kotlinx.coroutines.flow.receiveAsFlow
2321
import kotlinx.coroutines.sync.Mutex
2422
import kotlinx.coroutines.sync.withLock
25-
import kotlinx.coroutines.withTimeout
2623
import kotlinx.coroutines.withTimeoutOrNull
2724
import kotlin.time.Duration.Companion.seconds
2825
import kotlin.uuid.Uuid
@@ -66,7 +63,7 @@ class AppMessageService(
6663
}
6764
} ?: run {
6865
logger.w { "Timed out sending AppMessage ${appMessageData.transactionId}" }
69-
AppMessageResult.NACK(appMessageData.transactionId)
66+
AppMessage.AppMessageNACK(appMessageData.transactionId)
7067
}
7168
}
7269
protocolHandler.send(appMessage)

0 commit comments

Comments
 (0)