Revert "Sending : add a basic local echo (still need to define sending states)"

This reverts commit a4abd20e73.
This commit is contained in:
ganfra 2018-11-13 10:48:05 +01:00
parent a4abd20e73
commit 2c6b155794
11 changed files with 62 additions and 155 deletions

View File

@ -1,12 +1,12 @@
package im.vector.matrix.android.api.session.events.model package im.vector.matrix.android.api.session.events.model


import com.google.gson.JsonObject
import com.squareup.moshi.Json import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import com.squareup.moshi.Types
import im.vector.matrix.android.internal.di.MoshiProvider import im.vector.matrix.android.internal.di.MoshiProvider
import java.lang.reflect.ParameterizedType import im.vector.matrix.android.internal.legacy.util.JsonUtils


typealias Content = Map<String, @JvmSuppressWildcards Any> typealias Content = Map<String, Any>


@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
data class Event( data class Event(
@ -23,6 +23,16 @@ data class Event(


) { ) {


val contentAsJsonObject: JsonObject? by lazy {
val gson = JsonUtils.getGson(true)
gson.toJsonTree(content).asJsonObject
}

val prevContentAsJsonObject: JsonObject? by lazy {
val gson = JsonUtils.getGson(true)
gson.toJsonTree(prevContent).asJsonObject
}

inline fun <reified T> content(): T? { inline fun <reified T> content(): T? {
return toModel(content) return toModel(content)
} }
@ -37,8 +47,4 @@ data class Event(
return moshiAdapter.fromJsonValue(data) return moshiAdapter.fromJsonValue(data)
} }


companion object {
val CONTENT_TYPE: ParameterizedType = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
}

} }

View File

@ -1,24 +1,16 @@
package im.vector.matrix.android.internal.database.helper package im.vector.matrix.android.internal.database.helper


import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.internal.database.mapper.fillWith import im.vector.matrix.android.internal.database.mapper.asEntity
import im.vector.matrix.android.internal.database.model.ChunkEntity import im.vector.matrix.android.internal.database.model.ChunkEntity
import im.vector.matrix.android.internal.database.model.EventEntity
import im.vector.matrix.android.internal.database.query.fastContains import im.vector.matrix.android.internal.database.query.fastContains
import im.vector.matrix.android.internal.database.query.where
import io.realm.kotlin.createObject


