38164ea23d
# Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt # app/src/main/res/values/strings.xml # gradle.properties # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPollerV2.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt |
||
---|---|---|
.. | ||
widgets | ||
AppProtectionPreferenceFragment.java | ||
ChangeUiModeDialog.kt | ||
ChatSettingsActivity.kt | ||
ChatsPreferenceFragment.java | ||
ClearAllDataDialog.kt | ||
CorrectedPreferenceFragment.java | ||
ListSummaryPreferenceFragment.java | ||
NotificationSettingsActivity.kt | ||
NotificationsPreferenceFragment.java | ||
PrivacySettingsActivity.kt | ||
QRCodeActivity.kt | ||
SeedDialog.kt | ||
SettingsActivity.kt | ||
ShareLogsDialog.kt |