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
..
animation	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
attachments	Swallow screenshot exceptions	2023-04-26 16:31:28 +09:30
audio	Add a global search (#834)	2022-02-07 17:06:27 +11:00
avatar
calls	Add one on one calls over clearnet (#864)	2022-04-19 14:25:40 +10:00
components	Fix ID divider color	2023-05-23 18:41:04 +09:30
contacts	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
contactshare
conversation	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
crypto	Merge branch 'dev' into sync-everything	2023-05-30 11:34:34 +09:30
database	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
dependencies	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
dms	Menu redesign (#958)	2022-09-30 13:32:07 +10:00
emoji	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
events
giph	Performance improvements and bug fixes (#869)	2022-06-08 17:12:34 +10:00
glide	New app theming (#913)	2022-10-12 17:05:55 +11:00
groups	Responded to PR comments	2023-06-07 15:02:32 +10:00
home	Updated the dialog dim amount to match the style guide	2023-06-06 16:57:27 +10:00
imageeditor
jobmanager	further clean up	2023-05-10 15:36:10 +10:00
keyboard/emoji	New app theming (#913)	2022-10-12 17:05:55 +11:00
linkpreview	Add one on one calls over clearnet (#864)	2022-04-19 14:25:40 +10:00
logging	...and the rest	2023-05-05 12:32:54 +09:30
longmessage	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
mediapreview
mediasend	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
messagerequests	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
mms	Increased file upload limits to 10Mb	2023-02-06 14:22:26 +11:00
net
notifications	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
onboarding	Tweaked some open group handling and a couple of onboarding issues	2023-01-13 15:56:14 +11:00
permissions	Add accessibility tags (#1054)	2023-04-04 11:33:17 +10:00
preferences	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
profiles
providers	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
qr
reactions	New app theming (#913)	2022-10-12 17:05:55 +11:00
repository	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
scribbles
search	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
service	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
sms
sskenvironment	make RetrieveProfileAvatarJob work	2023-05-09 14:14:49 +10:00
util	Add 50 dp buffer to isScrolledToBottom (#1228)	2023-06-14 10:34:49 +09:30
video	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
webrtc	minor refactor	2023-04-24 15:50:53 +10:00
AppContext.kt	Replace default action message request behavior (#927)	2022-09-13 15:06:46 +10:00
ApplicationContext.java	clean	2023-05-11 12:16:37 +10:00
BaseActionBarActivity.java	Fix status and nav bar colors (#1165)	2023-04-26 14:48:34 +10:00
BaseActivity.java
BindableConversationItem.java
DatabaseUpgradeActivity.java
DummyActivity.java
MediaDocumentsAdapter.java
MediaGalleryAdapter.java	Fixed a few bugs and some optimisations	2023-01-13 15:56:14 +11:00
MediaOverviewActivity.java	Updated the code to use the network offset time everywhere relevant (#1111)	2023-03-31 10:11:30 +11:00
MediaPreviewActivity.java	Updated the code to use the network offset time everywhere relevant (#1111)	2023-03-31 10:11:30 +11:00
MessageDetailsRecipientAdapter.java
MuteDialog.java	feat: add notification types for all / mentions only or none with UI and push logic	2021-07-20 16:06:59 +10:00
PassphrasePromptActivity.java	Fixed a few bugs, added logging and removed some old code	2023-02-03 13:33:52 +11:00
PassphraseRequiredActionBarActivity.java
ShareActivity.java	refactor: move db module init before injection and replace ApplicationContext db component access to static function to get the component	2021-10-05 10:58:02 +11:00
ShortcutLauncherActivity.java
Unbindable.java