mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix crash when ViewStub and contained view shared an id.

fork-5.53.8
Alex Hart 2022-04-29 10:42:45 -03:00 zatwierdzone przez Greyson Parrelli
rodzic 9ffa866907
commit 2d8de03e05
2 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
Wyświetl plik

@ -71,7 +71,7 @@ class MainActivityListHostFragment : Fragment(R.layout.main_activity_list_host_f
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
_toolbar = view.findViewById(R.id.toolbar) _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) notificationProfileStatus = view.findViewById(R.id.conversation_list_notification_profile_status)
proxyStatus = view.findViewById(R.id.conversation_list_proxy_status) proxyStatus = view.findViewById(R.id.conversation_list_proxy_status)
_searchAction = view.findViewById(R.id.search_action) _searchAction = view.findViewById(R.id.search_action)

4
app/src/main/res/layout/main_activity_list_host_fragment.xml
Wyświetl plik

@ -126,10 +126,10 @@
</org.thoughtcrime.securesms.util.views.DarkOverflowToolbar> </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
<ViewStub <ViewStub
android:id="@+id/toolbar_basic" android:id="@+id/toolbar_basic_stub"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:inflatedId="@id/toolbar_basic" android:inflatedId="@+id/toolbar_basic"
android:layout="@layout/conversation_list_archive_toolbar" android:layout="@layout/conversation_list_archive_toolbar"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />