diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-04-11 23:00:31 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-04-11 23:00:31 +0200 |
commit | deac0df707099ef7ef6bd2420eb1df13a5a83ca1 (patch) | |
tree | 8b087218ad07c5511fe159dbafd5b4be64d23ce1 /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
parent | 17779e77002e99dabb73f4fa8f9596e9d220319b (diff) | |
parent | 82bfd8ac335b84613677ff857cf27c455fdf512d (diff) |
Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 4da9d101..b9a3b8da 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -41,6 +41,7 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.concurrent.ConcurrentLinkedQueue; +import de.tzur.conversations.Settings; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.crypto.PgpEngine; @@ -808,7 +809,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa public void updateSendButton() { Conversation c = this.conversation; - if (activity.useSendButtonToIndicateStatus() && c != null + if (Settings.SHOW_ONLINE_STATUS && c != null && c.getAccount().getStatus() == Account.State.ONLINE) { if (c.getMode() == Conversation.MODE_SINGLE) { switch (c.getContact().getMostAvailableStatus()) { |