carbons

src/de/gultsch/chat/entities/Contact.java

@@ -157,4 +157,8 @@ public class Contact extends AbstractEntity implements Serializable {
 	public int getMostAvailableStatus() {
 		return this.presences.getMostAvailableStatus();
 	}
+
+	public void setPresences(Presences pres) {
+		this.presences = pres;	
+	}
 }

src/de/gultsch/chat/persistance/DatabaseBackend.java

@@ -8,6 +8,7 @@ import de.gultsch.chat.entities.Account;
 import de.gultsch.chat.entities.Contact;
 import de.gultsch.chat.entities.Conversation;
 import de.gultsch.chat.entities.Message;
+import de.gultsch.chat.entities.Presences;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
@@ -214,12 +215,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 		SQLiteDatabase db = this.getWritableDatabase();
 		for (int i = 0; i < contacts.size(); i++) {
 			Contact contact = contacts.get(i);
-			String[] columns = {Contact.UUID};
+			String[] columns = {Contact.UUID, Contact.PRESENCES};
 			String[] args = {contact.getAccount().getUuid(), contact.getJid()};
 			Cursor cursor = db.query(Contact.TABLENAME, columns,Contact.ACCOUNT+"=? AND "+Contact.JID+"=?", args, null, null, null);
 			if (cursor.getCount()>=1) {
 				cursor.moveToFirst();
 				contact.setUuid(cursor.getString(0));
+				contact.setPresences(Presences.fromJsonString(cursor.getString(1)));
 				updateContact(contact);
 			} else {
 				contact.setUuid(UUID.randomUUID().toString());

src/de/gultsch/chat/services/XmppConnectionService.java

@@ -62,20 +62,49 @@ public class XmppConnectionService extends Service {
 			if ((packet.getType() == MessagePacket.TYPE_CHAT)
 					|| (packet.getType() == MessagePacket.TYPE_GROUPCHAT)) {
 				boolean notify = true;
+				int status = Message.STATUS_RECIEVED;
+				String body;
+				String fullJid;
 				if (!packet.hasChild("body")) {
-					return;
+					Element forwarded;
+					if (packet.hasChild("received")) {
+						forwarded = packet.findChild("received").findChild(
+								"forwarded");
+					} else if (packet.hasChild("sent")) {
+						forwarded = packet.findChild("sent").findChild(
+								"forwarded");
+						status = Message.STATUS_SEND;
+					} else {
+						return; // massage has no body and is not carbon. just
+								// skip
+					}
+					if (forwarded != null) {
+						Element message = forwarded.findChild("message");
+						if ((message == null) || (!message.hasChild("body")))
+							return; // either malformed or boring
+						if (status == Message.STATUS_RECIEVED) {
+							fullJid = message.getAttribute("from");
+						} else {
+							fullJid = message.getAttribute("to");
+						}
+						body = message.findChild("body").getContent();
+					} else {
+						return; // packet malformed. has no forwarded element
+					}
+				} else {
+					fullJid = packet.getFrom();
+					body = packet.getBody();
 				}
 				Conversation conversation = null;
-				String fullJid = packet.getFrom();
 				String[] fromParts = fullJid.split("/");
 				String jid = fromParts[0];
 				Contact contact = findOrCreateContact(account, jid);
 				boolean muc = (packet.getType() == MessagePacket.TYPE_GROUPCHAT);
 				String counterPart = null;
-				int status = Message.STATUS_RECIEVED;
 				conversation = findOrCreateConversation(account, contact, muc);
 				if (muc) {
-					if ((fromParts.length==1)||(packet.hasChild("subject"))||(packet.hasChild("delay"))) {
+					if ((fromParts.length == 1) || (packet.hasChild("subject"))
+							|| (packet.hasChild("delay"))) {
 						return;
 					}
 					counterPart = fromParts[1];
@@ -86,8 +115,8 @@ public class XmppConnectionService extends Service {
 				} else {
 					counterPart = fullJid;
 				}
-				Message message = new Message(conversation, counterPart,
+				Message message = new Message(conversation, counterPart, body,
-						packet.getBody(), Message.ENCRYPTION_NONE, status);
+						Message.ENCRYPTION_NONE, status);
 				conversation.getMessages().add(message);
 				databaseBackend.createMessage(message);
 				if (convChangedListener != null) {
@@ -126,7 +155,7 @@ public class XmppConnectionService extends Service {
 			Contact contact = findOrCreateContact(account, fromParts[0]);
 			if (contact.getUuid() == null) {
 				// most likely muc, self or roster not synced
-				Log.d(LOGTAG,"got presence for non contact "+packet.toString());
+				// Log.d(LOGTAG,"got presence for non contact "+packet.toString());
 			}
 			String type = packet.getAttribute("type");
 			if (type == null) {
@@ -145,7 +174,7 @@ public class XmppConnectionService extends Service {
 				databaseBackend.updateContact(contact);
 			} else if (type.equals("unavailable")) {
 				if (fromParts.length != 2) {
-					Log.d(LOGTAG,"received presence with no resource "+packet.toString());
+					// Log.d(LOGTAG,"received presence with no resource "+packet.toString());
 				} else {
 					contact.removePresence(fromParts[1]);
 					databaseBackend.updateContact(contact);

src/de/gultsch/chat/ui/DialogContactDetails.java

@@ -38,6 +38,7 @@ public class DialogContactDetails extends DialogFragment {
 		
 		boolean subscriptionSend = false;
 		boolean subscriptionReceive = false;
+		if (contact.getSubscription()!=null) {
 			if (contact.getSubscription().equals("both")) {
 				subscriptionReceive = true;
 				subscriptionSend = true;
@@ -46,6 +47,7 @@ public class DialogContactDetails extends DialogFragment {
 			} else if (contact.getSubscription().equals("to")) {
 				subscriptionReceive = true;
 			}
+		}
 		
 		switch (contact.getMostAvailableStatus()) {
 		case Presences.CHAT:

src/de/gultsch/chat/ui/NewConversationActivity.java

@@ -181,7 +181,9 @@ public class NewConversationActivity extends XmppActivity {
 					});
 					accountChooser.create().show();
 				} else {
+					if (clickedContact.getAccount()==null) {
 						clickedContact.setAccount(accounts.get(0));
+					}
 					showIsMucDialogIfNeeded(clickedContact);
 				}
 			}
@@ -226,6 +228,7 @@ public class NewConversationActivity extends XmppActivity {
 	}
 
 	public void startConversation(Contact contact, Account account, boolean muc) {
+		Log.d("xmppService","starting conversation for account:"+account.getJid()+" and contact:"+contact.getJid());
 		Conversation conversation = xmppConnectionService
 				.findOrCreateConversation(account, contact, muc);
 

src/de/gultsch/chat/xmpp/XmppConnection.java

@@ -7,7 +7,9 @@ import java.math.BigInteger;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.security.SecureRandom;
+import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.List;
 
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
@@ -45,6 +47,7 @@ public class XmppConnection implements Runnable {
 	private boolean shouldBind = true;
 	private boolean shouldAuthenticate = true;
 	private Element streamFeatures;
+	private HashSet<String> discoFeatures = new HashSet<String>();
 
 	private static final int PACKET_IQ = 0;
 	private static final int PACKET_MESSAGE = 1;
@@ -70,7 +73,8 @@ public class XmppConnection implements Runnable {
 			String srvRecordServer = namePort.getString("name");
 			int srvRecordPort = namePort.getInt("port");
 			if (srvRecordServer != null) {
-				Log.d(LOGTAG,account.getJid()+": using values from dns "+srvRecordServer+":"+srvRecordPort);
+				Log.d(LOGTAG, account.getJid() + ": using values from dns "
+						+ srvRecordServer + ":" + srvRecordPort);
 				socket = new Socket(srvRecordServer, srvRecordPort);
 			} else {
 				socket = new Socket(account.getServer(), 5222);
@@ -145,7 +149,8 @@ public class XmppConnection implements Runnable {
 				switchOverToTls(nextTag);
 			} else if (nextTag.isStart("success")) {
 				isAuthenticated = true;
-				Log.d(LOGTAG,account.getJid()+": read success tag in stream. reset again");
+				Log.d(LOGTAG, account.getJid()
+						+ ": read success tag in stream. reset again");
 				tagReader.readTag();
 				tagReader.reset();
 				sendStartStream();
@@ -179,7 +184,8 @@ public class XmppConnection implements Runnable {
 		}
 	}
 
-	private Element processPacket(Tag currentTag, int packetType) throws XmlPullParserException, IOException {
+	private Element processPacket(Tag currentTag, int packetType)
+			throws XmlPullParserException, IOException {
 		Element element;
 		switch (packetType) {
 		case PACKET_IQ:
@@ -206,11 +212,12 @@ public class XmppConnection implements Runnable {
 		return element;
 	}
 
-
+	private IqPacket processIq(Tag currentTag) throws XmlPullParserException,
-	private IqPacket processIq(Tag currentTag) throws XmlPullParserException, IOException {
+			IOException {
 		IqPacket packet = (IqPacket) processPacket(currentTag, PACKET_IQ);
 		if (iqPacketCallbacks.containsKey(packet.getId())) {
-			iqPacketCallbacks.get(packet.getId()).onIqPacketReceived(account,packet);
+			iqPacketCallbacks.get(packet.getId()).onIqPacketReceived(account,
+					packet);
 			iqPacketCallbacks.remove(packet.getId());
 		} else if (this.unregisteredIqListener != null) {
 			this.unregisteredIqListener.onIqPacketReceived(account, packet);
@@ -218,15 +225,19 @@ public class XmppConnection implements Runnable {
 		return packet;
 	}
 
-	private void processMessage(Tag currentTag) throws XmlPullParserException, IOException {
+	private void processMessage(Tag currentTag) throws XmlPullParserException,
-		MessagePacket packet = (MessagePacket) processPacket(currentTag, PACKET_MESSAGE);
+			IOException {
+		MessagePacket packet = (MessagePacket) processPacket(currentTag,
+				PACKET_MESSAGE);
 		if (this.messageListener != null) {
 			this.messageListener.onMessagePacketReceived(account, packet);
 		}
 	}
 
-	private void processPresence(Tag currentTag) throws XmlPullParserException, IOException {
+	private void processPresence(Tag currentTag) throws XmlPullParserException,
-		PresencePacket packet = (PresencePacket) processPacket(currentTag, PACKET_PRESENCE);
+			IOException {
+		PresencePacket packet = (PresencePacket) processPacket(currentTag,
+				PACKET_PRESENCE);
 		if (this.presenceListener != null) {
 			this.presenceListener.onPresencePacketReceived(account, packet);
 		}
@@ -257,7 +268,9 @@ public class XmppConnection implements Runnable {
 			processStream(tagReader.readTag());
 			sslSocket.close();
 		} catch (IOException e) {
-			Log.d(LOGTAG, account.getJid()+": error on ssl '" + e.getMessage()+"'");
+			Log.d(LOGTAG,
+					account.getJid() + ": error on ssl '" + e.getMessage()
+							+ "'");
 		}
 	}
 
@@ -275,10 +288,13 @@ public class XmppConnection implements Runnable {
 	private void processStreamFeatures(Tag currentTag)
 			throws XmlPullParserException, IOException {
 		this.streamFeatures = tagReader.readElement(currentTag);
-		Log.d(LOGTAG,account.getJid()+": process stream features "+streamFeatures);
+		Log.d(LOGTAG, account.getJid() + ": process stream features "
-		if (this.streamFeatures.hasChild("starttls")&&account.isOptionSet(Account.OPTION_USETLS)) {
+				+ streamFeatures);
+		if (this.streamFeatures.hasChild("starttls")
+				&& account.isOptionSet(Account.OPTION_USETLS)) {
 			sendStartTLS();
-		} else if (this.streamFeatures.hasChild("mechanisms")&&shouldAuthenticate) {
+		} else if (this.streamFeatures.hasChild("mechanisms")
+				&& shouldAuthenticate) {
 			sendSaslAuth();
 		}
 		if (this.streamFeatures.hasChild("bind") && shouldBind) {
@@ -286,7 +302,8 @@ public class XmppConnection implements Runnable {
 			if (this.streamFeatures.hasChild("session")) {
 				IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
 				Element session = new Element("session");
-				session.setAttribute("xmlns","urn:ietf:params:xml:ns:xmpp-session");
+				session.setAttribute("xmlns",
+						"urn:ietf:params:xml:ns:xmpp-session");
 				session.setContent("");
 				startSession.addChild(session);
 				sendIqPacket(startSession, null);
@@ -306,12 +323,60 @@ public class XmppConnection implements Runnable {
 		this.sendIqPacket(iq, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
-				String resource = packet.findChild("bind").findChild("jid").getContent().split("/")[1];
+				String resource = packet.findChild("bind").findChild("jid")
+						.getContent().split("/")[1];
 				account.setResource(resource);
 				account.setStatus(Account.STATUS_ONLINE);
 				if (statusListener != null) {
 					statusListener.onStatusChanged(account);
 				}
+				sendServiceDiscovery();
+			}
+		});
+	}
+
+	private void sendServiceDiscovery() {
+		IqPacket iq = new IqPacket(IqPacket.TYPE_GET);
+		iq.setAttribute("to", account.getServer());
+		Element query = new Element("query");
+		query.setAttribute("xmlns", "http://jabber.org/protocol/disco#info");
+		iq.addChild(query);
+		this.sendIqPacket(iq, new OnIqPacketReceived() {
+
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				if (packet.hasChild("query")) {
+					List<Element> elements = packet.findChild("query")
+							.getChildren();
+					for (int i = 0; i < elements.size(); ++i) {
+						if (elements.get(i).getName().equals("feature")) {
+							discoFeatures.add(elements.get(i).getAttribute(
+									"var"));
+						}
+					}
+				}
+				if (discoFeatures.contains("urn:xmpp:carbons:2")) {
+					sendEnableCarbons();
+				}
+			}
+		});
+	}
+	
+	private void sendEnableCarbons() {
+		Log.d(LOGTAG,account.getJid()+": enable carbons");
+		IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
+		Element enable = new Element("enable");
+		enable.setAttribute("xmlns", "urn:xmpp:carbons:2");
+		iq.addChild(enable);
+		this.sendIqPacket(iq, new OnIqPacketReceived() {
+			
+			@Override
+			public void onIqPacketReceived(Account account, IqPacket packet) {
+				if (!packet.hasChild("error")) {
+					Log.d(LOGTAG,account.getJid()+": successfully enabled carbons");
+				} else {
+					Log.d(LOGTAG,account.getJid()+": error enableing carbons "+packet.toString());
+				}
 			}
 		});
 	}
@@ -342,7 +407,7 @@ public class XmppConnection implements Runnable {
 		if (callback != null) {
 			iqPacketCallbacks.put(id, callback);
 		}
-		Log.d(LOGTAG,account.getJid()+": sending: "+packet.toString());
+		//Log.d(LOGTAG, account.getJid() + ": sending: " + packet.toString());
 	}
 
 	public void sendMessagePacket(MessagePacket packet) {
@@ -354,15 +419,18 @@ public class XmppConnection implements Runnable {
 		Log.d(LOGTAG, account.getJid() + ": sending: " + packet.toString());
 	}
 
-	public void setOnMessagePacketReceivedListener(OnMessagePacketReceived listener) {
+	public void setOnMessagePacketReceivedListener(
+			OnMessagePacketReceived listener) {
 		this.messageListener = listener;
 	}
 
-	public void setOnUnregisteredIqPacketReceivedListener(OnIqPacketReceived listener) {
+	public void setOnUnregisteredIqPacketReceivedListener(
+			OnIqPacketReceived listener) {
 		this.unregisteredIqListener = listener;
 	}
 
-	public void setOnPresencePacketReceivedListener(OnPresencePacketReceived listener) {
+	public void setOnPresencePacketReceivedListener(
+			OnPresencePacketReceived listener) {
 		this.presenceListener = listener;
 	}