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

code review

This commit is contained in:
Valere 2019-06-28 14:45:07 +02:00
parent f83491fdfc
commit 75c1718252
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt
View File

@ -44,10 +44,8 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters)
val keepKeys: List<String>? = null val keepKeys: List<String>? = null
) : SessionWorkerParams ) : SessionWorkerParams


@Inject @Inject lateinit var crypto: CryptoService
lateinit var crypto: CryptoService @Inject lateinit var localEchoUpdater: LocalEchoUpdater
@Inject
lateinit var localEchoUpdater: LocalEchoUpdater


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



2
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt
View File

@ -100,7 +100,7 @@ object JsonCanonicalizer {


return result.toString() return result.toString()
} }
is String -> return JSONObject.quote(src.toString()) is String -> return JSONObject.quote(src)
else -> return src.toString() else -> return src.toString()
} }
} }

3
vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View File

@ -48,7 +48,8 @@ data class MessageActionState(


fun senderName(): String = informationData.memberName?.toString() ?: "" fun senderName(): String = informationData.memberName?.toString() ?: ""


fun time(): String? = dateFormat.format(Date(timelineEvent?.root?.originServerTs ?: 0)) fun time(): String? = timelineEvent?.root?.originServerTs?.let { dateFormat.format(Date(it)) }
?: ""


fun canReact(): Boolean = timelineEvent?.root?.type == EventType.MESSAGE && timelineEvent.sendState.isSent() fun canReact(): Boolean = timelineEvent?.root?.type == EventType.MESSAGE && timelineEvent.sendState.isSent()