From 340d11377d451cd42d1eb390f229566ec09de5c3 Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Fri, 2 Jul 2021 10:15:56 +1000
Subject: [PATCH] fix: conversations opened from push now go back to home
 activity

---
 app/src/main/AndroidManifest.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 32869dd1f1..a95a9baebe 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -221,7 +221,12 @@
         <activity
             android:name="org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme.Session.DayNight.FlatActionBar" />
+            android:parentActivityName="org.thoughtcrime.securesms.loki.activities.HomeActivity"
+            android:theme="@style/Theme.Session.DayNight.FlatActionBar">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.loki.activities.HomeActivity" />
+        </activity>
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.OpenGroupGuidelinesActivity"
             android:screenOrientation="portrait"