Morgan Pretty 796fdc6d1b Merge remote-tracking branch 'upstream/dev' into libsession-integration ...

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.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/preferences/BlockedContactsViewModel.kt
#	libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt

2023-05-31 14:48:46 +10:00

..

protobuf

feat: add in more config factory for volatile

2023-02-06 14:28:00 +11:00

src/main

Merge remote-tracking branch 'upstream/dev' into libsession-integration

2023-05-31 14:48:46 +10:00

.gitignore

restructure and unite service android/java to libsignal

2020-11-26 09:46:52 +11:00

build.gradle

Paged conversation recycler, update compile sdk version 31 (#1049)

2022-12-19 11:29:05 +11:00