From 08a5088c48712abfb225c543dfbffdc7eb84008c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Fri, 17 Sep 2021 12:21:18 +0200
Subject: [PATCH] Add conversation description to lobby screen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: #1557

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .../main/java/com/nextcloud/talk/controllers/ChatController.kt | 3 ++-
 app/src/main/res/layout/lobby_view.xml                         | 3 ++-
 app/src/main/res/values/strings.xml                            | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index 5eee74f0c..ed6c7a312 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -1127,7 +1127,8 @@ class ChatController(args: Bundle) :
                         DateUtils.getLocalDateStringFromTimestampForLobby(
                             currentConversation?.lobbyTimer
                                 ?: 0
-                        )
+                        ),
+                        currentConversation!!.description
                     )
                 } else {
                     binding.lobby.lobbyTextView.setText(R.string.nc_lobby_waiting)
diff --git a/app/src/main/res/layout/lobby_view.xml b/app/src/main/res/layout/lobby_view.xml
index d267090c3..d16c81011 100644
--- a/app/src/main/res/layout/lobby_view.xml
+++ b/app/src/main/res/layout/lobby_view.xml
@@ -47,6 +47,7 @@
         android:text="@string/nc_lobby_waiting"
         android:textAlignment="center"
         android:textColor="@color/grey_600"
-        android:textSize="16sp" />
+        android:textSize="16sp"
+        android:autoLink="web" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f35a4b8f..1586a051e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -350,7 +350,8 @@
     <string name="nc_lobby">Lobby</string>
     <string name="nc_start_time">Start time</string>
     <string name="nc_lobby_waiting">You are currently waiting in the lobby.</string>
-    <string name="nc_lobby_waiting_with_date">You are currently waiting in the lobby.\n This meeting is scheduled for %1$s.</string>
+    <string name="nc_lobby_waiting_with_date">You are currently waiting in the lobby.\n\nThis meeting is scheduled for
+        %1$s.\n\n%2$s</string>
     <string name="nc_manual">Not set</string>
 
     <!-- Errors -->