From 2d8de03e05ccde1c724affa42c27ad7eb92199bb Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 29 Apr 2022 10:42:45 -0300
Subject: [PATCH] Fix crash when ViewStub and contained view shared an id.

---
 .../securesms/main/MainActivityListHostFragment.kt            | 2 +-
 app/src/main/res/layout/main_activity_list_host_fragment.xml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
index 214e2eddbe..6f59b2c107 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -71,7 +71,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     _toolbar = view.findViewById(R.id.toolbar)
-    _basicToolbar = Stub(view.findViewById(R.id.toolbar_basic))
+    _basicToolbar = Stub(view.findViewById(R.id.toolbar_basic_stub))
     notificationProfileStatus = view.findViewById(R.id.conversation_list_notification_profile_status)
     proxyStatus = view.findViewById(R.id.conversation_list_proxy_status)
     _searchAction = view.findViewById(R.id.search_action)
diff --git a/app/src/main/res/layout/main_activity_list_host_fragment.xml b/app/src/main/res/layout/main_activity_list_host_fragment.xml
index b82145da47..6aec3052e2 100644
--- a/app/src/main/res/layout/main_activity_list_host_fragment.xml
+++ b/app/src/main/res/layout/main_activity_list_host_fragment.xml
@@ -126,10 +126,10 @@
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
 
     <ViewStub
-        android:id="@+id/toolbar_basic"
+        android:id="@+id/toolbar_basic_stub"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:inflatedId="@id/toolbar_basic"
+        android:inflatedId="@+id/toolbar_basic"
         android:layout="@layout/conversation_list_archive_toolbar"
         android:minHeight="?attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent" />