Filter event id in the DB query for active lives

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/LiveLocationShareAggregatedSummaryEntityQuery.kt

@@ -74,11 +74,13 @@ internal fun LiveLocationShareAggregatedSummaryEntity.Companion.findActiveLiveIn
         realm: Realm,
         roomId: String,
         userId: String,
+        ignoredEventId: String
 ): List<LiveLocationShareAggregatedSummaryEntity> {
     return LiveLocationShareAggregatedSummaryEntity
             .whereRoomId(realm, roomId = roomId)
             .equalTo(LiveLocationShareAggregatedSummaryEntityFields.USER_ID, userId)
             .equalTo(LiveLocationShareAggregatedSummaryEntityFields.IS_ACTIVE, true)
+            .notEqualTo(LiveLocationShareAggregatedSummaryEntityFields.EVENT_ID, ignoredEventId)
             .findAll()
 }
 

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/aggregation/livelocation/LiveLocationAggregationProcessor.kt

@@ -147,9 +147,9 @@ internal class LiveLocationAggregationProcessor @Inject constructor(
                 .findActiveLiveInRoomForUser(
                         realm = realm,
                         roomId = roomId,
-                        userId = userId
+                        userId = userId,
+                        ignoredEventId = currentEventId
                 )
-                .filterNot { it.eventId == currentEventId }
                 .forEach { it.isActive = false }
     }