From ab3404f045ec3210577d7adb70731f99348bf538 Mon Sep 17 00:00:00 2001 From: M66B Date: Fri, 8 Sep 2023 18:38:05 +0200 Subject: [PATCH] Legacy read receipt request: Return-Receipt-To --- app/src/main/java/eu/faircode/email/EmailService.java | 2 +- app/src/main/java/eu/faircode/email/MessageHelper.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index 5741ed6de1..eff537dbf1 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -1337,7 +1337,7 @@ public class EmailService implements AutoCloseable { " reuse=" + reuse + " delay=" + delay); - if (keepAlive) { + if (keepAlive || BuildConfig.DEBUG) { Log.e("Socket keep-alive=" + keepAlive); socket.setKeepAlive(false); // sets SOL_SOCKET/SO_KEEPALIVE } diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index c24de0822d..fdcf350d1b 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -550,6 +550,8 @@ public class MessageHelper { // Read receipt imessage.addHeader("Disposition-Notification-To", to); imessage.addHeader("Read-Receipt-To", to); + if (receipt_legacy) + imessage.addHeader("Return-Receipt-To", to); imessage.addHeader("X-Confirm-Reading-To", to); } }