experimental message merging

res/layout/message_null.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content">
+</RelativeLayout>

src/eu/siacs/conversations/entities/Message.java

@@ -67,18 +67,23 @@ public class Message extends AbstractEntity {
 
 	public Message(Conversation conversation, String body, int encryption) {
 		this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),
-				conversation.getContactJid(), null, body, System.currentTimeMillis(), encryption,
+				conversation.getContactJid(), null, body, System
-				Message.STATUS_UNSEND,TYPE_TEXT,null);
+						.currentTimeMillis(), encryption,
+				Message.STATUS_UNSEND, TYPE_TEXT, null);
 		this.conversation = conversation;
 	}
 
-	public Message(Conversation conversation, String counterpart, String body, int encryption, int status) {
+	public Message(Conversation conversation, String counterpart, String body,
-		this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),counterpart, null, body, System.currentTimeMillis(), encryption,status,TYPE_TEXT,null);
+			int encryption, int status) {
+		this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),
+				counterpart, null, body, System.currentTimeMillis(),
+				encryption, status, TYPE_TEXT, null);
 		this.conversation = conversation;
 	}
 
-	public Message(String uuid, String conversationUUid, String counterpart, String trueCounterpart,
+	public Message(String uuid, String conversationUUid, String counterpart,
-			String body, long timeSent, int encryption, int status, int type, String remoteMsgId) {
+			String trueCounterpart, String body, long timeSent, int encryption,
+			int status, int type, String remoteMsgId) {
 		this.uuid = uuid;
 		this.conversationUuid = conversationUUid;
 		this.counterpart = counterpart;
@@ -97,13 +102,13 @@ public class Message extends AbstractEntity {
 		values.put(UUID, uuid);
 		values.put(CONVERSATION, conversationUuid);
 		values.put(COUNTERPART, counterpart);
-		values.put(TRUE_COUNTERPART,trueCounterpart);
+		values.put(TRUE_COUNTERPART, trueCounterpart);
 		values.put(BODY, body);
 		values.put(TIME_SENT, timeSent);
 		values.put(ENCRYPTION, encryption);
 		values.put(STATUS, status);
 		values.put(TYPE, type);
-		values.put(REMOTE_MSG_ID,remoteMsgId);
+		values.put(REMOTE_MSG_ID, remoteMsgId);
 		return values;
 	}
 
@@ -127,7 +132,8 @@ public class Message extends AbstractEntity {
 				return null;
 			} else {
 				Account account = this.conversation.getAccount();
-				Contact contact = account.getRoster().getContact(this.trueCounterpart);
+				Contact contact = account.getRoster().getContact(
+						this.trueCounterpart);
 				if (contact.showInRoster()) {
 					return contact;
 				} else {
@@ -142,14 +148,14 @@ public class Message extends AbstractEntity {
 	}
 
 	public String getReadableBody(Context context) {
-		if ((encryption == ENCRYPTION_PGP)&&(type == TYPE_TEXT)) {
+		if ((encryption == ENCRYPTION_PGP) && (type == TYPE_TEXT)) {
-			return ""+context.getText(R.string.encrypted_message_received);
+			return "" + context.getText(R.string.encrypted_message_received);
-		} else if ((encryption == ENCRYPTION_OTR)&&(type == TYPE_IMAGE)) {
+		} else if ((encryption == ENCRYPTION_OTR) && (type == TYPE_IMAGE)) {
-			return ""+context.getText(R.string.encrypted_image_received);
+			return "" + context.getText(R.string.encrypted_image_received);
 		} else if (encryption == ENCRYPTION_DECRYPTION_FAILED) {
-			return ""+context.getText(R.string.decryption_failed);
+			return "" + context.getText(R.string.decryption_failed);
 		} else if (type == TYPE_IMAGE) {
-			return ""+context.getText(R.string.image_file);
+			return "" + context.getText(R.string.image_file);
 		} else {
 			return body.trim();
 		}
@@ -277,10 +283,60 @@ public class Message extends AbstractEntity {
 	}
 
 	public boolean equals(Message message) {
-		if ((this.remoteMsgId!=null) && (this.body != null) && (this.counterpart != null)) {
+		if ((this.remoteMsgId != null) && (this.body != null)
-			return this.remoteMsgId.equals(message.getRemoteMsgId()) && this.body.equals(message.getBody()) && this.counterpart.equals(message.getCounterpart());
+				&& (this.counterpart != null)) {
+			return this.remoteMsgId.equals(message.getRemoteMsgId())
+					&& this.body.equals(message.getBody())
+					&& this.counterpart.equals(message.getCounterpart());
 		} else {
 			return false;
 		}
 	}
+
+	public Message next() {
+		int index = this.conversation.getMessages().indexOf(this);
+		if (index < 0 || index >= this.conversation.getMessages().size() - 1) {
+			return null;
+		} else {
+			return this.conversation.getMessages().get(index + 1);
+		}
+	}
+
+	public Message prev() {
+		int index = this.conversation.getMessages().indexOf(this);
+		if (index <= 0 || index > this.conversation.getMessages().size()) {
+			return null;
+		} else {
+			return this.conversation.getMessages().get(index - 1);
+		}
+	}
+
+	public boolean mergable(Message message) {
+		if (message == null) {
+			return false;
+		}
+		return (this.getType() == Message.TYPE_TEXT
+				&& this.getType() == message.getType()
+				&& this.getCounterpart().equals(message.getCounterpart())
+				&& (message.getTimeSent() - this.getTimeSent()) <= 20000 && ((this
+				.getStatus() == message.getStatus()) || (this.getStatus() == Message.STATUS_SEND && message
+				.getStatus() == Message.STATUS_UNSEND)));
+	}
+
+	public String getMergedBody() {
+		Message next = this.next();
+		if (this.mergable(next)) {
+			return body.trim() + '\n' + next.getMergedBody();
+		}
+		return body.trim();
+	}
+
+	public boolean wasMergedIntoPrevious() {
+		Message prev = this.prev();
+		if (prev == null) {
+			return false;
+		} else {
+			return prev.mergable(this);
+		}
+	}
 }

src/eu/siacs/conversations/ui/adapter/MessageAdapter.java

@@ -36,6 +36,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 	private static final int SENT = 0;
 	private static final int RECIEVED = 1;
 	private static final int STATUS = 2;
+	private static final int NULL = 3;
 
 	private ConversationActivity activity;
 
@@ -74,12 +75,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 	@Override
 	public int getViewTypeCount() {
-		return 3;
+		return 4;
 	}
 
 	@Override
 	public int getItemViewType(int position) {
-		if (getItem(position).getType() == Message.TYPE_STATUS) {
+		if (getItem(position).wasMergedIntoPrevious()) {
+			return NULL;
+		} else if (getItem(position).getType() == Message.TYPE_STATUS) {
 			return STATUS;
 		} else if (getItem(position).getStatus() <= Message.STATUS_RECEIVED) {
 			return RECIEVED;
@@ -212,7 +215,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		viewHolder.messageBody.setVisibility(View.VISIBLE);
 		if (message.getBody() != null) {
 			if (message.getType() != Message.TYPE_PRIVATE) {
-				viewHolder.messageBody.setText(message.getBody().trim());
+				viewHolder.messageBody.setText(message.getMergedBody());
 			} else {
 				String privateMarker;
 				if (message.getStatus() <= Message.STATUS_RECEIVED) {
@@ -301,6 +304,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (view == null) {
 			viewHolder = new ViewHolder();
 			switch (type) {
+			case NULL:
+				view = (View) activity.getLayoutInflater().inflate(
+						R.layout.message_null, parent, false);
+				break;
 			case SENT:
 				view = (View) activity.getLayoutInflater().inflate(
 						R.layout.message_sent, parent, false);
@@ -382,7 +389,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			viewHolder = (ViewHolder) view.getTag();
 		}
 
-		if (type == STATUS) {
+		if (type == STATUS || type == NULL) {
 			return view;
 		}