Merge pull request #218 from ouchadam/bug/dendrite-infinite-login

Fix dendrite failing to fully login
ouchadam · Oct 22, 2022 · f7f4c89 · f7f4c89
2 parents 82f2eea + 4bd75f1
commit f7f4c89
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt b/...services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/request/ApiSyncResponse.kt
@@ -13,7 +13,7 @@ internal data class ApiSyncResponse(
     @SerialName("account_data") val accountData: ApiAccountData? = null,
     @SerialName("rooms") val rooms: ApiSyncRooms? = null,
     @SerialName("to_device") val toDevice: ToDevice? = null,
-    @SerialName("device_one_time_keys_count") val oneTimeKeysCount: Map<String, ServerKeyCount>,
+    @SerialName("device_one_time_keys_count") val oneTimeKeysCount: Map<String, ServerKeyCount>? = null,
     @SerialName("next_batch") val nextBatch: SyncToken,
     @SerialName("prev_batch") val prevBatch: SyncToken? = null,
 )

diff --git a/...ix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/room/SyncSideEffects.kt b/...ix/services/sync/src/main/kotlin/app/dapk/st/matrix/sync/internal/room/SyncSideEffects.kt
@@ -28,7 +28,7 @@ internal class SyncSideEffects(
                 notifyDevicesUpdated.notifyChanges(it, requestToken)
             }
 
-            oneTimeKeyProducer.onServerKeyCount(response.oneTimeKeysCount["signed_curve25519"] ?: ServerKeyCount(0))
+            oneTimeKeyProducer.onServerKeyCount(response.oneTimeKeysCount?.get("signed_curve25519") ?: ServerKeyCount(0))
 
             val decryptedToDeviceEvents = decryptedToDeviceEvents(response)
             val roomKeys = handleRoomKeyShares(decryptedToDeviceEvents)