Design update

+ Reply 
+ Better preview in action menu

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt

@@ -18,8 +18,10 @@ package im.vector.matrix.android.api.session.events.model
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.Types
 import im.vector.matrix.android.internal.di.MoshiProvider
+import timber.log.Timber
 import java.lang.reflect.ParameterizedType
 
 typealias Content = Map<String, @JvmSuppressWildcards Any>
@@ -31,7 +33,12 @@ inline fun <reified T> Content?.toModel(): T? {
     return this?.let {
         val moshi = MoshiProvider.providesMoshi()
         val moshiAdapter = moshi.adapter(T::class.java)
-        return moshiAdapter.fromJsonValue(it)
+        try {
+            return moshiAdapter.fromJsonValue(it)
+        } catch (e: JsonDataException) {
+            Timber.e(e, "Failed to parse content")
+            return null
+        }
     }
 }
 

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/Room.kt

@@ -19,7 +19,7 @@ package im.vector.matrix.android.api.session.room
 import androidx.lifecycle.LiveData
 import im.vector.matrix.android.api.session.room.members.MembershipService
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.annotation.ReactionService
+import im.vector.matrix.android.api.session.room.model.annotation.RelationService
 import im.vector.matrix.android.api.session.room.read.ReadService
 import im.vector.matrix.android.api.session.room.send.SendService
 import im.vector.matrix.android.api.session.room.state.StateService
@@ -28,7 +28,7 @@ import im.vector.matrix.android.api.session.room.timeline.TimelineService
 /**
  * This interface defines methods to interact within a room.
  */
