diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-08-26 20:28:26 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-08-28 20:57:18 +0200 |
| commit | e21da762dc99cfa6e8881a5c1ac2aa892de7762e (patch) | |
| tree | 413cfe527f75ac73857ef9ad51f3c5b1c1c16eaf /src/main/java/de/pixart/messenger/ui/util | |
| parent | 3e5c026f31b2403ea8e2387c1360bedb1ca4c27a (diff) | |
make QUICK_SHARE_ATTACHMENT_CHOICE configurable
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/util')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java b/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java index 291edb822..b4b0ecc28 100644 --- a/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java +++ b/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java @@ -38,10 +38,9 @@ import de.pixart.messenger.R; import de.pixart.messenger.entities.Conversation; import de.pixart.messenger.entities.Presence; import de.pixart.messenger.ui.ConversationFragment; +import de.pixart.messenger.ui.SettingsActivity; import de.pixart.messenger.utils.UIHelper; -import static de.pixart.messenger.Config.QUICK_SHARE_ATTACHMENT_CHOICE; - public class SendButtonTool { public static SendButtonAction getAction(Activity activity, Conversation c, String text) { @@ -61,12 +60,13 @@ public class SendButtonTool { if (conference && c.getNextCounterpart() != null) { return SendButtonAction.CANCEL; } else { - if (QUICK_SHARE_ATTACHMENT_CHOICE && AttachmentsVisible(c)) { + boolean quickShareChoice = preferences.getBoolean(SettingsActivity.QUICK_SHARE_ATTACHMENT_CHOICE, activity.getResources().getBoolean(R.bool.quick_share_attachment_choice)); + String setting = preferences.getString("quick_action", activity.getResources().getString(R.string.quick_action)); + if (quickShareChoice && AttachmentsVisible(c)) { return SendButtonAction.CHOOSE_ATTACHMENT; - } else if (QUICK_SHARE_ATTACHMENT_CHOICE && !AttachmentsVisible(c)) { + } else if (quickShareChoice && !AttachmentsVisible(c)) { return SendButtonAction.TEXT; } else { - String setting = preferences.getString("quick_action", activity.getResources().getString(R.string.quick_action)); if (!setting.equals("none") && UIHelper.receivedLocationQuestion(c.getLatestMessage())) { return SendButtonAction.SEND_LOCATION; } else { @@ -198,5 +198,4 @@ public class SendButtonTool { return res; } - }
\ No newline at end of file |