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
..
ControlMessageView.kt	Merge remote-tracking branch 'upstream/master' into calls	2022-02-08 09:58:57 +11:00
DeletedMessageView.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
DocumentView.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
LinkPreviewView.kt	Add a global search (#834)	2022-02-07 17:06:27 +11:00
MessageUtilities.kt	Add message date break extension function to reduce duplication	2021-12-06 06:34:32 +02:00
OpenGroupInvitationView.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
QuoteView.kt	Fix quote alignment (#837)	2022-02-07 15:38:07 +11:00
UntrustedAttachmentView.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
VisibleMessageContentView.kt	Add a global search (#834)	2022-02-07 17:06:27 +11:00
VisibleMessageView.kt	Add a global search (#834)	2022-02-07 17:06:27 +11:00
VoiceMessageView.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00