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
..
BootReceiver.java	WIP: clean up signal protocols (stickers)	2021-02-22 10:06:40 +11:00
DirectShareService.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
ExpirationListener.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
ExpiringMessageManager.java	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
GenericForegroundService.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
KeyCachingService.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
PanicResponderListener.java	WIP clean & make things compile	2021-01-19 10:48:02 +11:00
PersistentAlarmManagerListener.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
PersistentConnectionBootListener.java	Move files	2021-05-18 09:12:33 +10:00
QuickResponseService.java	Updated the code to use the network offset time everywhere relevant (#1111)	2023-03-31 10:11:30 +11:00
UpdateApkReadyListener.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
WebRtcCallService.kt	refactor on SignalAudioManager	2023-04-24 15:38:06 +10:00