aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-09-03 13:13:06 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-03 13:15:09 +0200
commitae804e73777cece70468c24d9afaf0354e12462f (patch)
treea96e425cd4a4c36e4171605d943564c7aa83fa92 /src
parent52f230a6b54dfd8eafe844a6c473ecee0d957a7e (diff)
code cleanup
Revert "don't set attach video as quick action" This reverts commit befcebb309daba9bb8afa453897debd89ba3f014. Revert "make 'record voice' as default quick action" This reverts commit 3cd7a1124c78da4d44c7d6ccadc4d2e379323486. Revert "keep CPU awake while compressing video" This reverts commit 0a22bd7bfb12a58b4de57490ef43bfe91c334689. Revert "revert 0a22bd7bfb12a58b4de57490ef43bfe91c334689" This reverts commit 7c4ad375806a704b44e6b5134fd25615cec2a71d.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java11
-rw-r--r--src/main/res/xml/preferences.xml2
2 files changed, 5 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index cb9a48085..b89e8351c 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -276,9 +276,6 @@ 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) {
@@ -952,7 +949,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
mEditMessage.requestFocus();
}
- enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE, CHOOSE_VIDEO}
+ enum SendButtonAction {TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE}
private int getSendButtonImageResource(SendButtonAction action, Presence.Status status) {
switch (action) {
@@ -1058,11 +1055,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", "voice");
+ String setting = activity.getPreferences().getString("quick_action", "recent");
if (!setting.equals("none") && UIHelper.receivedLocationQuestion(conversation.getLatestMessage())) {
setting = "location";
- } else if (setting.equals("voice")) {
- setting = activity.getPreferences().getString("recently_used_quick_action", "voice");
+ } else if (setting.equals("recent")) {
+ setting = activity.getPreferences().getString("recently_used_quick_action", "text");
}
switch (setting) {
case "photo":
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 14e8fa2a3..8c0ca30cd 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -21,7 +21,7 @@
android:summary="@string/pref_use_send_button_to_indicate_status_summary"
android:title="@string/pref_use_send_button_to_indicate_status" />
<ListPreference
- android:defaultValue="voice"
+ android:defaultValue="recent"
android:dialogTitle="@string/choose_quick_action"
android:entries="@array/quick_actions"
android:entryValues="@array/quick_action_values"