0x330a 325abe020a Merge remote-tracking branch 'upstream/dev' into disappearing-messages ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java # app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt # app/src/main/res/layout/activity_conversation_v2_action_bar.xml # app/src/main/res/layout/expiration_dialog.xml # app/src/main/res/menu/menu_conversation_expiration.xml # app/src/main/res/menu/menu_conversation_expiration_on.xml # app/src/main/res/values/strings.xml # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/messages/control/MessageRequestResponse.kt # libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingMediaMessage.java # libsession/src/main/java/org/session/libsession/messaging/messages/signal/IncomingTextMessage.java # libsession/src/main/java/org/session/libsession/messaging/messages/signal/OutgoingMediaMessage.java # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt # libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageBuilder.kt # libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt # libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2023-07-05 22:27:59 +10:00
..
expiration	fix: legacy message deletions working better now	2023-01-11 17:25:38 +11:00
paging	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
start	New app theming (#913)	2022-10-12 17:05:55 +11:00
v2	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
ConversationActionBarView.kt	fix: standardise call menu recipient function to share with the new action bar to center better. issue with closed group creation on multi device potentially	2023-01-16 16:54:16 +11:00