-interface Room : TimelineService, SendService, ReadService, MembershipService, StateService , ReactionService{
+interface Room : TimelineService, SendService, ReadService, MembershipService, StateService , RelationService{
 
     /**
      * The roomId of this room

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/annotation/ReactionInfo.kt

@@ -7,5 +7,7 @@ import com.squareup.moshi.JsonClass
 data class ReactionInfo(
         @Json(name = "rel_type") override val type: String?,
         @Json(name = "event_id") override val eventId: String,
-        val key: String
+        val key: String,
+        //always null for reaction
+        @Json(name = "m.in_reply_to") override val inReplyTo: ReplyToContent? = null
 ) : RelationContent

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/annotation/RelationContent.kt

@@ -3,4 +3,5 @@ package im.vector.matrix.android.api.session.room.model.annotation
 interface RelationContent {
     val type: String?
     val eventId: String?
+    val inReplyTo: ReplyToContent?
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/annotation/RelationDefaultContent.kt

@@ -21,5 +21,6 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class RelationDefaultContent(
         @Json(name = "rel_type") override val type: String?,
-        @Json(name = "event_id") override val eventId: String?
+        @Json(name = "event_id") override val eventId: String?,
+        @Json(name = "m.in_reply_to") override val inReplyTo: ReplyToContent? = null
 ) : RelationContent

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/annotation/RelationService.kt

@@ -15,10 +15,13 @@
  */
 package im.vector.matrix.android.api.session.room.model.annotation
 
+import im.vector.matrix.android.api.session.events.model.Event
+import im.vector.matrix.android.api.session.room.model.message.MessageContent
+import im.vector.matrix.android.api.session.room.timeline.TimelineEvent
 import im.vector.matrix.android.api.util.Cancelable
 
 //TODO rename in relationService?
-interface ReactionService {
+interface RelationService {
 
 
     /**
@@ -59,4 +62,7 @@ interface ReactionService {
      */
     fun editTextMessage(targetEventId: String, newBodyText: String, compatibilityBodyText: String = "* $newBodyText"): Cancelable
 
+
+    fun replyToMessage(eventReplied: Event, replyText: String) : Cancelable?
+
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/annotation/ReplyToContent.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.api.session.room.model.annotation
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ReplyToContent(
+        @Json(name = "event_id") val eventId: String
+)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/di/MatrixModule.kt

@@ -20,6 +20,7 @@ import android.content.Context
 import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.util.BackgroundDetectionObserver
 import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
+import im.vector.matrix.android.internal.util.StringProvider
 import kotlinx.coroutines.Dispatchers
 import org.koin.dsl.module.module
 
@@ -39,6 +40,9 @@ class MatrixModule(private val context: Context) {
         single {
             TaskExecutor(get())
         }
+        single {
+            StringProvider(context.resources)
+        }
 
         single {
             BackgroundDetectionObserver()

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/DefaultRoom.kt

@@ -22,7 +22,7 @@ import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.session.room.Room
 import im.vector.matrix.android.api.session.room.members.MembershipService
 import im.vector.matrix.android.api.session.room.model.RoomSummary
-import im.vector.matrix.android.api.session.room.model.annotation.ReactionService
+import im.vector.matrix.android.api.session.room.model.annotation.RelationService
 import im.vector.matrix.android.api.session.room.read.ReadService
 import im.vector.matrix.android.api.session.room.send.SendService
 import im.vector.matrix.android.api.session.room.state.StateService
@@ -40,14 +40,14 @@ internal class DefaultRoom(
         private val sendService: SendService,
         private val stateService: StateService,
         private val readService: ReadService,
-        private val reactionService: ReactionService,
+        private val relationService: RelationService,
         private val roomMembersService: MembershipService
 ) : Room,
         TimelineService by timelineService,
         SendService by sendService,
         StateService by stateService,
         ReadService by readService,
-        ReactionService by reactionService,
+        RelationService by relationService,
     MembershipService by roomMembersService {
 
     override val roomSummary: LiveData<RoomSummary> by lazy {

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomFactory.kt

@@ -18,10 +18,10 @@ package im.vector.matrix.android.internal.session.room
 
 import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.session.room.Room
-import im.vector.matrix.android.internal.session.room.membership.DefaultMembershipService
+import im.vector.matrix.android.internal.session.room.annotation.DefaultRelationService
 import im.vector.matrix.android.internal.session.room.annotation.FindReactionEventForUndoTask
-import im.vector.matrix.android.internal.session.room.annotation.DefaultReactionService
 import im.vector.matrix.android.internal.session.room.annotation.UpdateQuickReactionTask
+import im.vector.matrix.android.internal.session.room.membership.DefaultMembershipService
 import im.vector.matrix.android.internal.session.room.membership.LoadRoomMembersTask
 import im.vector.matrix.android.internal.session.room.membership.SenderRoomMemberExtractor
 import im.vector.matrix.android.internal.session.room.membership.joining.InviteTask
@@ -58,7 +58,7 @@ internal class RoomFactory(private val monarchy: Monarchy,
         val timelineEventFactory = TimelineEventFactory(roomMemberExtractor, EventRelationExtractor())
         val timelineService = DefaultTimelineService(roomId, monarchy, taskExecutor, timelineEventFactory, contextOfEventTask, paginationTask)
         val sendService = DefaultSendService(roomId, eventFactory, monarchy)
-        val reactionService = DefaultReactionService(roomId, eventFactory, findReactionEventForUndoTask, updateQuickReactionTask, taskExecutor)
+        val reactionService = DefaultRelationService(roomId, eventFactory, findReactionEventForUndoTask, updateQuickReactionTask, monarchy, taskExecutor)
         val stateService = DefaultStateService(roomId, taskExecutor, sendStateTask)
         val roomMembersService = DefaultMembershipService(roomId, monarchy, taskExecutor, loadRoomMembersTask, inviteTask, joinRoomTask, leaveRoomTask)
         val readService = DefaultReadService(roomId, monarchy, taskExecutor, setReadMarkersTask)

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/RoomModule.kt

@@ -39,6 +39,7 @@ import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
 import im.vector.matrix.android.internal.session.room.state.DefaultSendStateTask
 import im.vector.matrix.android.internal.session.room.state.SendStateTask
 import im.vector.matrix.android.internal.session.room.timeline.*
+import im.vector.matrix.android.internal.util.StringProvider
 import org.koin.dsl.module.module
 import retrofit2.Retrofit
 
@@ -73,7 +74,7 @@ class RoomModule {
         }
 
         scope(DefaultSession.SCOPE) {
-            LocalEchoEventFactory(get())
+            LocalEchoEventFactory(get(), get())
         }
 
         scope(DefaultSession.SCOPE) {
@@ -109,7 +110,7 @@ class RoomModule {
         }
 
         scope(DefaultSession.SCOPE) {
-            DefaultPruneEventTask(get(),get()) as PruneEventTask
+            DefaultPruneEventTask(get(), get()) as PruneEventTask
         }
 
     }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/annotation/DefaultRelationService.kt

@@ -16,11 +16,17 @@
 package im.vector.matrix.android.internal.session.room.annotation
 
 import androidx.work.*
+import com.zhuinden.monarchy.Monarchy
 import im.vector.matrix.android.api.MatrixCallback
 import im.vector.matrix.android.api.session.events.model.Event
-import im.vector.matrix.android.api.session.room.model.annotation.ReactionService
+import im.vector.matrix.android.api.session.room.model.annotation.RelationService
 import im.vector.matrix.android.api.session.room.model.message.MessageType
 import im.vector.matrix.android.api.util.Cancelable
+import im.vector.matrix.android.internal.database.helper.addSendingEvent
+import im.vector.matrix.android.internal.database.model.ChunkEntity
+import im.vector.matrix.android.internal.database.model.RoomEntity
+import im.vector.matrix.android.internal.database.query.findLastLiveChunkFromRoom
+import im.vector.matrix.android.internal.database.query.where
 import im.vector.matrix.android.internal.session.room.send.LocalEchoEventFactory
 import im.vector.matrix.android.internal.session.room.send.RedactEventWorker
 import im.vector.matrix.android.internal.session.room.send.SendEventWorker
@@ -28,6 +34,7 @@ import im.vector.matrix.android.internal.task.TaskExecutor
 import im.vector.matrix.android.internal.task.configureWith
 import im.vector.matrix.android.internal.util.CancelableWork
 import im.vector.matrix.android.internal.util.WorkerParamsFactory
+import im.vector.matrix.android.internal.util.tryTransactionAsync
 import java.util.concurrent.TimeUnit
 
 private const val REACTION_WORK = "REACTION_WORK"
@@ -37,12 +44,13 @@ private val WORK_CONSTRAINTS = Constraints.Builder()
         .setRequiredNetworkType(NetworkType.CONNECTED)
         .build()
 
-internal class DefaultReactionService(private val roomId: String,
+internal class DefaultRelationService(private val roomId: String,
                                       private val eventFactory: LocalEchoEventFactory,
                                       private val findReactionEventForUndoTask: FindReactionEventForUndoTask,
                                       private val updateQuickReactionTask: UpdateQuickReactionTask,
+                                      private val monarchy: Monarchy,
                                       private val taskExecutor: TaskExecutor)
-    : ReactionService {
+    : RelationService {
 
 
     override fun sendReaction(reaction: String, targetEventId: String): Cancelable {
@@ -170,4 +178,38 @@ internal class DefaultReactionService(private val roomId: String,
         return CancelableWork(workRequest.id)
 
     }
+
+    /**
+     * Reply to an event in the timeline
+     * Users may wish to reference another message when forming their own message
+     * https://matrix.org/docs/spec/client_server/r0.4.0.html#id350
+     */
+    override fun replyToMessage(eventReplied: Event, replyText: String): Cancelable? {
+        val event = eventFactory.createReplyTextEvent(roomId, eventReplied, replyText)?.also {
+            saveLocalEcho(it)
+        } ?: return null
+        val sendContentWorkerParams = SendEventWorker.Params(roomId, event)
+        val sendWorkData = WorkerParamsFactory.toData(sendContentWorkerParams)
+        val workRequest = OneTimeWorkRequestBuilder<SendEventWorker>()
+                .setConstraints(WORK_CONSTRAINTS)
+                .setInputData(sendWorkData)
+                .setBackoffCriteria(BackoffPolicy.LINEAR, BACKOFF_DELAY, TimeUnit.MILLISECONDS)
+                .build()
+
+        WorkManager.getInstance()
+                .beginUniqueWork(buildWorkIdentifier(REACTION_WORK), ExistingWorkPolicy.APPEND, workRequest)
+                .enqueue()
+        return CancelableWork(workRequest.id)
+    }
+
+    private fun saveLocalEcho(event: Event) {
+        monarchy.tryTransactionAsync { realm ->
+            val roomEntity = RoomEntity.where(realm, roomId = roomId).findFirst()
+                    ?: return@tryTransactionAsync
+            val liveChunk = ChunkEntity.findLastLiveChunkFromRoom(realm, roomId = roomId)
+                    ?: return@tryTransactionAsync
+
+            roomEntity.addSendingEvent(event, liveChunk.forwardsStateIndex ?: 0)
+        }
+    }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt

@@ -17,19 +17,20 @@
 package im.vector.matrix.android.internal.session.room.send
 
 import android.media.MediaMetadataRetriever
+import im.vector.matrix.android.R
 import im.vector.matrix.android.api.auth.data.Credentials
+import im.vector.matrix.android.api.permalinks.PermalinkFactory
 import im.vector.matrix.android.api.session.content.ContentAttachmentData
-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.RelationType
-import im.vector.matrix.android.api.session.events.model.toContent
+import im.vector.matrix.android.api.session.events.model.*
 import im.vector.matrix.android.api.session.room.model.annotation.ReactionContent
 import im.vector.matrix.android.api.session.room.model.annotation.ReactionInfo
 import im.vector.matrix.android.api.session.room.model.annotation.RelationDefaultContent
+import im.vector.matrix.android.api.session.room.model.annotation.ReplyToContent
 import im.vector.matrix.android.api.session.room.model.message.*
 import im.vector.matrix.android.internal.session.content.ThumbnailExtractor
+import im.vector.matrix.android.internal.util.StringProvider
 
-internal class LocalEchoEventFactory(private val credentials: Credentials) {
+internal class LocalEchoEventFactory(private val credentials: Credentials, private val stringProvider: StringProvider) {
 
     fun createTextEvent(roomId: String, msgType: String, text: String): Event {
         val content = MessageTextContent(type = msgType, body = text)
@@ -183,4 +184,80 @@ internal class LocalEchoEventFactory(private val credentials: Credentials) {
     private fun dummyEventId(roomId: String): String {
         return roomId + "-" + dummyOriginServerTs()
     }
+
+    fun createReplyTextEvent(roomId: String, eventReplied: Event, replyText: String): Event? {
+        //Fallbacks and event representation
+        //TODO Add error/warning logs when any of this is null
+        val permalink = PermalinkFactory.createPermalink(eventReplied) ?: return null
+        val userId = eventReplied.sender ?: return null
+        val userLink = PermalinkFactory.createPermalink(userId) ?: return null
+//        <mx-reply>
+//            <blockquote>
+//                <a href="https://matrix.to/#/!somewhere:domain.com/$event:domain.com">In reply to</a>
+//                <a href="https://matrix.to/#/@alice:example.org">@alice:example.org</a>
+//                <br />
+//                <!-- This is where the related event's HTML would be. -->
+//            </blockquote>
+//        </mx-reply>
+//        This is where the reply goes.
+        val body = bodyForReply(eventReplied.content.toModel<MessageContent>())
+        val replyFallbackTemplateFormatted = """
+           <mx-reply>
+              <blockquote>
+                <a href="%s">${stringProvider.getString(R.string.in_reply_to)}</a>
+                <a href="%s">%s</a>
+                <br />
+                %s
+              </blockquote>
+            </mx-reply>
+            %s
+        """.trim().format(permalink, userLink, userId, body.second ?: body.first, replyText)
+//
+//        > <@alice:example.org> This is the original body
+//
+//        This is where the reply goes
+        val lines = body.first.split("\n")
+        val plainTextBody = StringBuffer("><${userId}>")
+        lines.firstOrNull()?.also { plainTextBody.append(" $it") }
+        lines.forEachIndexed { index, s ->
+            if (index > 0) {
+                plainTextBody.append("\n>$s")
+            }
+        }
+        plainTextBody.append("\n\n").append(replyText)
+
+        val eventId = eventReplied.eventId ?: return null
+        val content = MessageTextContent(
+                type = MessageType.MSGTYPE_TEXT,
+                format = MessageType.FORMAT_MATRIX_HTML,
+                body = plainTextBody.toString(),
+                formattedBody = replyFallbackTemplateFormatted,
+                relatesTo = RelationDefaultContent(null, null, ReplyToContent(eventId))
+        )
+        return createEvent(roomId, content)
+    }
+
+    private fun bodyForReply(content: MessageContent?): Pair<String, String?> {
+        when (content?.type) {
+            MessageType.MSGTYPE_EMOTE,
+            MessageType.MSGTYPE_TEXT,
+            MessageType.MSGTYPE_NOTICE -> {
+                //If we already have formatted body, return it?
+                var formattedText: String? = null
+                if (content is MessageTextContent) {
+                    if (content.format == MessageType.FORMAT_MATRIX_HTML) {
+                        formattedText = content.formattedBody
+                    }
+                }
+                return content.body to formattedText
+            }
+            MessageType.MSGTYPE_FILE -> return stringProvider.getString(R.string.sent_a_file) to null
+            MessageType.MSGTYPE_AUDIO -> return stringProvider.getString(R.string.sent_an_audio_file) to null
+            MessageType.MSGTYPE_IMAGE -> return stringProvider.getString(R.string.sent_an_image) to null
+            MessageType.MSGTYPE_VIDEO -> return stringProvider.getString(R.string.sent_a_video) to null
+            else -> return (content?.body ?: "") to null
+
+        }
+
+    }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/SendEventWorker.kt

@@ -20,6 +20,7 @@ import android.content.Context
 import androidx.work.Worker
 import androidx.work.WorkerParameters
 import com.squareup.moshi.JsonClass
+import im.vector.matrix.android.api.failure.Failure
 import im.vector.matrix.android.api.session.events.model.Event
 import im.vector.matrix.android.internal.di.MatrixKoinComponent
 import im.vector.matrix.android.internal.network.executeRequest
@@ -57,6 +58,11 @@ internal class SendEventWorker(context: Context, params: WorkerParameters)
                     localEvent.content
             )
         }
-        return result.fold({ Result.retry() }, { Result.success() })
+        return result.fold({
+            when (it) {
+                is Failure.NetworkConnection -> Result.retry()
+                else -> Result.failure()
+            }
+        }, { Result.success() })
     }
 }

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/StringProvider.kt

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * 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 im.vector.matrix.android.internal.util
+
+import android.content.res.Resources
+import androidx.annotation.NonNull
+import androidx.annotation.StringRes
+
+class StringProvider(private val resources: Resources) {
+
+    /**
+     * Returns a localized string from the application's package's
+     * default string table.
+     *
+     * @param resId Resource id for the string
+     * @return The string data associated with the resource, stripped of styled
+     * text information.
+     */
+    @NonNull
+    fun getString(@StringRes resId: Int): String {
+        return resources.getString(resId)
+    }
+
+    /**
+     * Returns a localized formatted string from the application's package's
+     * default string table, substituting the format arguments as defined in
+     * [java.util.Formatter] and [java.lang.String.format].
+     *
+     * @param resId Resource id for the format string
+     * @param formatArgs The format arguments that will be used for
+     * substitution.
+     * @return The string data associated with the resource, formatted and
+     * stripped of styled text information.
+     */
+    @NonNull
+    fun getString(@StringRes resId: Int, vararg formatArgs: Any?): String {
+        return resources.getString(resId, *formatArgs)
+    }
+
+
+}

matrix-sdk-android/src/main/res/values/strings_riotX.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Strings not defined in Riot -->
+    <string name="in_reply_to">In reply to</string>
+    <string name="sent_a_file">sent a file.</string>
+    <string name="sent_an_image">sent an image.</string>
+    <string name="sent_a_video">sent a video.</string>
+    <string name="sent_an_audio_file">sent an audio file.</string>
+</resources>