6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix / Reaction stays highlighted when undone 

When undoing my reaction, the reactji stays selected as if i have done the reaction
This commit is contained in:
Valere 2019-05-19 12:07:27 +02:00
parent e3b9031e71
commit 054d339b48
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/SessionModule.kt
View File

@ -154,7 +154,7 @@ internal class SessionModule(private val sessionParams: SessionParams) {

scope(DefaultSession.SCOPE) {
val groupSummaryUpdater = GroupSummaryUpdater(get())
val eventsPruner = EventsPruner(get())
val eventsPruner = EventsPruner(get(), get())
val userEntityUpdater = UserEntityUpdater(get(), get(), get())
listOf<LiveEntityObserver>(groupSummaryUpdater, eventsPruner, userEntityUpdater)
}

5
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/EventsPruner.kt
View File

@ -20,6 +20,7 @@ import androidx.work.ExistingWorkPolicy
import androidx.work.OneTimeWorkRequestBuilder
import androidx.work.WorkManager
import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.internal.database.RealmLiveEntityObserver
import im.vector.matrix.android.internal.database.mapper.asDomain
@ -29,7 +30,7 @@ import im.vector.matrix.android.internal.util.WorkerParamsFactory

private const val PRUNE_EVENT_WORKER = "PRUNE_EVENT_WORKER"

internal class EventsPruner(monarchy: Monarchy) :
internal class EventsPruner(monarchy: Monarchy, private val credentials: Credentials) :
RealmLiveEntityObserver<EventEntity>(monarchy) {

override val query = Monarchy.Query<EventEntity> { EventEntity.where(it, type = EventType.REDACTION) }
@ -38,7 +39,7 @@ internal class EventsPruner(monarchy: Monarchy) :
val redactionEvents = inserted
.mapNotNull { it.asDomain() }

val pruneEventWorkerParams = PruneEventWorker.Params(redactionEvents)
val pruneEventWorkerParams = PruneEventWorker.Params(redactionEvents, credentials.userId)
val workData = WorkerParamsFactory.toData(pruneEventWorkerParams)

val sendWork = OneTimeWorkRequestBuilder<PruneEventWorker>()

13
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/prune/PruneEventWorker.kt
View File

@ -40,13 +40,15 @@ import io.realm.Realm
import org.koin.standalone.inject
import timber.log.Timber

//TODO should be a task instead of worker
internal class PruneEventWorker(context: Context,
workerParameters: WorkerParameters
) : Worker(context, workerParameters), MatrixKoinComponent {

@JsonClass(generateAdapter = true)
internal class Params(
val redactionEvents: List<Event>
val redactionEvents: List<Event>,
val userId: String
)

private val monarchy by inject<Monarchy>()
@ -57,7 +59,7 @@ internal class PruneEventWorker(context: Context,

val result = monarchy.tryTransactionSync { realm ->
params.redactionEvents.forEach { event ->
pruneEvent(realm, event)
pruneEvent(realm, event, params.userId)
}
}
return result.fold({
@ -67,7 +69,7 @@ internal class PruneEventWorker(context: Context,
})
}

private fun pruneEvent(realm: Realm, redactionEvent: Event) {
private fun pruneEvent(realm: Realm, redactionEvent: Event, userId: String) {
if (redactionEvent.redacts.isNullOrBlank()) {
return
}
@ -88,6 +90,7 @@ internal class PruneEventWorker(context: Context,
val modified = unsignedData.copy(redactedEvent = redactionEvent)
eventToPrune.content = ContentMapper.map(emptyMap())
eventToPrune.unsignedData = MoshiProvider.providesMoshi().adapter(UnsignedData::class.java).toJson(modified)

}
EventType.REACTION -> {
Timber.d("REDACTION of reaction ${eventToPrune.eventId}")
@ -110,6 +113,10 @@ internal class PruneEventWorker(context: Context,
summary.sourceEvents.remove(eventToPrune.eventId)
Timber.d("Known reactions after ${summary.sourceEvents.joinToString(",")}")
summary.count = summary.count - 1
if (eventToPrune.sender == userId) {
//Was it a redact on my reaction?
summary.addedByMe = false
}
if (summary.count == 0) {
//delete!
summary.deleteFromRealm()