mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
ff057d7110
# Conflicts: # app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java # app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationViewModel.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/dialogs/DownloadDialog.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt # app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java # app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java # app/src/main/java/org/thoughtcrime/securesms/dependencies/DatabaseModule.kt # app/src/main/java/org/thoughtcrime/securesms/preferences/BlockedContactsViewModel.kt # app/src/main/res/drawable/profile_picture_view_large_background.xml # app/src/main/res/layout/dialog_download.xml # app/src/main/res/layout/view_untrusted_attachment.xml # app/src/main/res/values/strings.xml # app/src/test/java/org/thoughtcrime/securesms/util/OpenGroupMigrationTests.kt # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/messages/Message.kt # libsession/src/main/java/org/session/libsession/utilities/bencode/Bencode.kt # libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java # libsignal/src/main/java/org/session/libsignal/utilities/IdPrefix.kt |
||
|---|---|---|
| .. | ||
| conversation_list_search.xml | ||
| media_overview_context.xml | ||
| media_preview.xml | ||
| mediapicker_default.xml | ||
| menu_apply.xml | ||
| menu_conversation.xml | ||
| menu_conversation_block.xml | ||
| menu_conversation_block_icon.xml | ||
| menu_conversation_call.xml | ||
| menu_conversation_closed_group.xml | ||
| menu_conversation_copy_session_id.xml | ||
| menu_conversation_expiration_off.xml | ||
| menu_conversation_expiration_on.xml | ||
| menu_conversation_item_action.xml | ||
| menu_conversation_muted.xml | ||
| menu_conversation_notification_settings.xml | ||
| menu_conversation_open_group.xml | ||
| menu_conversation_unblock.xml | ||
| menu_conversation_unmuted.xml | ||
| menu_done.xml | ||
| menu_edit_closed_group.xml | ||
| menu_home.xml | ||
| menu_message_request.xml | ||
| menu_pn_mode.xml | ||
| settings_general.xml | ||