Fixes FS#139: Do not merge messages at all

4 files changed, 8 insertions, 17 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index 44132ce3..e700d6e9 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -631,7 +631,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	}
 
 	private void copyText(Message message) {
-		if (activity.copyTextToClipboard(message.getMergedBody(),
+		if (activity.copyTextToClipboard(message.getBody(),
 				R.string.message_text)) {
 			Toast.makeText(activity, R.string.message_copied_to_clipboard,
 					Toast.LENGTH_SHORT).show();
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index cc6ea18c..1d8af20c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -134,7 +134,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 
 		boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI
-			&& message.getMergedStatus() <= Message.STATUS_RECEIVED;
+			&& message.getStatus() <= Message.STATUS_RECEIVED;
 		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getTransferable() != null) {
 			FileParams params = message.getFileParams();
 			if (params.size > (1.5 * 1024 * 1024)) {
@@ -146,7 +146,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				error = true;
 			}
 		}
-		switch (message.getMergedStatus()) {
+		switch (message.getStatus()) {
 			case Message.STATUS_WAITING:
 				info = getContext().getString(R.string.waiting);
 				break;
@@ -218,7 +218,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 
 		String formatedTime = UIHelper.readableTimeDifferenceFull(getContext(),
-				message.getMergedTimeSent());
+				message.getTimeSent());
 		if (message.getStatus() <= Message.STATUS_RECEIVED) {
 			if ((filesize != null) && (info != null)) {
 				viewHolder.time.setText(formatedTime + " \u00B7 " + filesize +" \u00B7 " + info);
@@ -282,9 +282,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			final String nick = UIHelper.getMessageDisplayName(message);
 			String body;
 			try {
-				body = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND, nick + " ");
+				body = message.getBody().replaceAll("^" + Message.ME_COMMAND, nick + " ");
 			} catch (ArrayIndexOutOfBoundsException e) {
-				body = message.getMergedBody();
+				body = message.getBody();
 			}
 			final SpannableString formattedBody = new SpannableString(body);
 			int i = body.indexOf(Message.MERGE_SEPARATOR);
@@ -533,7 +533,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			viewHolder.status_message.setVisibility(View.VISIBLE);
 			viewHolder.contact_picture.setVisibility(View.VISIBLE);
 			if (conversation.getMode() == Conversation.MODE_SINGLE) {
-			viewHolder.contact_picture.setImageBitmap(AvatarService.getInstance().get(conversation.getContact(),
+			    viewHolder.contact_picture.setImageBitmap(AvatarService.getInstance().get(conversation.getContact(),
 						activity.getPixel(32)));
 				viewHolder.contact_picture.setAlpha(0.5f);
 			}
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
index 63ed8dc7..2e7e8354 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
@@ -175,6 +175,6 @@ public class MessageDetailsDialog extends AbstractAlertDialog {
      */
     protected void displayMessageSentTime(View view, Message message) {
         TextView timeSent = (TextView) view.findViewById(R.id.dlgMsgDetTimeSent);
-        timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getMergedTimeSent())));
+        timeSent.setText(DateFormat.format("dd.MM.yyyy kk:mm:ss", new Date(message.getTimeSent())));
     }
 }
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
index 859a6069..8e2909ad 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
@@ -136,15 +136,6 @@ public class ConversationMoreMessagesLoadedListener implements XmppConnectionSer
         for (int i = 0; i < messages.size(); ++i) {
             if (uuid.equals(messages.get(i).getUuid())) {
                 return i;
-            } else {
-                Message next = messages.get(i);
-                while(next != null && next.wasMergedIntoPrevious()) {
-                    if (uuid.equals(next.getUuid())) {
-                        return i;
-                    }
-                    next = next.next();
-                }
-
             }
         }
         return 0;