don’t check for inRoster when doing jingle with oneself. fixes #3947
This commit is contained in:
parent
d1490673bb
commit
090b3b18d0
|
@ -368,12 +368,13 @@ public abstract class XmppActivity extends ActionBarActivity {
|
|||
|
||||
public void selectPresence(final Conversation conversation, final PresenceSelector.OnPresenceSelected listener) {
|
||||
final Contact contact = conversation.getContact();
|
||||
if (!contact.showInRoster()) {
|
||||
showAddToRosterDialog(conversation.getContact());
|
||||
} else {
|
||||
if (contact.showInRoster() || contact.isSelf()) {
|
||||
final Presences presences = contact.getPresences();
|
||||
if (presences.size() == 0) {
|
||||
if (!contact.getOption(Contact.Options.TO)
|
||||
if (contact.isSelf()) {
|
||||
conversation.setNextCounterpart(null);
|
||||
listener.onPresenceSelected();
|
||||
} else if (!contact.getOption(Contact.Options.TO)
|
||||
&& !contact.getOption(Contact.Options.ASKING)
|
||||
&& contact.getAccount().getStatus() == Account.State.ONLINE) {
|
||||
showAskForPresenceDialog(contact);
|
||||
|
@ -391,6 +392,8 @@ public abstract class XmppActivity extends ActionBarActivity {
|
|||
} else {
|
||||
PresenceSelector.showPresenceSelectionDialog(this, conversation, listener);
|
||||
}
|
||||
} else {
|
||||
showAddToRosterDialog(conversation.getContact());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue