From 75c1718252a80f2583961fedaf2c56f770e3a1cf Mon Sep 17 00:00:00 2001 From: Valere Date: Fri, 28 Jun 2019 14:45:07 +0200 Subject: [PATCH] code review --- .../internal/session/room/send/EncryptEventWorker.kt | 6 ++---- .../matrix/android/internal/util/JsonCanonicalizer.kt | 2 +- .../room/detail/timeline/action/MessageActionsViewModel.kt | 3 ++- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt index f7503672..9e68f6d1 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/EncryptEventWorker.kt @@ -44,10 +44,8 @@ internal class EncryptEventWorker(context: Context, params: WorkerParameters) val keepKeys: List? = 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 { diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt index 41dd0f7d..f7fd3cf4 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/util/JsonCanonicalizer.kt @@ -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() } } diff --git a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt index bc0091b8..37e38a5f 100644 --- a/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt +++ b/vector/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/action/MessageActionsViewModel.kt @@ -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()