From d1ce4dfba238462c51a9ef0a468ab6dc2773091c Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 12 May 2023 13:56:54 +0200 Subject: [PATCH 1/2] fix multiple bugs caused by launchMode="singleInstance" and noHistory="true" following lines for ChatActivity were removed: android:launchMode="singleInstance" android:noHistory="true" this solves: - share files from local storage broken - broken transitions (caused by "singleInstance") - fix to open chat when navigating back from conversation info - fix weird mixed conversations when opening a conversation by notification while being in another conversation launchMode="singleInstance" was introduced when reimplementing breakout rooms for the conductor to activity migration. So for now this reverting might introduce problems for breakout rooms. Signed-off-by: Marcel Hibbe --- app/src/main/AndroidManifest.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cee5b009c3..c9ce563ec6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -211,8 +211,6 @@ From 070cc988273677305abe53c84f52794632b89ac8 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Fri, 12 May 2023 14:23:52 +0200 Subject: [PATCH 2/2] fix to keep entered text when app is in background Signed-off-by: Marcel Hibbe --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index f3d47a718a..2929111918 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -542,7 +542,9 @@ class ChatActivity : initVoiceRecordButton() - binding?.messageInputView?.inputEditText?.setText(sharedText) + if (sharedText.isNotEmpty()) { + binding?.messageInputView?.inputEditText?.setText(sharedText) + } binding?.messageInputView?.setAttachmentsListener { AttachmentDialog(this, this).show() }