jubb 38164ea23d Merge remote-tracking branch 'upstream/master' into calls ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/res/values/strings.xml # gradle.properties # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt		2022-02-08 09:58:57 +11:00
..
search	Add a global search (#834)	2022-02-07 17:06:27 +11:00
ConversationOptionsBottomSheet.kt	feat: Add the option to mark a conversation as read (#816)	2022-01-16 19:02:39 +02:00
ConversationView.kt	Make the unread message count 4 digits instead of 2. (#827)	2022-01-18 22:32:20 +11:00
HomeActivity.kt	Merge remote-tracking branch 'upstream/master' into calls	2022-02-08 09:58:57 +11:00
HomeAdapter.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
HomeLoader.kt	refactor: use hilt to provide DB instead of our own factory, inject it in some places where possible	2021-10-04 18:51:19 +11:00
NewConversationButtonSetView.kt	fix: Home activity crash handling from the seed view optimisations. added tests for that plus rendering URL crash	2021-08-09 10:06:58 +10:00
PathActivity.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
PathStatusView.kt	Re-organize files	2021-07-09 13:18:48 +10:00
UserDetailsBottomSheet.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00