diff options
author | Sam Whited <sam@samwhited.com> | 2015-11-04 20:56:45 -0600 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2015-12-02 08:50:52 -0600 |
commit | a3eb540f059f9123799c54d69201eba8a096e116 (patch) | |
tree | 4d48cf123708edb1ae840cb181ca6f0969f21356 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
parent | e1aeb376ac80af214947143572cc381660fe3023 (diff) |
Show status message when contact requests presence
Remove presence when conversation closed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index fff8a984..8e4c9c68 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1322,6 +1322,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa leaveMuc(conversation); } else { conversation.endOtrIfNeeded(); + if (conversation.getContact().getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) { + Log.d(Config.LOGTAG, "Canceling presence request from " + conversation.getJid().toString()); + sendPresencePacket( + conversation.getAccount(), + mPresenceGenerator.stopPresenceUpdatesTo(conversation.getContact()) + ); + } } this.databaseBackend.updateConversation(conversation); this.conversations.remove(conversation); |