From 2e5aa512842157f7b894c9da582713f07faee53e Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Sun, 8 Sep 2024 22:02:59 -0500 Subject: [PATCH] Doing OMEMO shouldn't re-try links --- .../eu/siacs/conversations/crypto/axolotl/AxolotlService.java | 2 +- .../siacs/conversations/services/XmppConnectionService.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 55fb4cdcf7d9efce57de9ab8c7fd95fb86c7fd6b..7a0e9457c92bd19d398625a57612ee3318d9d20a 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java @@ -1207,7 +1207,7 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { } else { Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Generated message, caching: " + message.getUuid()); messageCache.put(message.getUuid(), axolotlMessage); - mXmppConnectionService.resendMessage(message, delay); + mXmppConnectionService.resendMessage(message, delay, true); } } }); diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index c69b08f55a7453db94a027bf3ab9efa033c2cd78..00efe469c1e775d400ff6452dea83119abf92e83 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2169,6 +2169,10 @@ public class XmppConnectionService extends Service { sendMessage(message, true, false, delay); } + public void resendMessage(final Message message, final boolean delay, final boolean previewedLinks) { + sendMessage(message, true, previewedLinks, delay); + } + public Pair onboardingIncomplete() { if (getAccounts().size() != 2) return null; Account onboarding = null;