From b22ed7399d6c46b93a356b74cd5f4f772e388609 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Fri, 29 Apr 2022 13:21:30 +0200
Subject: [PATCH] fix to close media view when press back button

when starting media tab from conversation info, the back button opened media tab again. to fix this FLAG_ACTIVITY_CLEAR_TOP was set as flag

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/AndroidManifest.xml                         | 9 ++++-----
 .../talk/controllers/ConversationInfoController.kt       | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index aaaeb9430..9e52ddd26 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,11 +96,6 @@
             android:name="android.max_aspect"
             android:value="10" />
 
-        <activity
-            android:name=".activities.SharedItemsActivity"
-            android:exported="false"
-            android:theme="@style/AppTheme"/>
-
         <activity
             android:name=".activities.MainActivity"
             android:label="@string/nc_app_name"
@@ -172,6 +167,10 @@
             android:theme="@style/TakePhotoTheme"
             android:windowSoftInputMode="stateHidden" />
 
+        <activity
+            android:name=".activities.SharedItemsActivity"
+            android:theme="@style/AppTheme"/>
+
         <receiver android:name=".receivers.PackageReplacedReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
index 8fa50f086..b60ed878a 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt
@@ -187,6 +187,8 @@ class ConversationInfoController(args: Bundle) :
 
     private fun showSharedItems() {
         val intent = Intent(activity, 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(BundleKeys.KEY_ROOM_TOKEN, conversationToken)
         intent.putExtra(BundleKeys.KEY_USER_ENTITY, conversationUser as Parcelable)