diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-08-26 23:48:48 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-08-28 21:33:19 +0200 |
| commit | b3b3475e93a9b08f9e35edbf74673728b560ad3b (patch) | |
| tree | fc72bfce668b358310061c0a94736a0bd14e8b5d /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
| parent | 1f7f535d37b844dbd87447e1872c270edbca1302 (diff) | |
compress videos bigger than 10 MB before sending
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index b89e8351c..9bee75b5e 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -276,6 +276,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa case CHOOSE_PICTURE: activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_IMAGE); break; + case CHOOSE_VIDEO: + activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_VIDEO); + break; case CANCEL: if (conversation != null) { if (conversation.getCorrectingMessage() != null) { @@ -949,7 +952,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa mEditMessage.requestFocus(); } - enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE} + enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE, CHOOSE_VIDEO} private int getSendButtonImageResource(SendButtonAction action, Presence.Status status) { switch (action) { @@ -1031,6 +1034,19 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa default: return R.drawable.ic_send_picture_offline; } + case CHOOSE_VIDEO: + switch (status) { + case CHAT: + case ONLINE: + return R.drawable.ic_send_video_online; + case AWAY: + return R.drawable.ic_send_video_away; + case XA: + case DND: + return R.drawable.ic_send_video_dnd; + default: + return R.drawable.ic_send_video_offline; + } } return R.drawable.ic_send_text_offline; } @@ -1074,6 +1090,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa case "picture": action = SendButtonAction.CHOOSE_PICTURE; break; + case "video": + action = SendButtonAction.CHOOSE_VIDEO; + break; default: action = SendButtonAction.TEXT; break; |