0x330a b6ff1deb64 Merge remote-tracking branch 'upstream/dev' into closed_groups ... # 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/helpers/SQLCipherOpenHelper.java # libsession-util/libsession-util # libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt # libsession/src/main/java/org/session/libsession/utilities/GroupUtil.kt # libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java # libsignal/protobuf/SignalService.proto # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2023-08-28 10:14:18 +10:00
..
appearance	Add button downstates to appearance settings screen (#1224)	2023-06-20 12:04:24 +09:30
widgets	Remove unused classes (#1289)	2023-08-08 14:40:36 +09:30
BlockedContactsActivity.kt	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
BlockedContactsAdapter.kt	Populate profile pic	2023-06-30 11:35:22 +09:30
BlockedContactsPreference.kt	Fix blocked contacts button (#1264)	2023-07-04 11:39:49 +09:30
BlockedContactsViewModel.kt	Merge remote-tracking branch 'upstream/dev' into closed_groups	2023-08-23 16:45:24 +10:00
CallToggleListener.kt	Utilise dialog dsl in RationaleDialog	2023-06-02 19:11:58 +09:30
ChatSettingsActivity.kt	New app theming (#913)	2022-10-12 17:05:55 +11:00
ChatsPreferenceFragment.java	Make the message trimming behaviour consistent across platform (#936)	2022-09-13 15:01:15 +10:00
ClearAllDataDialog.kt	Utilise dialog dsl in PrivacySettingsPreferenceFragment	2023-06-01 00:07:15 +09:30
CorrectedPreferenceFragment.java	Integrate shared libsession-util library (#1096)	2023-07-14 18:27:13 +10:00
HelpSettingsActivity.kt	Paged conversation recycler, update compile sdk version 31 (#1049)	2022-12-19 11:29:05 +11:00
ListPreferenceDialog.kt	Utilise dialog dsl in RationaleDialog	2023-06-02 19:11:58 +09:30
ListSummaryPreferenceFragment.java	New app theming (#913)	2022-10-12 17:05:55 +11:00
NotificationSettingsActivity.kt	Fix	2023-07-26 14:36:06 +09:30
NotificationsPreferenceFragment.kt	Disable fcm preference while register request is in flight	2023-08-16 13:27:28 +09:30
PrivacySettingsActivity.kt	[SES-1002] Synced blind requests (#1303)	2023-08-28 09:51:48 +10:00
PrivacySettingsPreferenceFragment.kt	[SES-1002] Synced blind requests (#1303)	2023-08-28 09:51:48 +10:00
QRCodeActivity.kt	refactor: Use view binding to replace Kotlin synthetics (#824)	2022-01-14 07:56:15 +02:00
RadioOptionAdapter.kt	Fix radio button selection transition (#1209)	2023-05-24 11:23:57 +09:30
SeedDialog.kt	Utilise dialog dsl in RationaleDialog	2023-06-02 19:11:58 +09:30
SettingsActivity.kt	Merge branch 'dev' into comp	2023-07-18 12:04:56 +09:30
ShareLogsDialog.kt	Fix shareLogs() canceled by early dismiss() (#1295)	2023-08-07 23:01:03 +09:30