diff --git a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt index 8e3401b6f1..683c5908ba 100644 --- a/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt +++ b/vector/src/main/java/im/vector/app/features/attachments/AttachmentTypeSelectorView.kt @@ -69,7 +69,6 @@ class AttachmentTypeSelectorView(context: Context, views.attachmentCameraButton.configure(Type.CAMERA) views.attachmentFileButton.configure(Type.FILE) views.attachmentStickersButton.configure(Type.STICKER) - views.attachmentAudioButton.configure(Type.AUDIO) views.attachmentContactButton.configure(Type.CONTACT) views.attachmentPollButton.configure(Type.POLL) width = LinearLayout.LayoutParams.MATCH_PARENT @@ -128,7 +127,6 @@ class AttachmentTypeSelectorView(context: Context, Type.GALLERY -> views.attachmentGalleryButton Type.FILE -> views.attachmentFileButton Type.STICKER -> views.attachmentStickersButton - Type.AUDIO -> views.attachmentAudioButton Type.CONTACT -> views.attachmentContactButton Type.POLL -> views.attachmentPollButton }.let { @@ -212,7 +210,6 @@ class AttachmentTypeSelectorView(context: Context, GALLERY(PERMISSIONS_EMPTY, R.string.tooltip_attachment_gallery), FILE(PERMISSIONS_EMPTY, R.string.tooltip_attachment_file), STICKER(PERMISSIONS_EMPTY, R.string.tooltip_attachment_sticker), - AUDIO(PERMISSIONS_EMPTY, R.string.tooltip_attachment_audio), CONTACT(PERMISSIONS_FOR_PICKING_CONTACT, R.string.tooltip_attachment_contact), POLL(PERMISSIONS_EMPTY, R.string.tooltip_attachment_poll) } diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt index 620730cb4d..8c180d50e2 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt @@ -1163,12 +1163,6 @@ class RoomDetailFragment @Inject constructor( } } - private val attachmentAudioActivityResultLauncher = registerStartForActivityResult { - if (it.resultCode == Activity.RESULT_OK) { - attachmentsHelper.onAudioResult(it.data) - } - } - private val attachmentContactActivityResultLauncher = registerStartForActivityResult { if (it.resultCode == Activity.RESULT_OK) { attachmentsHelper.onContactResult(it.data) @@ -2218,7 +2212,6 @@ class RoomDetailFragment @Inject constructor( ) AttachmentTypeSelectorView.Type.FILE -> attachmentsHelper.selectFile(attachmentFileActivityResultLauncher) AttachmentTypeSelectorView.Type.GALLERY -> attachmentsHelper.selectGallery(attachmentMediaActivityResultLauncher) - AttachmentTypeSelectorView.Type.AUDIO -> attachmentsHelper.selectAudio(attachmentAudioActivityResultLauncher) AttachmentTypeSelectorView.Type.CONTACT -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher) AttachmentTypeSelectorView.Type.STICKER -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment) AttachmentTypeSelectorView.Type.POLL -> navigator.openCreatePoll(requireContext(), roomDetailArgs.roomId) diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml index 463d05d95d..77c25572c8 100644 --- a/vector/src/main/res/layout/view_attachment_type_selector.xml +++ b/vector/src/main/res/layout/view_attachment_type_selector.xml @@ -82,17 +82,6 @@ android:src="@drawable/ic_attachment_camera" app:tint="?colorPrimary" /> - - - Send images and videos Upload file Send sticker - WILL BE REMOVED Open contacts Create poll