Merge pull request #7752 from vector-im/fix/mna/wrong-usage-of-stable-fields

mnaturel · web-flow · commit dba8aaea1651 · 2022-12-09T17:32:53.000+01:00
Revert usage of stable fields in live location sharing and polls
diff --git a/changelog.d/7751.bugfix b/changelog.d/7751.bugfix
@@ -0,0 +1 @@
+Revert usage of stable fields in live location sharing and polls
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StartLiveLocationShareTask.kt
@@ -46,7 +46,7 @@ internal class DefaultStartLiveLocationShareTask @Inject constructor(
                 isLive = true,
                 unstableTimestampMillis = clock.epochMillis()
         ).toContent()
-        val eventType = EventType.STATE_ROOM_BEACON_INFO.stable
+        val eventType = EventType.STATE_ROOM_BEACON_INFO.unstable
         val sendStateTaskParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = userId,
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/location/StopLiveLocationShareTask.kt
@@ -45,7 +45,7 @@ internal class DefaultStopLiveLocationShareTask @Inject constructor(
         val sendStateTaskParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = stateKey,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.stable,
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = updatedContent
         )
         return try {
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -181,7 +181,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_START.stable,
+                type = EventType.POLL_START.unstable,
                 content = newContent.toContent().plus(additionalContent.orEmpty())
         )
     }
@@ -206,7 +206,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_RESPONSE.stable,
+                type = EventType.POLL_RESPONSE.unstable,
                 content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
@@ -226,7 +226,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_START.stable,
+                type = EventType.POLL_START.unstable,
                 content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
@@ -249,7 +249,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.POLL_END.stable,
+                type = EventType.POLL_END.unstable,
                 content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
@@ -300,7 +300,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 originServerTs = dummyOriginServerTs(),
                 senderId = userId,
                 eventId = localId,
