Harris 4355322ee5 Merge branch 'master' into calls ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2022-03-17 16:49:35 +11:00
..
widgets	WIP clean & make things compile	2021-01-19 10:48:02 +11:00
AppProtectionPreferenceFragment.java	refactor: compile errors and refactoring to view binding	2022-02-08 12:04:55 +11:00
ChangeUiModeDialog.kt	Clean & debug	2021-07-09 13:56:38 +10:00
ChatSettingsActivity.kt	Re-organize files & delete unused code	2021-07-09 11:14:21 +10:00
ChatsPreferenceFragment.java	Move files	2021-05-18 09:12:33 +10:00
ClearAllDataDialog.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
CorrectedPreferenceFragment.java	Add a global search (#834)	2022-02-07 17:06:27 +11:00
ListSummaryPreferenceFragment.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
NotificationSettingsActivity.kt	Re-organize files & delete unused code	2021-07-09 11:14:21 +10:00
NotificationsPreferenceFragment.java	clean up unused code	2021-02-23 15:56:42 +11:00
PrivacySettingsActivity.kt	Re-organize files & delete unused code	2021-07-09 11:14:21 +10:00
QRCodeActivity.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
SeedDialog.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
SettingsActivity.kt	feat: Add conversation filtering for message requests (#830)	2022-03-04 08:46:39 +02:00
ShareLogsDialog.kt	Bug fixes and provide conversation tooltips (#851)	2022-02-28 17:23:58 +11:00