-
Notifications
You must be signed in to change notification settings - Fork 859
[Location sharing] - Update DB entity when a live is timed out (PSF-999) #6128
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
695c234
Adding changelog entry
d76b93c
Adding comment on isActive field
47eb717
Creation of a worker to deactivate a live after timeout
683a9cd
Schedule work during aggregation
b05fc76
Rely only on isActive field on UI side
b081429
Replace getOrCreate() by get() in worker
cfdc18d
Improve code readability in aggregation processor
8864a3c
Using replace instead of keep strategy for the worker
791d4fb
Improve computation of the work name to limit its length
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 @@ | ||
| [Live location sharing] Update entity in DB when a live is timed out |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
97 changes: 97 additions & 0 deletions
97
...d/sdk/internal/session/room/aggregation/livelocation/DeactivateLiveLocationShareWorker.kt
This file contains hidden or 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,97 @@ | ||
| /* | ||
| * 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.session.room.aggregation.livelocation | ||
|
|
||
| import android.content.Context | ||
| import androidx.work.WorkerParameters | ||
| import com.squareup.moshi.JsonClass | ||
| import io.realm.RealmConfiguration | ||
| import org.matrix.android.sdk.api.util.md5 | ||
| import org.matrix.android.sdk.internal.SessionManager | ||
| import org.matrix.android.sdk.internal.database.awaitTransaction | ||
| 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.di.SessionDatabase | ||
| import org.matrix.android.sdk.internal.session.SessionComponent | ||
| import org.matrix.android.sdk.internal.worker.SessionSafeCoroutineWorker | ||
| import org.matrix.android.sdk.internal.worker.SessionWorkerParams | ||
| import timber.log.Timber | ||
| import javax.inject.Inject | ||
|
|
||
| /** | ||
| * Worker dedicated to update live location summary data so that it is considered as deactivated. | ||
| * For the context: it is needed since a live location share should be deactivated after a certain timeout. | ||
| */ | ||
| internal class DeactivateLiveLocationShareWorker(context: Context, params: WorkerParameters, sessionManager: SessionManager) : | ||
| SessionSafeCoroutineWorker<DeactivateLiveLocationShareWorker.Params>( | ||
| context, | ||
| params, | ||
| sessionManager, | ||
| Params::class.java | ||
| ) { | ||
|
|
||
| @JsonClass(generateAdapter = true) | ||
| internal data class Params( | ||
| override val sessionId: String, | ||
| override val lastFailureMessage: String? = null, | ||
| val eventId: String, | ||
| val roomId: String | ||
| ) : SessionWorkerParams | ||
|
|
||
| @SessionDatabase | ||
| @Inject lateinit var realmConfiguration: RealmConfiguration | ||
|
|
||
| override fun injectWith(injector: SessionComponent) { | ||
| injector.inject(this) | ||
| } | ||
|
|
||
| override suspend fun doSafeWork(params: Params): Result { | ||
| return runCatching { | ||
| deactivateLiveLocationShare(params) | ||
| }.fold( | ||
| onSuccess = { | ||
| Result.success() | ||
| }, | ||
| onFailure = { | ||
| Timber.e("failed to deactivate live, eventId: ${params.eventId}, roomId: ${params.roomId}") | ||
| Result.failure() | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| private suspend fun deactivateLiveLocationShare(params: Params) { | ||
| awaitTransaction(realmConfiguration) { realm -> | ||
| val aggregatedSummary = LiveLocationShareAggregatedSummaryEntity.get( | ||
| realm = realm, | ||
| roomId = params.roomId, | ||
| eventId = params.eventId | ||
| ) | ||
| aggregatedSummary?.isActive = false | ||
| } | ||
| } | ||
|
|
||
| override fun buildErrorParams(params: Params, message: String): Params { | ||
| return params.copy(lastFailureMessage = params.lastFailureMessage ?: message) | ||
| } | ||
|
|
||
| companion object { | ||
| fun getWorkName(eventId: String, roomId: String): String { | ||
| val hash = "$eventId$roomId".md5() | ||
| return "DeactivateLiveLocationWork-$hash" | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not for this PR, but now the line 55 could be replaced by a call to this new method.