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

Fix compilation issue

This commit is contained in:
Benoit Marty 2019-03-15 18:56:18 +01:00
parent 008f6e2bdd
commit 0db1d98f41
3 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/im/vector/riotredesign/features/html/EventHtmlRenderer.kt
View File

@ -73,40 +73,40 @@ private class MatrixPlugin private constructor(private val glideRequests: GlideR


override fun configureHtmlRenderer(builder: MarkwonHtmlRenderer.Builder) { override fun configureHtmlRenderer(builder: MarkwonHtmlRenderer.Builder) {
builder builder
.addHandler( .setHandler(
"img", "img",
ImageHandler.create()) ImageHandler.create())
.addHandler( .setHandler(
"a", "a",
MxLinkHandler(glideRequests, context, session)) MxLinkHandler(glideRequests, context, session))
.addHandler( .setHandler(
"blockquote", "blockquote",
BlockquoteHandler()) BlockquoteHandler())
.addHandler( .setHandler(
"sub", "sub",
SubScriptHandler()) SubScriptHandler())
.addHandler( .setHandler(
"sup", "sup",
SuperScriptHandler()) SuperScriptHandler())
.addHandler( .setHandler(
asList<String>("b", "strong"), asList<String>("b", "strong"),
StrongEmphasisHandler()) StrongEmphasisHandler())
.addHandler( .setHandler(
asList<String>("s", "del"), asList<String>("s", "del"),
StrikeHandler()) StrikeHandler())
.addHandler( .setHandler(
asList<String>("u", "ins"), asList<String>("u", "ins"),
UnderlineHandler()) UnderlineHandler())
.addHandler( .setHandler(
asList<String>("ul", "ol"), asList<String>("ul", "ol"),
ListHandler()) ListHandler())
.addHandler( .setHandler(
asList<String>("i", "em", "cite", "dfn"), asList<String>("i", "em", "cite", "dfn"),
EmphasisHandler()) EmphasisHandler())
.addHandler( .setHandler(
asList<String>("h1", "h2", "h3", "h4", "h5", "h6"), asList<String>("h1", "h2", "h3", "h4", "h5", "h6"),
HeadingHandler()) HeadingHandler())
.addHandler("mx-reply", .setHandler("mx-reply",
MxReplyTagHandler()) MxReplyTagHandler())


} }

8
app/src/main/res/values-ldrtl/styles.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<style name="Floating_Action_Button">
<item name="fab_labelsPosition">right</item>
</style>

</resources>

4
matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/FakePaginationTask.kt
View File

@ -18,17 +18,15 @@ package im.vector.matrix.android.session.room.timeline


import arrow.core.Try import arrow.core.Try
import im.vector.matrix.android.internal.session.room.timeline.PaginationTask import im.vector.matrix.android.internal.session.room.timeline.PaginationTask
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEvent
import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor import im.vector.matrix.android.internal.session.room.timeline.TokenChunkEventPersistor
import kotlin.random.Random import kotlin.random.Random


internal class FakePaginationTask(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : PaginationTask { internal class FakePaginationTask(private val tokenChunkEventPersistor: TokenChunkEventPersistor) : PaginationTask {


override fun execute(params: PaginationTask.Params): Try<TokenChunkEvent> { override fun execute(params: PaginationTask.Params): Try<Boolean> {
val fakeEvents = RoomDataHelper.createFakeListOfEvents(30) val fakeEvents = RoomDataHelper.createFakeListOfEvents(30)
val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents) val tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents)
return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction) return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction)
.map { tokenChunkEvent }
} }


} }