-                type = EventType.BEACON_LOCATION_DATA.stable,
+                type = EventType.BEACON_LOCATION_DATA.unstable,
                 content = content.toContent().plus(additionalContent.orEmpty()),
                 unsignedData = UnsignedData(age = null, transactionId = localId)
         )
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/aggregation/poll/PollEventsTestData.kt
@@ -87,7 +87,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_START_EVENT = Event(
-            type = EventType.POLL_START.stable,
+            type = EventType.POLL_START.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
@@ -96,7 +96,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_RESPONSE_EVENT = Event(
-            type = EventType.POLL_RESPONSE.stable,
+            type = EventType.POLL_RESPONSE.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
@@ -105,7 +105,7 @@ object PollEventsTestData {
     )
 
     internal val A_POLL_END_EVENT = Event(
-            type = EventType.POLL_END.stable,
+            type = EventType.POLL_END.unstable,
             eventId = AN_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_USER_ID_1,
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultGetActiveBeaconInfoForUserTaskTest.kt
@@ -69,7 +69,7 @@ class DefaultGetActiveBeaconInfoForUserTaskTest {
         result shouldBeEqualTo currentStateEvent
         fakeStateEventDataSource.verifyGetStateEvent(
                 roomId = params.roomId,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.stable,
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 stateKey = QueryStringValue.Equals(A_USER_ID)
         )
     }
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStartLiveLocationShareTaskTest.kt
@@ -75,7 +75,7 @@ internal class DefaultStartLiveLocationShareTaskTest {
         val expectedParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = A_USER_ID,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.stable,
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = expectedBeaconContent
         )
         fakeSendStateTask.verifyExecuteRetry(
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/DefaultStopLiveLocationShareTaskTest.kt
@@ -79,7 +79,7 @@ class DefaultStopLiveLocationShareTaskTest {
         val expectedSendParams = SendStateTask.Params(
                 roomId = params.roomId,
                 stateKey = A_USER_ID,
-                eventType = EventType.STATE_ROOM_BEACON_INFO.stable,
+                eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,
                 body = expectedBeaconContent
         )
         fakeSendStateTask.verifyExecuteRetry(
diff --git a/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt b/matrix-sdk-android/src/test/java/org/matrix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessorTest.kt
@@ -79,7 +79,7 @@ class LiveLocationShareRedactionEventProcessorTest {
     @Test
     fun `given a redacted live location share event when processing it then related summaries are deleted from database`() = runTest {
         val event = Event(eventId = AN_EVENT_ID, redacts = A_REDACTED_EVENT_ID)
-        val redactedEventEntity = EventEntity(eventId = A_REDACTED_EVENT_ID, type = EventType.STATE_ROOM_BEACON_INFO.stable)
+        val redactedEventEntity = EventEntity(eventId = A_REDACTED_EVENT_ID, type = EventType.STATE_ROOM_BEACON_INFO.unstable)
         fakeRealm.givenWhere<EventEntity>()
                 .givenEqualTo(EventEntityFields.EVENT_ID, A_REDACTED_EVENT_ID)
                 .givenFindFirst(redactedEventEntity)
diff --git a/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
@@ -63,7 +63,7 @@ object FakeCreatePollViewStates {
     )
 
     private val A_POLL_START_EVENT = Event(
-            type = EventType.POLL_START.stable,
+            type = EventType.POLL_START.unstable,
             eventId = A_FAKE_EVENT_ID,
             originServerTs = 1652435922563,
             senderId = A_FAKE_USER_ID,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Revert usage of stable fields in live location sharing and polls`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ internal class DefaultStopLiveLocationShareTask @Inject constructor(`
`45`	`45`	`val sendStateTaskParams = SendStateTask.Params(`
`46`	`46`	`roomId = params.roomId,`
`47`	`47`	`stateKey = stateKey,`
`48`		`- eventType = EventType.STATE_ROOM_BEACON_INFO.stable,`
	`48`	`+ eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,`
`49`	`49`	`body = updatedContent`
`50`	`50`	`)`
`51`	`51`	`return try {`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class DefaultGetActiveBeaconInfoForUserTaskTest {`
`69`	`69`	`result shouldBeEqualTo currentStateEvent`
`70`	`70`	`fakeStateEventDataSource.verifyGetStateEvent(`
`71`	`71`	`roomId = params.roomId,`
`72`		`- eventType = EventType.STATE_ROOM_BEACON_INFO.stable,`
	`72`	`+ eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,`
`73`	`73`	`stateKey = QueryStringValue.Equals(A_USER_ID)`
`74`	`74`	`)`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ internal class DefaultStartLiveLocationShareTaskTest {`
`75`	`75`	`val expectedParams = SendStateTask.Params(`
`76`	`76`	`roomId = params.roomId,`
`77`	`77`	`stateKey = A_USER_ID,`
`78`		`- eventType = EventType.STATE_ROOM_BEACON_INFO.stable,`
	`78`	`+ eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,`
`79`	`79`	`body = expectedBeaconContent`
`80`	`80`	`)`
`81`	`81`	`fakeSendStateTask.verifyExecuteRetry(`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ class DefaultStopLiveLocationShareTaskTest {`
`79`	`79`	`val expectedSendParams = SendStateTask.Params(`
`80`	`80`	`roomId = params.roomId,`
`81`	`81`	`stateKey = A_USER_ID,`
`82`		`- eventType = EventType.STATE_ROOM_BEACON_INFO.stable,`
	`82`	`+ eventType = EventType.STATE_ROOM_BEACON_INFO.unstable,`
`83`	`83`	`body = expectedBeaconContent`
`84`	`84`	`)`
`85`	`85`	`fakeSendStateTask.verifyExecuteRetry(`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ object FakeCreatePollViewStates {`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`private val A_POLL_START_EVENT = Event(`
`66`		`- type = EventType.POLL_START.stable,`
	`66`	`+ type = EventType.POLL_START.unstable,`
`67`	`67`	`eventId = A_FAKE_EVENT_ID,`
`68`	`68`	`originServerTs = 1652435922563,`
`69`	`69`	`senderId = A_FAKE_USER_ID,`