diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-11-15 17:44:51 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-11-15 17:44:51 +0100 |
| commit | 69ab8a2adbcaaaea3cbb9916ab0273d59f40c778 (patch) | |
| tree | d1973cfe4440ea07474b9e3b98d2e434aff126fc /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 7ba9854c22c6bcf07356cb018a0cbc2f49377f9f (diff) | |
| parent | 17cec63c14e15d1a78d124f718a4b51e4f4debd1 (diff) | |
Merge pull request #668 from SamWhited/auth-pinning
Auth mechanism pinning
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index bc609fb3..0742e17e 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -544,7 +544,7 @@ public class ConversationFragment extends Fragment { } else if (conversation.getMode() == Conversation.MODE_SINGLE) { makeFingerprintWarning(); } else if (!conversation.getMucOptions().online() - && conversation.getAccount().getStatus() == Account.STATUS_ONLINE) { + && conversation.getAccount().getStatus() == Account.State.ONLINE) { int error = conversation.getMucOptions().getError(); switch (error) { case MucOptions.ERROR_NICK_IN_USE: @@ -648,7 +648,7 @@ public class ConversationFragment extends Fragment { public void updateSendButton() { Conversation c = this.conversation; if (activity.useSendButtonToIndicateStatus() && c != null - && c.getAccount().getStatus() == Account.STATUS_ONLINE) { + && c.getAccount().getStatus() == Account.State.ONLINE) { if (c.getMode() == Conversation.MODE_SINGLE) { switch (c.getContact().getMostAvailableStatus()) { case Presences.CHAT: |