Harris 4355322ee5 Merge branch 'master' into calls ... # Conflicts: # app/build.gradle # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt # app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt # app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt # app/src/main/java/org/thoughtcrime/securesms/database/model/DisplayRecord.java # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # libsession/src/main/java/org/session/libsession/database/StorageProtocol.kt # libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt # libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt # libsignal/src/main/java/org/session/libsignal/protos/SignalServiceProtos.java		2022-03-17 16:49:35 +11:00
..
conversation_list_search.xml	refactor: extract hardcoded strings	2021-05-21 16:49:06 +10:00
media_overview_context.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
media_preview.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
mediapicker_default.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_apply.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_conversation.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_block.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_call.xml	feat: added basic call functionality	2021-08-30 16:39:47 +10:00
menu_conversation_closed_group.xml	refactor: only display notification settings when the conversation is unmuted, notify the conversation list listeners when notify settings are updated	2021-07-26 14:50:43 +10:00
menu_conversation_copy_session_id.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_expiration_off.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_expiration_on.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_item_action.xml	Clean & fix inconsistent padding	2021-07-14 14:53:45 +10:00
menu_conversation_muted.xml	Re-implement conversation item context menu	2021-06-07 11:37:20 +10:00
menu_conversation_notification_settings.xml	refactor: only display notification settings when the conversation is unmuted, notify the conversation list listeners when notify settings are updated	2021-07-26 14:50:43 +10:00
menu_conversation_open_group.xml	refactor: only display notification settings when the conversation is unmuted, notify the conversation list listeners when notify settings are updated	2021-07-26 14:50:43 +10:00
menu_conversation_unblock.xml	Populate conversation menu	2021-06-07 09:48:01 +10:00
menu_conversation_unmuted.xml	Re-implement conversation item context menu	2021-06-07 11:37:20 +10:00
menu_done.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_edit_closed_group.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00
menu_home.xml	Add a global search (#834)	2022-02-07 17:06:27 +11:00
menu_message_request.xml	feat: Add conversation filtering for message requests (#830)	2022-03-04 08:46:39 +02:00
menu_pn_mode.xml	refactor: extract hardcoded strings	2021-05-21 16:49:06 +10:00
settings_general.xml	restructure and unite service android/java to libsignal	2020-11-26 09:46:52 +11:00