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

View File

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

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

override fun doWork(): Result {


View File

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

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

View File

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

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()