sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove 'send indicate' setting and default to true

This commit is contained in:
Daniel Gultsch 2019-11-08 12:23:06 +01:00
parent b320dea4d9
commit 7cc2478f5c
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -2267,7 +2267,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
public void updateSendButton() { public void updateSendButton() {
boolean hasAttachments = mediaPreviewAdapter != null && mediaPreviewAdapter.hasAttachments(); 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 Conversation c = this.conversation;
final Presence.Status status; final Presence.Status status;
final String text = this.binding.textinput == null ? "" : this.binding.textinput.getText().toString(); 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 { } else {
action = SendButtonTool.getAction(getActivity(), c, text); 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)) { if (activity != null && activity.xmppConnectionService != null && activity.xmppConnectionService.getMessageArchiveService().isCatchingUp(c)) {
status = Presence.Status.OFFLINE; status = Presence.Status.OFFLINE;
} else if (c.getMode() == Conversation.MODE_SINGLE) { } else if (c.getMode() == Conversation.MODE_SINGLE) {

1
src/main/res/values/defaults.xml
View File

@ -19,7 +19,6 @@
<string name="picture_compression">auto</string> <string name="picture_compression">auto</string>
<string name="theme">light</string> <string name="theme">light</string>
<bool name="use_green_background">true</bool> <bool name="use_green_background">true</bool>
<bool name="send_button_status">false</bool>
<string name="quick_action">recent</string> <string name="quick_action">recent</string>
<bool name="show_dynamic_tags">false</bool> <bool name="show_dynamic_tags">false</bool>
<bool name="btbv">true</bool> <bool name="btbv">true</bool>

2
src/main/res/values/strings.xml
View File

@ -281,8 +281,6 @@
<string name="title_pref_quiet_hours_end_time">End time</string> <string name="title_pref_quiet_hours_end_time">End time</string>
<string name="title_pref_enable_quiet_hours">Enable quiet hours</string> <string name="title_pref_enable_quiet_hours">Enable quiet hours</string>
<string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string> <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
<string name="pref_expert_options_other">Other</string> <string name="pref_expert_options_other">Other</string>
<string name="pref_autojoin">Synchronize with bookmarks</string> <string name="pref_autojoin">Synchronize with bookmarks</string>
<string name="pref_autojoin_summary">Join and leave group chats according to auto-join flag in your bookmarks.</string> <string name="pref_autojoin_summary">Join and leave group chats according to auto-join flag in your bookmarks.</string>

5
src/main/res/xml/preferences.xml
View File

@ -156,11 +156,6 @@
android:key="use_green_background" android:key="use_green_background"
android:summary="@string/pref_use_green_background_summary" android:summary="@string/pref_use_green_background_summary"
android:title="@string/pref_use_green_background" /> android:title="@string/pref_use_green_background" />
<CheckBoxPreference
android:defaultValue="@bool/send_button_status"
android:key="send_button_status"
android:summary="@string/pref_use_send_button_to_indicate_status_summary"
android:title="@string/pref_use_send_button_to_indicate_status" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="@bool/show_dynamic_tags" android:defaultValue="@bool/show_dynamic_tags"
android:key="show_dynamic_tags" android:key="show_dynamic_tags"