mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/MediaGalleryAdapter.java # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/SessionContactDatabase.kt # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/res/values/strings.xml # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java |
||
---|---|---|
.. | ||
appearance | ||
widgets | ||
BlockedContactsActivity.kt | ||
BlockedContactsAdapter.kt | ||
BlockedContactsLayout.kt | ||
BlockedContactsPreference.kt | ||
BlockedContactsViewModel.kt | ||
ChangeUiModeDialog.kt | ||
ChatSettingsActivity.kt | ||
ChatsPreferenceFragment.java | ||
ClearAllDataDialog.kt | ||
CorrectedPreferenceFragment.java | ||
HelpSettingsActivity.kt | ||
ListPreferenceDialog.kt | ||
ListSummaryPreferenceFragment.java | ||
NotificationSettingsActivity.kt | ||
NotificationsPreferenceFragment.java | ||
PrivacySettingsActivity.kt | ||
PrivacySettingsPreferenceFragment.java | ||
QRCodeActivity.kt | ||
RadioOptionAdapter.kt | ||
SeedDialog.kt | ||
SettingsActivity.kt | ||
ShareLogsDialog.kt |