Harris 4355322ee5 Merge branch '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/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2022-03-17 16:49:35 +11:00
..
search	Bug fixes and provide conversation tooltips (#851)	2022-02-28 17:23:58 +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 branch 'master' into calls	2022-03-17 16:49:35 +11:00
HomeAdapter.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
HomeLoader.kt	feat: Add conversation filtering for message requests (#830)	2022-03-04 08:46:39 +02:00
NewConversationButtonSetView.kt	Bug fixes and provide conversation tooltips (#851)	2022-02-28 17:23:58 +11: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