aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-11-15 17:44:51 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-11-15 17:44:51 +0100
commit69ab8a2adbcaaaea3cbb9916ab0273d59f40c778 (patch)
treed1973cfe4440ea07474b9e3b98d2e434aff126fc /src/main/java/eu/siacs/conversations/ui/XmppActivity.java
parent7ba9854c22c6bcf07356cb018a0cbc2f49377f9f (diff)
parent17cec63c14e15d1a78d124f718a4b51e4f4debd1 (diff)
Merge pull request #668 from SamWhited/auth-pinning
Auth mechanism pinning
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/XmppActivity.java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/XmppActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 992ff979..98c9cdde 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -517,7 +517,7 @@ public abstract class XmppActivity extends Activity {
if (presences.size() == 0) {
if (!contact.getOption(Contact.Options.TO)
&& !contact.getOption(Contact.Options.ASKING)
- && contact.getAccount().getStatus() == Account.STATUS_ONLINE) {
+ && contact.getAccount().getStatus() == Account.State.ONLINE) {
showAskForPresenceDialog(contact);
} else if (!contact.getOption(Contact.Options.TO)
|| !contact.getOption(Contact.Options.FROM)) {