From 909ee2cc85dce43a169d606bd56dd741a2a4b6d4 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Thu, 29 Oct 2020 14:57:17 +0100
Subject: [PATCH] Fix / bad format of trail item

---
 .../devtools/IncomingKeyRequestPagedController.kt | 15 +++++++++++----
 .../devtools/OutgoingKeyRequestPagedController.kt |  8 ++++----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
index 1510d47180..c2bdcfbd04 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/IncomingKeyRequestPagedController.kt
@@ -47,16 +47,23 @@ class IncomingKeyRequestPagedController @Inject constructor(
             title(roomKeyRequest.requestId)
             description(
                     span {
-                        span("From user: ${roomKeyRequest.userId}")
-                        +vectorDateFormatter.format(roomKeyRequest.localCreationTimestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
-                        span("sessionId:") {
+                        span("From: ") {
                             textStyle = "bold"
                         }
+                        span("${roomKeyRequest.userId}")
+                        +vectorDateFormatter.format(roomKeyRequest.localCreationTimestamp, DateFormatKind.DEFAULT_DATE_AND_TIME)
+                        span("\nsessionId:") {
+                            textStyle = "bold"
+                        }
+                        +"${roomKeyRequest.requestBody?.sessionId}"
                         span("\nFrom device:") {
                             textStyle = "bold"
                         }
                         +"${roomKeyRequest.deviceId}"
-                        +"\n${roomKeyRequest.state.name}"
+                        span("\nstate: ") {
+                            textStyle = "bold"
+                        }
+                        +roomKeyRequest.state.name
                     }
             )
         }
diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestPagedController.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestPagedController.kt
index 38c4c8153f..c2a3bc9827 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestPagedController.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/OutgoingKeyRequestPagedController.kt
@@ -43,19 +43,19 @@ class OutgoingKeyRequestPagedController @Inject constructor() : PagedListEpoxyCo
             title(roomKeyRequest.requestId)
             description(
                     span {
-                        span("roomId:\n") {
+                        span("roomId: ") {
                             textStyle = "bold"
                         }
                         +"${roomKeyRequest.roomId}"
 
-                        span("sessionId:\n") {
+                        span("\nsessionId: ") {
                             textStyle = "bold"
                         }
                         +"${roomKeyRequest.sessionId}"
-                        span("\nstate:") {
+                        span("\nstate: ") {
                             textStyle = "bold"
                         }
-                        +"\n${roomKeyRequest.state.name}"
+                        +roomKeyRequest.state.name
                     }
             )
         }