aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-10 14:12:08 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-10 14:12:08 +0200
commit644473205ab261157f500470d496999db665d75f (patch)
treeca059f9b294bfaa79c6ed8dfb3d6fedddcaecf06 /src/eu/siacs/conversations/services
parentba0bedc5facabc573023925660d7d49b27d5c68c (diff)
incomming jingle packets are routed to their connection. added presence chooser in gui
Diffstat (limited to 'src/eu/siacs/conversations/services')
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index f5b19d53..1de6f6cc 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -372,7 +372,7 @@ public class XmppConnectionService extends Service {
@Override
public void onJinglePacketReceived(Account account, JinglePacket packet) {
- Log.d(LOGTAG,account.getJid()+": jingle packet received"+packet.toString());
+ mJingleConnectionManager.deliverPacket(account, packet);
}
};
@@ -401,8 +401,9 @@ public class XmppConnectionService extends Service {
return this.fileBackend;
}
- public Message attachImageToConversation(Conversation conversation, Uri uri) {
+ public Message attachImageToConversation(Conversation conversation, String presence, Uri uri) {
Message message = new Message(conversation, "", Message.ENCRYPTION_NONE);
+ message.setPresence(presence);
message.setType(Message.TYPE_IMAGE);
File file = this.fileBackend.copyImageToPrivateStorage(message, uri);
Log.d(LOGTAG,"new file"+file.getAbsolutePath());