Skip to content

Commit 0870cec

Browse files
author
Florian Renaud
committed
Remove "with_relations" stable field since the msc is in an unstable state
1 parent dd9fba0 commit 0870cec

File tree

4 files changed

+3
-8
lines changed

4 files changed

+3
-8
lines changed

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/tasks/RedactEventTask.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ internal class DefaultRedactEventTask @Inject constructor(
5656
body = EventRedactBody(
5757
reason = params.reason,
5858
withRelations = withRelations,
59-
withRelationsUnstable = withRelations,
6059
)
6160
)
6261
}

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,6 @@ internal class LocalEchoEventFactory @Inject constructor(
802802
EventRedactBody(
803803
reason = reason,
804804
withRelations = withRelations,
805-
withRelationsUnstable = withRelations,
806805
).toContent().plus(additionalContent.orEmpty())
807806
} else {
808807
additionalContent

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/model/EventRedactBody.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 The Matrix.org Foundation C.I.C.
2+
* Copyright (c) 2023 New Vector Ltd
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -24,9 +24,6 @@ internal data class EventRedactBody(
2424
@Json(name = "reason")
2525
val reason: String? = null,
2626

27-
@Json(name = "with_relations")
28-
val withRelations: List<String>? = null,
29-
3027
@Json(name = "org.matrix.msc3912.with_relations")
31-
val withRelationsUnstable: List<String>? = null,
28+
val withRelations: List<String>? = null,
3229
)

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/queue/QueueMemento.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ internal class QueueMemento @Inject constructor(
118118
eventId = it.redacts,
119119
roomId = it.roomId,
120120
reason = body?.reason,
121-
withRelations = body?.withRelations ?: body?.withRelationsUnstable
121+
withRelations = body?.withRelations,
122122
)
123123
)
124124
}

0 commit comments

Comments
 (0)