Merge pull request #3022 from nextcloud/backport/3021/stable-17.0

[stable-17.0] fix multiple bugs caused by launchMode="singleInstance" and noHistory="true"
nextcloud · May 12, 2023 · 6805356 · 6805356
2 parents a3f674c + 070cc98
commit 6805356
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -211,8 +211,6 @@
 
         <activity
             android:name=".chat.ChatActivity"
-            android:launchMode="singleInstance"
-            android:noHistory="true"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme" />
 

diff --git 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()
         }