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) {
builder
.addHandler(
.setHandler(
"img",
ImageHandler.create())
.addHandler(
.setHandler(
"a",
MxLinkHandler(glideRequests, context, session))
.addHandler(
.setHandler(
"blockquote",
BlockquoteHandler())
.addHandler(
.setHandler(
"sub",
SubScriptHandler())
.addHandler(
.setHandler(
"sup",
SuperScriptHandler())
.addHandler(
.setHandler(
asList<String>("b", "strong"),
StrongEmphasisHandler())
.addHandler(
.setHandler(
asList<String>("s", "del"),
StrikeHandler())
.addHandler(
.setHandler(
asList<String>("u", "ins"),
UnderlineHandler())
.addHandler(
.setHandler(
asList<String>("ul", "ol"),
ListHandler())
.addHandler(
.setHandler(
asList<String>("i", "em", "cite", "dfn"),
EmphasisHandler())
.addHandler(
.setHandler(
asList<String>("h1", "h2", "h3", "h4", "h5", "h6"),
HeadingHandler())
.addHandler("mx-reply",
.setHandler("mx-reply",
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 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 kotlin.random.Random

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 tokenChunkEvent = FakeTokenChunkEvent(params.from, Random.nextLong(System.currentTimeMillis()).toString(), fakeEvents)
return tokenChunkEventPersistor.insertInDb(tokenChunkEvent, params.roomId, params.direction)
.map { tokenChunkEvent }
}

}