Преглед на файлове

Merge pull request #3021 from nextcloud/bugfix/fixChatActivityInstance

fix multiple bugs caused by launchMode="singleInstance" and noHistory="true"
Marcel Hibbe преди 2 години
родител
ревизия
ab4ce8c4e4
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 0 2
      app/src/main/AndroidManifest.xml
  2. 3 1
      app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

+ 0 - 2
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" />
 

+ 3 - 1
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()
         }