diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-02 16:38:08 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-12-02 16:38:08 +0100 |
| commit | 0eaf7669f74f33fc9898a8acc8913140276aadd9 (patch) | |
| tree | 8a0381fdbce4b2ae0ea323c2f7b7a8cfe064d507 /src/main/java/eu/siacs/conversations/services | |
| parent | 02c6793ca9ae195494c7be86f7e0d7a6c08a04c0 (diff) | |
| parent | a3eb540f059f9123799c54d69201eba8a096e116 (diff) | |
Merge pull request #1545 from SamWhited/show_new_contact_request_messages
Show status message when contact requests presence
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -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); |