From 9d7c1af493b2b16e04c8f2e264ea65e6fe44f2a1 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 16 Nov 2021 19:42:53 +0100 Subject: [PATCH] Conditinally use example.com as Report-UA --- .../java/eu/faircode/email/MessageHelper.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java index 004f2d4e25..51fbda2e56 100644 --- a/app/src/main/java/eu/faircode/email/MessageHelper.java +++ b/app/src/main/java/eu/faircode/email/MessageHelper.java @@ -635,17 +635,26 @@ public class MessageHelper { plainPart.setContent(plainContent, "text/plain; charset=" + Charset.defaultCharset().name()); report.addBodyPart(plainPart); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + boolean client_id = prefs.getBoolean("client_id", true); + String from = null; if (message.from != null && message.from.length > 0) from = ((InternetAddress) message.from[0]).getAddress(); StringBuilder sb = new StringBuilder(); - sb.append("Reporting-UA: ") - .append(BuildConfig.APPLICATION_ID).append("; ") - .append(context.getString(R.string.app_name)).append(' ') - .append(BuildConfig.VERSION_NAME).append("\r\n"); + + sb.append("Reporting-UA: "); + if (client_id) + sb.append(BuildConfig.APPLICATION_ID).append("; ") + .append(context.getString(R.string.app_name)).append(' ') + .append(BuildConfig.VERSION_NAME).append("\r\n"); + else + sb.append("example.com").append("\r\n"); + if (from != null) sb.append("Original-Recipient: rfc822;").append(from).append("\r\n"); + sb.append("Disposition: manual-action/MDN-sent-manually; displayed").append("\r\n"); BodyPart dnsPart = new MimeBodyPart();