Fixes FS#139: Do not merge messages at all

1 files changed, 15 insertions, 25 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 29910815..941aaae1 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -991,11 +991,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private void sendUnsentMessages(final Conversation conversation) {
 		conversation.findWaitingMessages(new Conversation.OnMessageFound() {
 
-			@Override
-			public void onMessageFound(Message message) {
-				resendMessage(message, true);
-			}
-		});
+            @Override
+            public void onMessageFound(Message message) {
+                resendMessage(message, true);
+            }
+        });
 	}
 
 	public void resendMessage(final Message message, final boolean delay) {
@@ -2069,7 +2069,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					if (callback != null) {
 						callback.onConferenceConfigurationFetched(conversation);
 					}
-					Log.d(Config.LOGTAG,account.getJid().toBareJid()+": fetched muc configuration for "+conversation.getJid().toBareJid()+" - "+features.toString());
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetched muc configuration for " + conversation.getJid().toBareJid() + " - " + features.toString());
 					updateConversationUi();
 				} else if (packet.getType() == IqPacket.TYPE.ERROR) {
 					if (callback != null) {
@@ -2235,9 +2235,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		final Account account = conversation.getAccount();
 		final Session otrSession = conversation.getOtrSession();
 		Logging.d(Config.LOGTAG,
-				account.getJid().toBareJid() + " otr session established with "
-						+ conversation.getJid() + "/"
-						+ otrSession.getSessionID().getUserID());
+                account.getJid().toBareJid() + " otr session established with "
+                        + conversation.getJid() + "/"
+                        + otrSession.getSessionID().getUserID());
 		conversation.findUnsentMessagesWithEncryption(Message.ENCRYPTION_OTR, new Conversation.OnMessageFound() {
 
 			@Override
@@ -2275,7 +2275,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			packet.setFrom(account.getJid());
 			MessageGenerator.addMessageHints(packet);
 			packet.setAttribute("to", otrSession.getSessionID().getAccountID() + "/"
-					+ otrSession.getSessionID().getUserID());
+                    + otrSession.getSessionID().getUserID());
 			try {
 				packet.setBody(otrSession
 						.transformSending(CryptoHelper.FILETRANSFER
@@ -2746,21 +2746,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void resendFailedMessages(final Message message) {
-		final Collection<Message> messages = new ArrayList<>();
-		Message current = message;
-		while (current.getStatus() == Message.STATUS_SEND_FAILED) {
-			messages.add(current);
-			if (current.mergeable(current.next())) {
-				current = current.next();
-			} else {
-				break;
-			}
-		}
-		for (final Message msg : messages) {
-			msg.setTime(System.currentTimeMillis());
-			markMessage(msg, Message.STATUS_WAITING);
-			this.resendMessage(msg, false);
-		}
+        if (message.getStatus() == Message.STATUS_SEND_FAILED) {
+            message.setTime(System.currentTimeMillis());
+            markMessage(message, Message.STATUS_WAITING);
+            this.resendMessage(message, false);
+        }
 	}
 
 	public void clearConversationHistory(final Conversation conversation) {