Merge pull request #5814 from nextcloud/bugfix/noid/avoidToOpenMultipleInstances

Bugfix/noid/avoid to open multiple instances

Author: mahibi

app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt

@@ -112,7 +112,8 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
         clickView = image
         messageText.visibility = View.VISIBLE
         if (message.getCalculateMessageType() === ChatMessage.MessageType.SINGLE_NC_ATTACHMENT_MESSAGE) {
-            fileViewerUtils = FileViewerUtils(context!!, message.activeUser!!)
+            val chatActivity = commonMessageInterface as ChatActivity
+            fileViewerUtils = FileViewerUtils(chatActivity, message.activeUser!!)
             val fileName = message.selectedIndividualHashMap!![KEY_NAME]
 
             messageText.text = fileName

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -600,8 +600,6 @@ class ConversationInfoActivity :
 
     private fun showSharedItems() {
         val intent = Intent(this, SharedItemsActivity::class.java)
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
         intent.putExtra(BundleKeys.KEY_CONVERSATION_NAME, conversation?.displayName)
         intent.putExtra(KEY_ROOM_TOKEN, conversationToken)
         intent.putExtra(

app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt

@@ -224,23 +224,20 @@ class FileViewerUtils(private val context: Context, private val user: User) {
 
     private fun openImageView(filename: String, mimetype: String) {
         val fullScreenImageIntent = Intent(context, FullScreenImageActivity::class.java)
-        fullScreenImageIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         fullScreenImageIntent.putExtra("FILE_NAME", filename)
         fullScreenImageIntent.putExtra("IS_GIF", isGif(mimetype))
         context.startActivity(fullScreenImageIntent)
     }
 
     private fun openMediaView(filename: String, mimetype: String) {
         val fullScreenMediaIntent = Intent(context, FullScreenMediaActivity::class.java)
-        fullScreenMediaIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         fullScreenMediaIntent.putExtra("FILE_NAME", filename)
         fullScreenMediaIntent.putExtra("AUDIO_ONLY", isAudioOnly(mimetype))
         context.startActivity(fullScreenMediaIntent)
     }
 
     private fun openTextView(filename: String, mimetype: String) {
         val fullScreenTextViewerIntent = Intent(context, FullScreenTextViewerActivity::class.java)
-        fullScreenTextViewerIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
         fullScreenTextViewerIntent.putExtra("FILE_NAME", filename)
         fullScreenTextViewerIntent.putExtra("IS_MARKDOWN", isMarkdown(mimetype))
         context.startActivity(fullScreenTextViewerIntent)