From 08ea3c0888a70709bf25e81d5d3325f64b005cb6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 21 Jul 2021 14:40:07 +0200 Subject: [PATCH] More useful comment --- .../android/sdk/internal/crypto/CancelGossipRequestWorker.kt | 4 +++- .../android/sdk/internal/crypto/SendGossipRequestWorker.kt | 4 +++- .../matrix/android/sdk/internal/crypto/SendGossipWorker.kt | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt index 26c0403b3f..0ec020bc46 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/CancelGossipRequestWorker.kt @@ -70,7 +70,9 @@ internal class CancelGossipRequestWorker(context: Context, } override suspend fun doSafeWork(params: Params): Result { - // (temporary code) + // params.txnId should be provided in all cases now. But Params can be deserialized by + // the WorkManager from data serialized in a previous version of the application, so without the txnId field. + // So if not present, we create a txnId val txnId = params.txnId ?: createUniqueTxnId() val contentMap = MXUsersDevicesMap() val toDeviceContent = ShareRequestCancellation( diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt index bee18d4c25..2e26720abb 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipRequestWorker.kt @@ -61,7 +61,9 @@ internal class SendGossipRequestWorker(context: Context, } override suspend fun doSafeWork(params: Params): Result { - // (temporary code) + // params.txnId should be provided in all cases now. But Params can be deserialized by + // the WorkManager from data serialized in a previous version of the application, so without the txnId field. + // So if not present, we create a txnId val txnId = params.txnId ?: createUniqueTxnId() val contentMap = MXUsersDevicesMap() val eventType: String diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt index 8c49a6f47f..c5c6d26f79 100644 --- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt +++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/SendGossipWorker.kt @@ -65,7 +65,9 @@ internal class SendGossipWorker(context: Context, } override suspend fun doSafeWork(params: Params): Result { - // (temporary code) + // params.txnId should be provided in all cases now. But Params can be deserialized by + // the WorkManager from data serialized in a previous version of the application, so without the txnId field. + // So if not present, we create a txnId val txnId = params.txnId ?: createUniqueTxnId() val eventType: String = EventType.SEND_SECRET