aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-06-17 16:02:26 +0200
committerChristian Schneppe <christian@pix-art.de>2017-06-17 16:02:26 +0200
commit1711c6d52a878dd74d24dda0c6b5fbedbbad75da (patch)
tree56468925ac94e79198a4ceecc68d882a33cb5798 /src/main/java/de/pixart/messenger/ui/ConversationFragment.java
parentf59f2ad52688504813a739a2b667c04c2703a47a (diff)
allow recording of videos from attachment choice too
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index bfdcd41f1..d67474965 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -342,8 +342,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
if (tag instanceof SendButtonAction) {
SendButtonAction action = (SendButtonAction) tag;
switch (action) {
- case TAKE_PHOTO:
- activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_TAKE_PHOTO);
+ case TAKE_FROM_CAMERA:
+ activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_TAKE_FROM_CAMERA);
break;
case SEND_LOCATION:
activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_LOCATION);
@@ -1173,7 +1173,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
mSendingPgpMessage.set(false);
}
- enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE}
+ enum SendButtonAction {TEXT, TAKE_FROM_CAMERA, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE}
private int getSendButtonImageResource(SendButtonAction action, Presence.Status status) {
switch (action) {
@@ -1190,7 +1190,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
default:
return R.drawable.ic_send_text_offline;
}
- case TAKE_PHOTO:
+ case TAKE_FROM_CAMERA:
switch (status) {
case CHAT:
case ONLINE:
@@ -1287,7 +1287,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
}
switch (setting) {
case "photo":
- action = SendButtonAction.TAKE_PHOTO;
+ action = SendButtonAction.TAKE_FROM_CAMERA;
break;
case "location":
action = SendButtonAction.SEND_LOCATION;