-
Notifications
You must be signed in to change notification settings - Fork 759
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6486 from vector-im/feature/mna/delete-lls
[Location sharing] - Delete action on a live message (PSG-523)
- Loading branch information
Showing
41 changed files
with
1,059 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [Location sharing] - Delete action on a live message |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
...d/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo033.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /* | ||
| * Copyright (c) 2022 The Matrix.org Foundation C.I.C. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.database.migration | ||
|
|
||
| import io.realm.DynamicRealm | ||
| import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntityFields | ||
| import org.matrix.android.sdk.internal.util.database.RealmMigrator | ||
|
|
||
| /** | ||
| * Migrating to: | ||
| * Live location sharing aggregated summary: adding new field relatedEventIds. | ||
| */ | ||
| internal class MigrateSessionTo033(realm: DynamicRealm) : RealmMigrator(realm, 33) { | ||
|
|
||
| override fun doMigrate(realm: DynamicRealm) { | ||
| realm.schema.get("LiveLocationShareAggregatedSummaryEntity") | ||
| ?.addRealmListField(LiveLocationShareAggregatedSummaryEntityFields.RELATED_EVENT_IDS.`$`, String::class.java) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...ix/android/sdk/internal/session/room/location/LiveLocationShareRedactionEventProcessor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.matrix.android.sdk.internal.session.room.location | ||
|
|
||
| import io.realm.Realm | ||
| import org.matrix.android.sdk.api.session.events.model.Event | ||
| import org.matrix.android.sdk.api.session.events.model.EventType | ||
| import org.matrix.android.sdk.api.session.events.model.LocalEcho | ||
| import org.matrix.android.sdk.internal.database.model.EventAnnotationsSummaryEntity | ||
| import org.matrix.android.sdk.internal.database.model.EventEntity | ||
| import org.matrix.android.sdk.internal.database.model.EventInsertType | ||
| import org.matrix.android.sdk.internal.database.model.livelocation.LiveLocationShareAggregatedSummaryEntity | ||
| import org.matrix.android.sdk.internal.database.query.get | ||
| import org.matrix.android.sdk.internal.database.query.where | ||
| import org.matrix.android.sdk.internal.session.EventInsertLiveProcessor | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * Listens to the database for the insertion of any redaction event. | ||
| * Delete specifically the aggregated summary related to a redacted live location share event. | ||
| */ | ||
| internal class LiveLocationShareRedactionEventProcessor @Inject constructor() : EventInsertLiveProcessor { | ||
|
|
||
| override fun shouldProcess(eventId: String, eventType: String, insertType: EventInsertType): Boolean { | ||
| return eventType == EventType.REDACTION && insertType != EventInsertType.LOCAL_ECHO | ||
| } | ||
|
|
||
| override suspend fun process(realm: Realm, event: Event) { | ||
| if (event.redacts.isNullOrBlank() || LocalEcho.isLocalEchoId(event.eventId.orEmpty())) { | ||
| return | ||
| } | ||
|
|
||
| val redactedEvent = EventEntity.where(realm, eventId = event.redacts).findFirst() | ||
| ?: return | ||
|
|
||
| if (redactedEvent.type in EventType.STATE_ROOM_BEACON_INFO) { | ||
| val liveSummary = LiveLocationShareAggregatedSummaryEntity.get(realm, eventId = redactedEvent.eventId) | ||
|
|
||
| if (liveSummary != null) { | ||
| Timber.d("deleting live summary with id: ${liveSummary.eventId}") | ||
| liveSummary.deleteFromRealm() | ||
| val annotationsSummary = EventAnnotationsSummaryEntity.get(realm, eventId = redactedEvent.eventId) | ||
| if (annotationsSummary != null) { | ||
| Timber.d("deleting annotation summary with id: ${annotationsSummary.eventId}") | ||
| annotationsSummary.deleteFromRealm() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.