From 7cc2478f5c4c608aaa3244e0af66168706d987cd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Nov 2019 12:23:06 +0100 Subject: [PATCH] remove 'send indicate' setting and default to true --- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 3 +-- src/main/res/values/defaults.xml | 1 - src/main/res/values/strings.xml | 2 -- src/main/res/xml/preferences.xml | 5 ----- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index c0ec6d790..1eaa1861f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -2267,7 +2267,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke public void updateSendButton() { boolean hasAttachments = mediaPreviewAdapter != null && mediaPreviewAdapter.hasAttachments(); - boolean useSendButtonToIndicateStatus = activity != null && PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("send_button_status", getResources().getBoolean(R.bool.send_button_status)); final Conversation c = this.conversation; final Presence.Status status; final String text = this.binding.textinput == null ? "" : this.binding.textinput.getText().toString(); @@ -2277,7 +2276,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke } else { action = SendButtonTool.getAction(getActivity(), c, text); } - if (useSendButtonToIndicateStatus && c.getAccount().getStatus() == Account.State.ONLINE) { + if (c.getAccount().getStatus() == Account.State.ONLINE) { if (activity != null && activity.xmppConnectionService != null && activity.xmppConnectionService.getMessageArchiveService().isCatchingUp(c)) { status = Presence.Status.OFFLINE; } else if (c.getMode() == Conversation.MODE_SINGLE) { diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index a41fcbae2..bfe8ae953 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -19,7 +19,6 @@ auto light true - false recent false true diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 46a6f0311..75a929e3f 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -281,8 +281,6 @@ End time Enable quiet hours Notifications will be silenced during quiet hours - Send button indicates status - Colorize send button to indicate contact status Other Synchronize with bookmarks Join and leave group chats according to auto-join flag in your bookmarks. diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index ed67e1be8..b071233aa 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -156,11 +156,6 @@ android:key="use_green_background" android:summary="@string/pref_use_green_background_summary" android:title="@string/pref_use_green_background" /> -