diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-09-02 21:45:46 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-09-02 21:45:46 +0200 |
| commit | befcebb309daba9bb8afa453897debd89ba3f014 (patch) | |
| tree | f1debf20fa0600f4ca589cf7bdeb9931ea049e88 /src/main/java/de/pixart/messenger | |
| parent | 3cd7a1124c78da4d44c7d6ccadc4d2e379323486 (diff) | |
don't set attach video as quick action
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 3 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 22 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index 31f3121ac..1a285d76e 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -696,9 +696,6 @@ public class ConversationActivity extends XmppActivity case ATTACHMENT_CHOICE_CHOOSE_IMAGE: getPreferences().edit().putString("recently_used_quick_action", "picture").apply(); break; - case ATTACHMENT_CHOICE_CHOOSE_VIDEO: - getPreferences().edit().putString("recently_used_quick_action", "video").apply(); - break; } final Conversation conversation = getSelectedConversation(); final int encryption = conversation.getNextEncryption(); diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 9bee75b5e..cb9a48085 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1034,19 +1034,6 @@ 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; } @@ -1071,11 +1058,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa if (conference && c.getNextCounterpart() != null) { action = SendButtonAction.CANCEL; } else { - String setting = activity.getPreferences().getString("quick_action", "recent"); + String setting = activity.getPreferences().getString("quick_action", "voice"); if (!setting.equals("none") && UIHelper.receivedLocationQuestion(conversation.getLatestMessage())) { setting = "location"; - } else if (setting.equals("recent")) { - setting = activity.getPreferences().getString("recently_used_quick_action", "text"); + } else if (setting.equals("voice")) { + setting = activity.getPreferences().getString("recently_used_quick_action", "voice"); } switch (setting) { case "photo": @@ -1090,9 +1077,6 @@ 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; |