SessionHero01 0bc933dcec

Merge remote-tracking branch 'origin/dev' into closed_groups ...

# 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/database/MmsDatabase.kt
#	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/ThreadDatabase.java
#	app/src/main/java/org/thoughtcrime/securesms/database/model/ThreadRecord.java
#	app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsViewModel.kt
#	app/src/main/res/layout/activity_conversation_v2.xml
#	app/src/test/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModelTest.kt

2024-10-22 15:57:22 +11:00

..

src

Merge remote-tracking branch 'origin/dev' into closed_groups

2024-10-22 15:57:22 +11:00

.gitignore

restructure and unite service android/java to libsignal

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

build.gradle

Strings work

2024-09-06 11:21:03 +10:00