filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove some force unwrap

This commit is contained in:
Valere 2021-11-25 15:58:59 +01:00
parent 7fd9ca03be
commit 8bebcc93e7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/OlmMachine.kt
View File

@ -308,13 +308,12 @@ internal class OlmMachine(
} }
val devices = val devices =
DeviceLists( DeviceLists(deviceChanges?.changed.orEmpty(), deviceChanges?.left.orEmpty())
deviceChanges?.changed ?: listOf(), deviceChanges?.left ?: listOf())
val adapter = val adapter =
MoshiProvider.providesMoshi().adapter(ToDeviceSyncResponse::class.java) MoshiProvider.providesMoshi().adapter(ToDeviceSyncResponse::class.java)
val events = adapter.toJson(toDevice ?: ToDeviceSyncResponse())!! val events = toDevice?.let { adapter.toJson(it) } ?: "[]"
adapter.fromJson(inner.receiveSyncChanges(events, devices, counts))!! adapter.fromJson(inner.receiveSyncChanges(events, devices, counts)) ?: ToDeviceSyncResponse()
} }
// We may get cross signing keys over a to-device event, update our listeners. // We may get cross signing keys over a to-device event, update our listeners.
@ -435,13 +434,16 @@ internal class OlmMachine(
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
val adapter = MoshiProvider.providesMoshi().adapter(Event::class.java) val adapter = MoshiProvider.providesMoshi().adapter(Event::class.java)
val serializedEvent = adapter.toJson(event) val serializedEvent = adapter.toJson(event)
try { try {
val decrypted = inner.decryptRoomEvent(serializedEvent, event.roomId!!) if (event.roomId.isNullOrBlank()) {
throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
}
val decrypted = inner.decryptRoomEvent(serializedEvent, event.roomId)
val deserializationAdapter = val deserializationAdapter =
MoshiProvider.providesMoshi().adapter<JsonDict>(Map::class.java) MoshiProvider.providesMoshi().adapter<JsonDict>(Map::class.java)
val clearEvent = deserializationAdapter.fromJson(decrypted.clearEvent)!! val clearEvent = deserializationAdapter.fromJson(decrypted.clearEvent)
?: throw MXCryptoError.Base(MXCryptoError.ErrorType.MISSING_FIELDS, MXCryptoError.MISSING_FIELDS_REASON)
MXEventDecryptionResult( MXEventDecryptionResult(
clearEvent, clearEvent,