0x330a 07e1d80654 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/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java # 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/dependencies/DatabaseComponent.kt # app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt # app/src/main/java/org/thoughtcrime/securesms/repository/ConversationRepository.kt # app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java # app/src/main/res/layout/activity_conversation_v2.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/jobs/BatchMessageReceiveJob.kt # libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # 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/snode/SnodeAPI.kt # libsignal/protobuf/SignalService.proto # libsignal/src/main/java/org/session/libsignal/utilities/Snode.kt		2023-07-18 11:39:03 +10:00
..
AbstractNotificationBuilder.java	New app theming (#913)	2022-10-12 17:05:55 +11:00
AndroidAutoHeardReceiver.java	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
AndroidAutoReplyReceiver.java	Merge remote-tracking branch 'upstream/dev' into disappearing-messages	2023-07-05 22:27:59 +10:00
BackgroundPollWorker.kt	ANR Defensive Coding (#1132)	2023-03-31 13:24:36 +11:00
DefaultMessageNotifier.java	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
DeleteNotificationReceiver.java	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
FailedNotificationBuilder.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
FcmUtils.kt	Re-organize files	2021-07-09 13:18:48 +10:00
LocaleChangedReceiver.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
LokiPushNotificationManager.kt	Add Session Id blinding (#862)	2022-08-10 18:17:48 +10:00
MarkReadReceiver.java	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
MultipleRecipientNotificationBuilder.java	Merge pull request #991 from ceokot/groups-push-message-sender-name	2023-01-24 14:52:50 +11:00
NotificationChannels.java	New app theming (#913)	2022-10-12 17:05:55 +11:00
NotificationItem.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
NotificationState.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
OptimizedMessageNotifier.java	feat: don't show notifications on HomeActivity.kt	2021-07-13 16:31:16 +10:00
PendingMessageNotificationBuilder.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
PushNotificationService.kt	fix: fallback on biometric key failures and retry creating key, fix up notification issues	2022-06-21 16:17:01 +10:00
RemoteReplyReceiver.java	Expire group update info and call messages	2022-12-22 10:42:09 +11:00
ReplyMethod.java	Move files	2021-05-18 16:03:47 +10:00
SingleRecipientNotificationBuilder.java	Merge pull request #991 from ceokot/groups-push-message-sender-name	2023-01-24 14:52:50 +11:00