From f9b453d8790c1c0c37151d2304c0ff94c8b1805a Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian.schneppe@pix-art.de>
Date: Sun, 22 Mar 2020 18:24:50 +0100
Subject: add choose video from file to attachments menu

---
 src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 6 ++++++
 src/main/res/menu/choose_attachment.xml                        | 5 +++++
 src/main/res/menu/fragment_conversation.xml                    | 5 +++++
 src/main/res/values/strings.xml                                | 1 +
 4 files changed, 17 insertions(+)

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 7df639222..82b3cfca1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -632,6 +632,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         popup.setOnMenuItemClickListener(attachmentItem -> {
             switch (attachmentItem.getItemId()) {
                 case R.id.attach_choose_picture:
+                case R.id.attach_choose_video:
                 case R.id.attach_take_picture:
                 case R.id.attach_record_video:
                 case R.id.attach_choose_file:
@@ -996,6 +997,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             case ATTACHMENT_CHOICE_CHOOSE_FILE:
             case ATTACHMENT_CHOICE_RECORD_VIDEO:
             case ATTACHMENT_CHOICE_RECORD_VOICE:
+            case ATTACHMENT_CHOICE_CHOOSE_VIDEO:
                 final Attachment.Type type = requestCode == ATTACHMENT_CHOICE_RECORD_VOICE ? Attachment.Type.RECORDING : Attachment.Type.FILE;
                 final List<Attachment> fileUris = Attachment.extractAttachments(getActivity(), data, type);
                 mediaPreviewAdapter.addMediaPreviews(fileUris);
@@ -1434,6 +1436,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                 handleEncryptionSelection(item);
                 break;
             case R.id.attach_choose_picture:
+            case R.id.attach_choose_video:
             case R.id.attach_take_picture:
             case R.id.attach_record_video:
             case R.id.attach_choose_file:
@@ -1494,6 +1497,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
             case R.id.attach_choose_picture:
                 attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
                 break;
+            case R.id.attach_choose_video:
+                attachFile(ATTACHMENT_CHOICE_CHOOSE_VIDEO);
+                break;
             case R.id.attach_take_picture:
                 attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
                 break;
diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml
index a9a57404d..96e540f59 100644
--- a/src/main/res/menu/choose_attachment.xml
+++ b/src/main/res/menu/choose_attachment.xml
@@ -11,6 +11,11 @@
         android:icon="?attr/ic_attach_photo"
         android:title="@string/attach_choose_picture" />
 
+    <item
+        android:id="@+id/attach_choose_video"
+        android:icon="?attr/ic_attach_video"
+        android:title="@string/attach_choose_video" />
+
     <item
         android:id="@+id/attach_take_picture"
         android:icon="?attr/ic_attach_camera"
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 8858d941d..ac7d8a1d2 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -42,6 +42,11 @@
                 android:icon="?attr/ic_attach_photo"
                 android:title="@string/attach_choose_picture" />
 
+            <item
+                android:id="@+id/attach_choose_video"
+                android:icon="?attr/ic_attach_video"
+                android:title="@string/attach_choose_video" />
+
             <item
                 android:id="@+id/attach_take_picture"
                 android:icon="?attr/ic_attach_camera"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 280eeaceb..7fa728f54 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1004,4 +1004,5 @@
     <string name="show_videos_images_only">Only images/videos</string>
     <string name="show_avatar">Show avatar</string>
     <string name="action_delete">Delete</string>
+    <string name="attach_choose_video">Choose video</string>
 </resources>
-- 
cgit v1.2.3