attempt to fix the delay problemdelay_fixes

4 files changed, 29 insertions, 45 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index 827ea44d..1fe455ff 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -892,7 +892,7 @@ public class AxolotlService {
 									new Conversation.OnMessageFound() {
 										@Override
 										public void onMessageFound(Message message) {
-											processSending(message);
+											processSending(message,false);
 										}
 									});
 						}
@@ -1053,7 +1053,7 @@ public class AxolotlService {
 		return axolotlMessage;
 	}
 
-	private void processSending(final Message message) {
+	private void processSending(final Message message, final boolean delay) {
 		executor.execute(new Runnable() {
 			@Override
 			public void run() {
@@ -1065,17 +1065,17 @@ public class AxolotlService {
 				} else {
 					Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account)+"Generated message, caching: " + message.getUuid());
 					messageCache.put(message.getUuid(), packet);
-					mXmppConnectionService.resendMessage(message);
+					mXmppConnectionService.resendMessage(message,delay);
 				}
 			}
 		});
 	}
 
-	public void prepareMessage(final Message message) {
+	public void prepareMessage(final Message message,final boolean delay) {
 		if (!messageCache.containsKey(message.getUuid())) {
 			boolean newSessions = createSessionsIfNeeded(message.getConversation(), true);
 			if (!newSessions) {
-				this.processSending(message);
+				this.processSending(message,delay);
 			}
 		}
 	}
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 06ec0284..d3c35789 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -27,7 +27,7 @@ public class MessageGenerator extends AbstractGenerator {
 		super(service);
 	}
 
-	private MessagePacket preparePacket(Message message, boolean addDelay) {
+	private MessagePacket preparePacket(Message message) {
 		Conversation conversation = message.getConversation();
 		Account account = conversation.getAccount();
 		MessagePacket packet = new MessagePacket();
@@ -50,13 +50,10 @@ public class MessageGenerator extends AbstractGenerator {
 		}
 		packet.setFrom(account.getJid());
 		packet.setId(message.getUuid());
-		if (addDelay) {
-			addDelay(packet, message.getTimeSent());
-		}
 		return packet;
 	}
 
-	private void addDelay(MessagePacket packet, long timestamp) {
+	public void addDelay(MessagePacket packet, long timestamp) {
 		final SimpleDateFormat mDateFormat = new SimpleDateFormat(
 				"yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
 		mDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
@@ -66,11 +63,7 @@ public class MessageGenerator extends AbstractGenerator {
 	}
 
 	public MessagePacket generateAxolotlChat(Message message) {
-		return generateAxolotlChat(message, false);
-	}
-
-	public MessagePacket generateAxolotlChat(Message message, boolean addDelay) {
-		MessagePacket packet = preparePacket(message, addDelay);
+		MessagePacket packet = preparePacket(message);
 		AxolotlService service = message.getConversation().getAccount().getAxolotlService();
 		Log.d(Config.LOGTAG, AxolotlService.getLogprefix(message.getConversation().getAccount())+"Submitting message to axolotl service for send processing...");
 		XmppAxolotlMessage axolotlMessage = service.encrypt(message);
@@ -82,15 +75,11 @@ public class MessageGenerator extends AbstractGenerator {
 	}
 
 	public MessagePacket generateOtrChat(Message message) {
-		return generateOtrChat(message, false);
-	}
-
-	public MessagePacket generateOtrChat(Message message, boolean addDelay) {
 		Session otrSession = message.getConversation().getOtrSession();
 		if (otrSession == null) {
 			return null;
 		}
-		MessagePacket packet = preparePacket(message, addDelay);
+		MessagePacket packet = preparePacket(message);
 		packet.addChild("private", "urn:xmpp:carbons:2");
 		packet.addChild("no-copy", "urn:xmpp:hints");
 		packet.addChild("no-permanent-store", "urn:xmpp:hints");
@@ -109,11 +98,7 @@ public class MessageGenerator extends AbstractGenerator {
 	}
 
 	public MessagePacket generateChat(Message message) {
-		return generateChat(message, false);
-	}
-
-	public MessagePacket generateChat(Message message, boolean addDelay) {
-		MessagePacket packet = preparePacket(message, addDelay);
+		MessagePacket packet = preparePacket(message);
 		if (message.hasFileOnRemoteHost()) {
 			packet.setBody(message.getFileParams().url.toString());
 		} else {
@@ -123,11 +108,7 @@ public class MessageGenerator extends AbstractGenerator {
 	}
 
 	public MessagePacket generatePgpChat(Message message) {
-		return generatePgpChat(message, false);
-	}
-
-	public MessagePacket generatePgpChat(Message message, boolean addDelay) {
-		MessagePacket packet = preparePacket(message, addDelay);
+		MessagePacket packet = preparePacket(message);
 		packet.setBody("This is an XEP-0027 encrypted message");
 		if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
 			packet.addChild("x", "jabber:x:encrypted").setContent(message.getEncryptedBody());
@@ -151,8 +132,7 @@ public class MessageGenerator extends AbstractGenerator {
 		packet.setType(MessagePacket.TYPE_NORMAL);
 		packet.setTo(to);
 		packet.setFrom(account.getJid());
-		Element received = packet.addChild("displayed",
-				"urn:xmpp:chat-markers:0");
+		Element received = packet.addChild("displayed","urn:xmpp:chat-markers:0");
 		received.setAttribute("id", id);
 		return packet;
 	}
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index e170590e..c6c6f2c1 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -172,7 +172,7 @@ public class HttpUploadConnection implements Transferable {
 						mXmppConnectionService.getPgpEngine().encrypt(message, new UiCallback<Message>() {
 							@Override
 							public void success(Message message) {
-								mXmppConnectionService.resendMessage(message);
+								mXmppConnectionService.resendMessage(message,false);
 							}
 
 							@Override
@@ -186,7 +186,7 @@ public class HttpUploadConnection implements Transferable {
 							}
 						});
 					} else {
-						mXmppConnectionService.resendMessage(message);
+						mXmppConnectionService.resendMessage(message,false);
 					}
 				} else {
 					fail();
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 93420a24..c5016fc6 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -689,10 +689,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void sendMessage(final Message message) {
-		sendMessage(message, false);
+		sendMessage(message, false, false);
 	}
 
-	private void sendMessage(final Message message, final boolean resend) {
+	private void sendMessage(final Message message, final boolean resend, final boolean delay) {
 		final Account account = message.getConversation().getAccount();
 		final Conversation conversation = message.getConversation();
 		account.deactivateGracePeriod();
@@ -721,7 +721,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							break;
 						}
 					} else {
-						packet = mMessageGenerator.generateChat(message,resend);
+						packet = mMessageGenerator.generateChat(message);
 					}
 					break;
 				case Message.ENCRYPTION_PGP:
@@ -733,7 +733,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							break;
 						}
 					} else {
-						packet = mMessageGenerator.generatePgpChat(message,resend);
+						packet = mMessageGenerator.generatePgpChat(message);
 					}
 					break;
 				case Message.ENCRYPTION_OTR:
@@ -747,7 +747,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						if (message.needsUploading()) {
 							mJingleConnectionManager.createNewConnection(message);
 						} else {
-							packet = mMessageGenerator.generateOtrChat(message,resend);
+							packet = mMessageGenerator.generateOtrChat(message);
 						}
 					} else if (otrSession == null) {
 						if (message.fixCounterpart()) {
@@ -767,7 +767,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					} else {
 						packet = account.getAxolotlService().fetchPacketFromCache(message);
 						if (packet == null) {
-							account.getAxolotlService().prepareMessage(message);
+							account.getAxolotlService().prepareMessage(message,delay);
 							message.setAxolotlFingerprint(account.getAxolotlService().getOwnPublicKey().getFingerprint().replaceAll("\\s", ""));
 						}
 					}
@@ -822,6 +822,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			updateConversationUi();
 		}
 		if (packet != null) {
+			if (delay) {
+				mMessageGenerator.addDelay(packet,message.getTimeSent());
+			}
 			if (conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
 				if (this.sendChatStates()) {
 					packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
@@ -836,13 +839,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 			@Override
 			public void onMessageFound(Message message) {
-				resendMessage(message);
+				resendMessage(message,true);
 			}
 		});
 	}
 
-	public void resendMessage(final Message message) {
-		sendMessage(message, true);
+	public void resendMessage(final Message message, final boolean delay) {
+		sendMessage(message, true, delay);
 	}
 
 	public void fetchRosterFromServer(final Account account) {
@@ -1846,8 +1849,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 				if (message.needsUploading()) {
 					mJingleConnectionManager.createNewConnection(message);
 				} else {
-					MessagePacket outPacket = mMessageGenerator.generateOtrChat(message, true);
+					MessagePacket outPacket = mMessageGenerator.generateOtrChat(message);
 					if (outPacket != null) {
+						mMessageGenerator.addDelay(outPacket,message.getTimeSent());
 						message.setStatus(Message.STATUS_SEND);
 						databaseBackend.updateMessage(message);
 						sendMessagePacket(account, outPacket);
@@ -2526,7 +2530,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 		for (final Message msg : messages) {
 			markMessage(msg, Message.STATUS_WAITING);
-			this.resendMessage(msg);
+			this.resendMessage(msg,true);
 		}
 	}