internal fun List<Event>.addManagedToChunk(chunkEntity: ChunkEntity) { internal fun List<Event>.addManagedToChunk(chunkEntity: ChunkEntity) {
if (!chunkEntity.isManaged) { if (!chunkEntity.isManaged) {
throw IllegalStateException("Chunk entity should be managed to use fast contains") throw IllegalStateException("Chunk entity should be managed to use fast contains")
} }
val realm = chunkEntity.realm
this.forEach { event -> this.forEach { event ->
val eventEntity = EventEntity.where(realm, event.eventId).findFirst() val eventEntity = event.asEntity()
?: realm.createObject()

eventEntity.fillWith(event)

if (!chunkEntity.events.fastContains(eventEntity)) { if (!chunkEntity.events.fastContains(eventEntity)) {
chunkEntity.events.add(eventEntity) chunkEntity.events.add(eventEntity)
} }

View File

@ -1,5 +1,6 @@
package im.vector.matrix.android.internal.database.mapper package im.vector.matrix.android.internal.database.mapper


import com.squareup.moshi.Types
import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.UnsignedData import im.vector.matrix.android.api.session.events.model.UnsignedData
import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.internal.database.model.EventEntity
@ -9,11 +10,21 @@ import im.vector.matrix.android.internal.di.MoshiProvider
internal object EventMapper { internal object EventMapper {


private val moshi = MoshiProvider.providesMoshi() private val moshi = MoshiProvider.providesMoshi()
private val adapter = moshi.adapter<Map<String, Any>>(Event.CONTENT_TYPE) private val type = Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
private val adapter = moshi.adapter<Map<String, Any>>(type)


fun map(event: Event): EventEntity { fun map(event: Event): EventEntity {
val eventEntity = EventEntity() val eventEntity = EventEntity()
fill(eventEntity, with = event) eventEntity.eventId = event.eventId ?: ""
eventEntity.content = adapter.toJson(event.content)
val resolvedPrevContent = event.prevContent ?: event.unsignedData?.prevContent
eventEntity.prevContent = adapter.toJson(resolvedPrevContent)
eventEntity.stateKey = event.stateKey
eventEntity.type = event.type
eventEntity.sender = event.sender
eventEntity.originServerTs = event.originServerTs
eventEntity.redacts = event.redacts
eventEntity.age = event.unsignedData?.age ?: event.originServerTs
return eventEntity return eventEntity
} }


@ -31,20 +42,6 @@ internal object EventMapper {
redacts = eventEntity.redacts redacts = eventEntity.redacts
) )
} }

fun fill(eventEntity: EventEntity, with: Event) {
eventEntity.eventId = with.eventId ?: ""
eventEntity.content = adapter.toJson(with.content)
val resolvedPrevContent = with.prevContent ?: with.unsignedData?.prevContent
eventEntity.prevContent = adapter.toJson(resolvedPrevContent)
eventEntity.stateKey = with.stateKey
eventEntity.type = with.type
eventEntity.sender = with.sender
eventEntity.originServerTs = with.originServerTs
eventEntity.redacts = with.redacts
eventEntity.age = with.unsignedData?.age ?: with.originServerTs
}

} }


internal fun EventEntity.asDomain(): Event { internal fun EventEntity.asDomain(): Event {
@ -53,8 +50,4 @@ internal fun EventEntity.asDomain(): Event {


internal fun Event.asEntity(): EventEntity { internal fun Event.asEntity(): EventEntity {
return EventMapper.map(this) return EventMapper.map(this)
}

internal fun EventEntity.fillWith(event: Event) {
EventMapper.fill(this, with = event)
} }

View File

@ -3,16 +3,17 @@ package im.vector.matrix.android.internal.database.model
import io.realm.RealmObject import io.realm.RealmObject
import io.realm.RealmResults import io.realm.RealmResults
import io.realm.annotations.LinkingObjects import io.realm.annotations.LinkingObjects
import io.realm.annotations.PrimaryKey


internal open class EventEntity(var eventId: String = "", internal open class EventEntity(@PrimaryKey var eventId: String = "",
var type: String = "", var type: String = "",
var content: String = "", var content: String = "",
var prevContent: String? = null, var prevContent: String? = null,
var stateKey: String? = null, var stateKey: String? = null,
var originServerTs: Long? = null, var originServerTs: Long? = null,
var sender: String? = null, var sender: String? = null,
var age: Long? = 0, var age: Long? = 0,
var redacts: String? = null var redacts: String? = null
) : RealmObject() { ) : RealmObject() {


companion object companion object

View File

@ -23,17 +23,6 @@ internal class SessionModule(private val sessionParams: SessionParams) : Module


override fun invoke(): ModuleDefinition = module(override = true) { override fun invoke(): ModuleDefinition = module(override = true) {


scope(DefaultSession.SCOPE) {
sessionParams
}

scope(DefaultSession.SCOPE) {
RealmConfiguration.Builder()
.name(sessionParams.credentials.userId)
.deleteRealmIfMigrationNeeded()
.build()
}

scope(DefaultSession.SCOPE) { scope(DefaultSession.SCOPE) {
RealmConfiguration.Builder() RealmConfiguration.Builder()
.name(sessionParams.credentials.userId) .name(sessionParams.credentials.userId)

View File

@ -9,7 +9,7 @@ import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.internal.database.mapper.asDomain import im.vector.matrix.android.internal.database.mapper.asDomain
import im.vector.matrix.android.internal.database.mapper.fillWith import im.vector.matrix.android.internal.database.mapper.asEntity
import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.internal.database.model.EventEntity
import im.vector.matrix.android.internal.database.query.where import im.vector.matrix.android.internal.database.query.where
import im.vector.matrix.android.internal.util.WorkerParamsFactory import im.vector.matrix.android.internal.util.WorkerParamsFactory
@ -48,18 +48,16 @@ internal class PruneEventWorker(context: Context,
if (redactionEvent == null || redactionEvent.redacts.isNullOrEmpty()) { if (redactionEvent == null || redactionEvent.redacts.isNullOrEmpty()) {
return return
} }
val eventToPruneEntity = EventEntity.where(realm, eventId = redactionEvent.redacts).findFirst() val eventToPrune = EventEntity.where(realm, eventId = redactionEvent.redacts).findFirst()?.asDomain()
?: return ?: return


val eventToPrune = eventToPruneEntity.asDomain()

val allowedKeys = computeAllowedKeys(eventToPrune.type) val allowedKeys = computeAllowedKeys(eventToPrune.type)
val prunedContent = allowedKeys.fold( val prunedContent = allowedKeys.fold(
{ eventToPrune.content }, { eventToPrune.content },
{ eventToPrune.content?.filterKeys { key -> it.contains(key) } } { eventToPrune.content?.filterKeys { key -> it.contains(key) } }
) )
val prunedEvent = eventToPrune.copy(content = prunedContent) val eventToPruneEntity = eventToPrune.copy(content = prunedContent).asEntity()
eventToPruneEntity.fillWith(prunedEvent) realm.insertOrUpdate(eventToPruneEntity)
} }


private fun computeAllowedKeys(type: String): Option<List<String>> { private fun computeAllowedKeys(type: String): Option<List<String>> {

View File

@ -1,12 +1,16 @@
package im.vector.matrix.android.internal.session.room package im.vector.matrix.android.internal.session.room


import im.vector.matrix.android.api.session.events.model.Content import im.vector.matrix.android.api.session.room.model.MessageContent
import im.vector.matrix.android.internal.network.NetworkConstants import im.vector.matrix.android.internal.network.NetworkConstants
import im.vector.matrix.android.internal.session.room.members.RoomMembersResponse import im.vector.matrix.android.internal.session.room.members.RoomMembersResponse
import im.vector.matrix.android.internal.session.room.send.SendResponse import im.vector.matrix.android.internal.session.room.send.SendResponse
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEvent import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEvent
import retrofit2.Call import retrofit2.Call
import retrofit2.http.* import retrofit2.http.Body
import retrofit2.http.GET
import retrofit2.http.PUT
import retrofit2.http.Path
import retrofit2.http.Query


internal interface RoomAPI { internal interface RoomAPI {


@ -56,7 +60,7 @@ internal interface RoomAPI {
fun send(@Path("txId") txId: String, fun send(@Path("txId") txId: String,
@Path("roomId") roomId: String, @Path("roomId") roomId: String,
@Path("eventType") eventType: String, @Path("eventType") eventType: String,
@Body content: Content? @Body content: MessageContent
): Call<SendResponse> ): Call<SendResponse>





View File

@ -1,12 +1,10 @@
package im.vector.matrix.android.internal.session.room package im.vector.matrix.android.internal.session.room


import im.vector.matrix.android.api.auth.data.SessionParams
import im.vector.matrix.android.api.session.room.SendService import im.vector.matrix.android.api.session.room.SendService
import im.vector.matrix.android.api.session.room.TimelineHolder import im.vector.matrix.android.api.session.room.TimelineHolder
import im.vector.matrix.android.internal.session.DefaultSession import im.vector.matrix.android.internal.session.DefaultSession
import im.vector.matrix.android.internal.session.room.members.LoadRoomMembersRequest import im.vector.matrix.android.internal.session.room.members.LoadRoomMembersRequest
import im.vector.matrix.android.internal.session.room.send.DefaultSendService import im.vector.matrix.android.internal.session.room.send.DefaultSendService
import im.vector.matrix.android.internal.session.room.send.EventFactory
import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineHolder import im.vector.matrix.android.internal.session.room.timeline.DefaultTimelineHolder
import im.vector.matrix.android.internal.session.room.timeline.PaginationRequest import im.vector.matrix.android.internal.session.room.timeline.PaginationRequest
import im.vector.matrix.android.internal.session.room.timeline.TimelineBoundaryCallback import im.vector.matrix.android.internal.session.room.timeline.TimelineBoundaryCallback
@ -34,10 +32,6 @@ class RoomModule : Module {
PaginationRequest(get(), get(), get(), get()) PaginationRequest(get(), get(), get(), get())
} }


scope(DefaultSession.SCOPE) {
val sessionParams = get<SessionParams>()
EventFactory(sessionParams.credentials)
}


factory { factory {
val roomId: String = it[0] val roomId: String = it[0]
@ -47,7 +41,7 @@ class RoomModule : Module {


factory { factory {
val roomId: String = it[0] val roomId: String = it[0]
DefaultSendService(roomId, get(), get()) as SendService DefaultSendService(roomId) as SendService
} }


}.invoke() }.invoke()

View File

@ -1,37 +1,23 @@
package im.vector.matrix.android.internal.session.room.send package im.vector.matrix.android.internal.session.room.send


import androidx.work.* import androidx.work.*
import com.zhuinden.monarchy.Monarchy
import im.vector.matrix.android.api.session.room.SendService import im.vector.matrix.android.api.session.room.SendService
import im.vector.matrix.android.api.util.Cancelable import im.vector.matrix.android.api.util.Cancelable
import im.vector.matrix.android.internal.database.helper.addManagedToChunk
import im.vector.matrix.android.internal.database.model.ChunkEntity
import im.vector.matrix.android.internal.database.query.findLastLiveChunkFromRoom
import im.vector.matrix.android.internal.util.CancelableWork import im.vector.matrix.android.internal.util.CancelableWork
import im.vector.matrix.android.internal.util.WorkerParamsFactory import im.vector.matrix.android.internal.util.WorkerParamsFactory
import im.vector.matrix.android.internal.util.tryTransactionAsync
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit


private const val SEND_WORK = "SEND_WORK" private const val SEND_WORK = "SEND_WORK"


internal class DefaultSendService(private val roomId: String, internal class DefaultSendService(private val roomId: String) : SendService {
private val eventFactory: EventFactory,
private val monarchy: Monarchy) : SendService {


private val sendConstraints = Constraints.Builder() private val sendConstraints = Constraints.Builder()
.setRequiredNetworkType(NetworkType.CONNECTED) .setRequiredNetworkType(NetworkType.CONNECTED)
.build() .build()


override fun sendTextMessage(text: String): Cancelable { override fun sendTextMessage(text: String): Cancelable {
val event = eventFactory.createTextEvent(roomId, text)


monarchy.tryTransactionAsync { realm -> val sendContentWorkerParams = SendEventWorker.Params(roomId, text)
val chunkEntity = ChunkEntity.findLastLiveChunkFromRoom(realm, roomId)
?: return@tryTransactionAsync
listOf(event).addManagedToChunk(chunkEntity)
}

val sendContentWorkerParams = SendEventWorker.Params(roomId, event)
val workData = WorkerParamsFactory.toData(sendContentWorkerParams) val workData = WorkerParamsFactory.toData(sendContentWorkerParams)


val sendWork = OneTimeWorkRequestBuilder<SendEventWorker>() val sendWork = OneTimeWorkRequestBuilder<SendEventWorker>()

View File

@ -1,44 +0,0 @@
package im.vector.matrix.android.internal.session.room.send

import im.vector.matrix.android.api.auth.data.Credentials
import im.vector.matrix.android.api.session.events.model.Content
import im.vector.matrix.android.api.session.events.model.Event
import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.api.session.room.model.MessageContent
import im.vector.matrix.android.api.session.room.model.MessageType
import im.vector.matrix.android.internal.di.MoshiProvider

internal class EventFactory(private val credentials: Credentials) {

private val moshi = MoshiProvider.providesMoshi()

fun createTextEvent(roomId: String, text: String): Event {
val content = MessageContent(type = MessageType.MSGTYPE_TEXT, body = text)

return Event(
roomId = roomId,
originServerTs = dummyOriginServerTs(),
sender = credentials.userId,
eventId = dummyEventId(roomId),
type = EventType.MESSAGE,
content = toContent(content)
)
}

private fun dummyOriginServerTs(): Long {
return System.currentTimeMillis()
}

private fun dummyEventId(roomId: String): String {
return roomId + "-" + dummyOriginServerTs()
}

@Suppress("UNCHECKED_CAST")
private inline fun <reified T> toContent(data: T?): Content? {
val moshiAdapter = moshi.adapter(T::class.java)
val jsonValue = moshiAdapter.toJsonValue(data)
return jsonValue as? Content?
}


}

View File

@ -4,14 +4,12 @@ import android.content.Context
import androidx.work.Worker import androidx.work.Worker
import androidx.work.WorkerParameters import androidx.work.WorkerParameters
import com.squareup.moshi.JsonClass import com.squareup.moshi.JsonClass
import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.api.session.events.model.EventType
import im.vector.matrix.android.api.session.events.model.Event import im.vector.matrix.android.api.session.room.model.MessageContent
import im.vector.matrix.android.internal.database.model.EventEntity import im.vector.matrix.android.api.session.room.model.MessageType
import im.vector.matrix.android.internal.database.query.where
import im.vector.matrix.android.internal.network.executeRequest import im.vector.matrix.android.internal.network.executeRequest
import im.vector.matrix.android.internal.session.room.RoomAPI import im.vector.matrix.android.internal.session.room.RoomAPI
import im.vector.matrix.android.internal.util.WorkerParamsFactory import im.vector.matrix.android.internal.util.WorkerParamsFactory
import im.vector.matrix.android.internal.util.tryTransactionSync
import org.koin.standalone.KoinComponent import org.koin.standalone.KoinComponent
import org.koin.standalone.inject import org.koin.standalone.inject


@ -22,35 +20,25 @@ internal class SendEventWorker(context: Context, params: WorkerParameters)
@JsonClass(generateAdapter = true) @JsonClass(generateAdapter = true)
internal data class Params( internal data class Params(
val roomId: String, val roomId: String,
val event: Event val text: String
) )


private val roomAPI by inject<RoomAPI>() private val roomAPI by inject<RoomAPI>()
private val monarchy by inject<Monarchy>()


override fun doWork(): Result { override fun doWork(): Result {


val params = WorkerParamsFactory.fromData<Params>(inputData) val sendWorkerParameters = WorkerParamsFactory.fromData<Params>(inputData)
?: return Result.FAILURE ?: return Result.FAILURE


if (params.event.eventId == null) { val fakeId = sendWorkerParameters.roomId + "-" + System.currentTimeMillis()
return Result.FAILURE
}

val result = executeRequest<SendResponse> { val result = executeRequest<SendResponse> {
apiCall = roomAPI.send( apiCall = roomAPI.send(
params.event.eventId, fakeId,
params.roomId, sendWorkerParameters.roomId,
params.event.type, EventType.MESSAGE,
params.event.content MessageContent(MessageType.MSGTYPE_TEXT, sendWorkerParameters.text)
) )
} }
result.flatMap { sendResponse ->
monarchy.tryTransactionSync { realm ->
val dummyEventEntity = EventEntity.where(realm, params.event.eventId).findFirst()
dummyEventEntity?.eventId = sendResponse.eventId
}
}
return result.fold({ Result.RETRY }, { Result.SUCCESS }) return result.fold({ Result.RETRY }, { Result.SUCCESS })
} }