diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-13 10:45:30 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-13 10:45:30 +0200 |
commit | b756d61c45f5cd3a3c69dd93115ad558f41de216 (patch) | |
tree | 85bbb056fae16db58d6ca37992582819bedbbd4f /src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java | |
parent | e6ff1539b47d71142d8de0186149117d10f5ce72 (diff) |
show presence of other resources as template
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java b/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java index 6d13e7eac..0962d209b 100644 --- a/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java @@ -118,7 +118,7 @@ public class SetPresenceActivity extends XmppActivity implements View.OnClickLis xmppConnectionService.changeStatus(status, statusMessage); finish(); } else if (mAccount != null) { - if (mAccount.getPgpId() == 0 && hasPgp()) { + if (mAccount.getPgpId() == 0 || !hasPgp()) { xmppConnectionService.changeStatus(mAccount, status, statusMessage, true); finish(); } else { @@ -177,7 +177,7 @@ public class SetPresenceActivity extends XmppActivity implements View.OnClickLis if (mStatusMessage.getText().length() == 0 && message != null) { mStatusMessage.append(message); } - mTemplates = xmppConnectionService.databaseBackend.getPresenceTemplates(); + mTemplates = xmppConnectionService.getPresenceTemplates(mAccount); if (this.mPostponedActivityResult != null) { this.onActivityResult(mPostponedActivityResult.first, RESULT_OK, mPostponedActivityResult.second); } |