Harris 37f9ef3b1a Merge branch 'dev' into restore_log_report ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java		2021-10-06 14:57:51 +11:00
..
widgets	WIP clean & make things compile	2021-01-19 10:48:02 +11:00
AppProtectionPreferenceFragment.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
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	Implement authenticated message retrieval	2021-07-26 11:23:58 +10:00
CorrectedPreferenceFragment.java	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +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 hilt to provide DB instead of our own factory, inject it in some places where possible	2021-10-04 18:51:19 +11:00
SeedDialog.kt	Clean & debug	2021-07-09 13:56:38 +10:00
SettingsActivity.kt	feat: add share logs dialogs into settings activity	2021-09-23 13:49:32 +10:00
ShareLogsDialog.kt	feat: finish share log dialog	2021-09-23 15:47:43 +10:00