aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-02 18:19:26 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-02 18:19:26 +0100
commit4a1a59f0c8ce99fd42909fb472179daec5065625 (patch)
treec7946ed356111082e1e296a933b30a71f8b25314 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
parent01bad127084cdfc623c57be18e123ef8ff6655b0 (diff)
parentae84ff2f0c01be832075d16556db2136c1b5ac55 (diff)
Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into singpolyma-disco-caps
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 94af846ea..43ca5a545 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -72,6 +72,7 @@ import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.entities.Message;
import eu.siacs.conversations.entities.MucOptions;
import eu.siacs.conversations.entities.MucOptions.OnRenameListener;
+import eu.siacs.conversations.entities.Presence;
import eu.siacs.conversations.entities.Presences;
import eu.siacs.conversations.entities.Transferable;
import eu.siacs.conversations.entities.TransferablePlaceholder;
@@ -596,13 +597,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
return getPreferences().getString("picture_compression", "auto");
}
- private int getTargetPresence() {
+ private Presence.Status getTargetPresence() {
if (xaOnSilentMode() && isPhoneSilenced()) {
- return Presences.XA;
+ return Presence.Status.XA;
} else if (awayWhenScreenOff() && !isInteractive()) {
- return Presences.AWAY;
+ return Presence.Status.AWAY;
} else {
- return Presences.ONLINE;
+ return Presence.Status.ONLINE;
}
}