Skip to content
Snippets Groups Projects
Commit 88c7d509 authored by Taras's avatar Taras
Browse files

Api changes

parent 661b9511
No related branches found
No related tags found
No related merge requests found
...@@ -277,7 +277,7 @@ internal class OlmMachine @Inject constructor( ...@@ -277,7 +277,7 @@ internal class OlmMachine @Inject constructor(
val events = adapter.toJson(toDevice ?: ToDeviceSyncResponse()) val events = adapter.toJson(toDevice ?: ToDeviceSyncResponse())
// field pass in the list of unused fallback keys here // field pass in the list of unused fallback keys here
val receiveSyncChanges = inner.receiveSyncChanges(events, devices, counts, deviceUnusedFallbackKeyTypes) val receiveSyncChanges = inner.receiveSyncChanges(events, devices, counts, deviceUnusedFallbackKeyTypes,"").toDeviceEvents.toString()
val outAdapter = moshi.adapter<List<Event>>( val outAdapter = moshi.adapter<List<Event>>(
Types.newParameterizedType( Types.newParameterizedType(
......
...@@ -100,7 +100,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData { ...@@ -100,7 +100,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
) )
MigrationData( MigrationData(
account = pickledAccount, account = pickledAccount,
pickleKey = pickleKey.map { it.toUByte() }, pickleKey = pickleKey,
crossSigning = CrossSigningKeyExport( crossSigning = CrossSigningKeyExport(
masterKey = masterKey, masterKey = masterKey,
selfSigningKey = selfSignedKey, selfSigningKey = selfSignedKey,
...@@ -153,7 +153,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData { ...@@ -153,7 +153,7 @@ fun RealmToMigrate.getPickledAccount(pickleKey: ByteArray): MigrationData {
migrationData = MigrationData( migrationData = MigrationData(
account = pickledAccount, account = pickledAccount,
pickleKey = pickleKey.map { it.toUByte() }, pickleKey = pickleKey,
crossSigning = CrossSigningKeyExport( crossSigning = CrossSigningKeyExport(
masterKey = masterKey, masterKey = masterKey,
selfSigningKey = selfSignedKey, selfSigningKey = selfSignedKey,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment