0x330a ff057d7110 Merge remote-tracking branch 'upstream/dev' into closed_groups ... # Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java # 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/MessageDetailActivity.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt # app/src/main/res/drawable/profile_picture_view_large_background.xml # app/src/main/res/layout/dialog_download.xml # app/src/main/res/layout/view_untrusted_attachment.xml # app/src/main/res/values/strings.xml # app/src/test/java/org/thoughtcrime/securesms/util/OpenGroupMigrationTests.kt # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt # libsession/src/main/java/org/session/libsession/utilities/bencode/Bencode.kt # libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java # libsignal/src/main/java/org/session/libsignal/utilities/IdPrefix.kt		2023-08-23 16:45:24 +10:00
..
adapter	Add SelectableItem<>	2023-05-22 15:46:12 +09:30
dynamiclanguage	WIP clean	2021-01-15 16:51:53 +11:00
AbstractCursorLoader.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
ActivityUtilities.kt	Remove BaseDialog and utilise dialog DSL	2023-05-31 12:43:51 +09:30
AnimationCompleteListener.java	Clean	2021-07-09 15:45:15 +10:00
AsyncLoader.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
AttachmentUtil.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
AttachmentUtil.kt	refactor: auto attachment downloads for specific threads, manual attachment downloads triggered from UI and correct visual state representation	2022-11-11 12:52:00 +11:00
AvatarPlaceholderGenerator.kt	Add Session Id blinding (#862)	2022-08-10 18:17:48 +10:00
BitmapDecodingException.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
BitmapUtil.java	Move files	2021-05-18 09:12:33 +10:00
Broadcaster.kt	Re-organize files	2021-07-09 13:18:48 +10:00
CallNotificationBuilder.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
CharacterCalculator.java	clean up unused utils	2021-02-23 16:35:36 +11:00
CloseableLiveData.java	clean	2021-01-29 16:35:47 +11:00
CommunicationActions.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
ConfigurationMessageUtilities.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
ContactUtilities.kt	Add Session Id blinding (#862)	2022-08-10 18:17:48 +10:00
ContextUtil.java	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
CursorUtil.java	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
CursorUtil.kt	Refactor MmsDatabase (#1169)	2023-05-01 17:16:48 +10:00
DateUtils.java	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
DrawableUtil.java	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
FileProviderUtil.java	clean up unused utils	2021-02-23 16:35:36 +11:00
GeneralUtilities.kt	Add 50 dp buffer to isScrolledToBottom (#1228)	2023-06-14 10:34:49 +09:30
GlowView.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
InsetItemDecoration.kt	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
IntentUtils.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
IP2Country.kt	Add a global search (#834)	2022-02-07 17:06:27 +11:00
LifecycleDisposable.kt	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
LimitedInputStream.java	clean	2021-01-29 16:35:47 +11:00
ListUtil.java	Use streams and collectors supported below API 24 in StaticEmojiPageModel (#966)	2022-09-13 17:52:09 +10:00
LongClickCopySpan.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
LRUCache.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
MediaUtil.java	Move files	2021-05-18 09:12:33 +10:00
MemoryFileUtil.java	clean up unused utils	2021-02-23 16:35:36 +11:00
MmsCharacterCalculator.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
MockDataGenerator.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
NumberUtil.kt	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
ParcelUtil.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
PointFUtilities.kt	Re-organize files	2021-07-09 13:18:48 +10:00
PushCharacterCalculator.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
QRCodeUtilities.kt	Re-organize files	2021-07-09 13:18:48 +10:00
ResUtil.java	Move files	2021-05-18 09:12:33 +10:00
Rfc5724Uri.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
SaveAttachmentTask.kt	Utilise dialog dsl in RationaleDialog	2023-06-02 19:11:58 +09:30
ScanQRCodeFragment.kt	Menu redesign (#958)	2022-09-30 13:32:07 +10:00
ScanQRCodePlaceholderFragment.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
ScanQRCodeWrapperFragment.kt	Menu redesign (#958)	2022-09-30 13:32:07 +10:00
ScreenDensity.java	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
SearchUtil.java	Add a global search (#834)	2022-02-07 17:06:27 +11:00
SessionMetaProtocol.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
SharedConfigUtils.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
SimpleTextWatcher.java	Remove contactshare package (#1288)	2023-08-09 14:12:07 +09:30
SingleLiveEvent.java	Move files	2021-05-18 09:12:33 +10:00
SmsCharacterCalculator.java	Move files	2021-05-18 09:12:33 +10:00
SpanUtil.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
SqlUtil.kt	Use streams and collectors supported below API 24 in StaticEmojiPageModel (#966)	2022-09-13 17:52:09 +10:00
StableIdGenerator.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
State.kt	Re-organize files	2021-07-09 13:18:48 +10:00
StickyHeaderDecoration.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
Stopwatch.java	Move files	2021-05-18 09:12:33 +10:00
StreamUtil.java	Move files	2021-05-18 09:12:33 +10:00
Trimmer.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
UiModeUtilities.kt	New app theming (#913)	2022-10-12 17:05:55 +11:00
Util.java	Add emoji reacts support (#889)	2022-09-04 21:03:32 +10:00
VersionTracker.kt	WIP clean	2021-01-15 16:51:53 +11:00
ViewGroupUtilities.kt	Re-organize files	2021-07-09 13:18:48 +10:00
ViewUtilities.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
WorkerThread.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00