8 Commits

Author	SHA1	Message	Date
0x330a	cf27760d01	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/MediaGalleryAdapter.java # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/res/values/strings.xml # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java	2023-01-25 14:17:22 +11:00
Morgan Pretty	1a28fd2a9e	Added code to migrate from SQLCipher 3 to 4	2023-01-05 16:56:52 +11:00
0x330a	75a10f71c3	feat: add in remove attachments but not link previews	2022-11-23 14:02:51 +11:00
Harris	0516526923	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
Niels Andriesse	6243443262	Move files	2021-05-18 16:11:38 +10:00
Ryan ZHAO	20ec889730	clean up V1 closed group	2021-02-17 16:09:36 +11:00
Ryan ZHAO	6cd00aec77	WIP clean	2021-01-15 15:36:30 +11:00
Ryan ZHAO	7a66a47520	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00

Renamed from session/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java (Browse further)