diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-07-12 03:44:23 +0200 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-07-12 03:44:23 +0200 |
commit | 99935dd630b59d6cff05714c888b01e4c88c6351 (patch) | |
tree | e84968da60ea8bc8f117bed39cf430259f9958aa /src/eu/siacs/conversations/ui/XmppActivity.java | |
parent | 789383e5cb900baf55595e91f47f6d3ab4cec75e (diff) |
moved most of the message/presence generation into seperate classes
Diffstat (limited to '')
-rw-r--r-- | src/eu/siacs/conversations/ui/XmppActivity.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java index 7abb2cefb..217bae552 100644 --- a/src/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/eu/siacs/conversations/ui/XmppActivity.java @@ -152,7 +152,7 @@ public abstract class XmppActivity extends Activity { public void switchToConversation(Conversation conversation) { switchToConversation(conversation, null, false); } - + public void switchToConversation(Conversation conversation, String text, boolean newTask) { Intent viewConversationIntent = new Intent(this, @@ -174,7 +174,7 @@ public abstract class XmppActivity extends Activity { } startActivity(viewConversationIntent); } - + public void switchToContactDetails(Contact contact) { Intent intent = new Intent(this, ContactDetailsActivity.class); intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT); @@ -203,7 +203,9 @@ public abstract class XmppActivity extends Activity { public void success(Account account) { xmppConnectionService.databaseBackend .updateAccount(account); - xmppConnectionService.sendPresence(account); + xmppConnectionService.sendPresencePacket(account, + xmppConnectionService.getPresenceGenerator() + .sendPresence(account)); if (conversation != null) { conversation .setNextEncryption(Message.ENCRYPTION_PGP); @@ -233,7 +235,7 @@ public abstract class XmppActivity extends Activity { }); } - + protected void showAddToRosterDialog(final Conversation conversation) { String jid = conversation.getContactJid(); AlertDialog.Builder builder = new AlertDialog.Builder(this); @@ -253,7 +255,7 @@ public abstract class XmppActivity extends Activity { }); builder.create().show(); } - + public void selectPresence(final Conversation conversation, final OnPresenceSelected listener) { Contact contact = conversation.getContact(); |