Cleanup
This commit is contained in:
parent
a8ba125bd2
commit
b027e43615
|
@ -16,7 +16,6 @@
|
||||||
package org.matrix.android.sdk.api.session.room.model.relation
|
package org.matrix.android.sdk.api.session.room.model.relation
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData
|
import androidx.lifecycle.LiveData
|
||||||
import org.matrix.android.sdk.api.MatrixCallback
|
|
||||||
import org.matrix.android.sdk.api.session.events.model.Event
|
import org.matrix.android.sdk.api.session.events.model.Event
|
||||||
import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
|
import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
|
||||||
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
|
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
|
||||||
|
|
|
@ -33,4 +33,3 @@ internal fun VerificationState?.toState(newState: VerificationState): Verificati
|
||||||
}
|
}
|
||||||
return newState
|
return newState
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -142,7 +142,6 @@ class RealmSessionStoreMigration @Inject constructor() : RealmMigration {
|
||||||
.addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
|
.addField(EditionOfEventFields.TIMESTAMP, Long::class.java)
|
||||||
.addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
|
.addField(EditionOfEventFields.IS_LOCAL_ECHO, Boolean::class.java)
|
||||||
|
|
||||||
|
|
||||||
realm.schema.get("EditAggregatedSummaryEntity")
|
realm.schema.get("EditAggregatedSummaryEntity")
|
||||||
?.removeField("aggregatedContent")
|
?.removeField("aggregatedContent")
|
||||||
?.removeField("sourceEvents")
|
?.removeField("sourceEvents")
|
||||||
|
|
|
@ -448,7 +448,7 @@ internal class EventRelationsAggregationProcessor @Inject constructor(@UserId pr
|
||||||
Timber.w("Redaction of a replace targeting an unknown event $relatedEventId")
|
Timber.w("Redaction of a replace targeting an unknown event $relatedEventId")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull {it.eventId == redacted.eventId }
|
val sourceToDiscard = eventSummary.editSummary?.editions?.firstOrNull { it.eventId == redacted.eventId }
|
||||||
if (sourceToDiscard == null) {
|
if (sourceToDiscard == null) {
|
||||||
Timber.w("Redaction of a replace that was not known in aggregation $sourceToDiscard")
|
Timber.w("Redaction of a replace that was not known in aggregation $sourceToDiscard")
|
||||||
return
|
return
|
||||||
|
|
|
@ -79,7 +79,6 @@ import org.matrix.android.sdk.api.session.room.model.Membership
|
||||||
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
|
import org.matrix.android.sdk.api.session.room.model.PowerLevelsContent
|
||||||
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
|
import org.matrix.android.sdk.api.session.room.model.RoomMemberSummary
|
||||||
import org.matrix.android.sdk.api.session.room.model.RoomSummary
|
import org.matrix.android.sdk.api.session.room.model.RoomSummary
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
|
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageType
|
import org.matrix.android.sdk.api.session.room.model.message.MessageType
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.OptionItem
|
import org.matrix.android.sdk.api.session.room.model.message.OptionItem
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
|
import org.matrix.android.sdk.api.session.room.model.message.getFileUrl
|
||||||
|
|
Loading…
Reference in New Issue