From 0f85aef12a56a609662954143d74a5af1c16bfca Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 30 Apr 2025 18:53:50 +0200
Subject: [PATCH] Removed pEp support

Doesn't exist anymore
---
 .../eu/faircode/email/FragmentMessages.java   | 53 +------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index e2e9bf6128..11103f8ff4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -9947,11 +9947,9 @@ public class FragmentMessages extends FragmentBase
                                             }
                                         }
 
-                                        boolean pep = checkPep(message, remotes, context);
-
                                         encrypt = parts.getEncryption();
                                         db.message().setMessageEncrypt(message.id, encrypt);
-                                        db.message().setMessageRevision(message.id, pep || protect_subject == null ? 1 : -1);
+                                        db.message().setMessageRevision(message.id, protect_subject == null ? 1 : -1);
                                         db.message().setMessageStored(message.id, new Date().getTime());
                                         db.message().setMessageFts(message.id, false);
 
@@ -10754,11 +10752,9 @@ public class FragmentMessages extends FragmentBase
                             }
                     }
 
-                    boolean pep = checkPep(message, remotes, context);
-
                     db.message().setMessageEncrypt(message.id,
                             signedData ? EntityMessage.SMIME_SIGNONLY : parts.getEncryption());
-                    db.message().setMessageRevision(message.id, pep || protect_subject == null ? 1 : -1);
+                    db.message().setMessageRevision(message.id, protect_subject == null ? 1 : -1);
                     db.message().setMessageStored(message.id, new Date().getTime());
                     db.message().setMessageFts(message.id, false);
 
@@ -10800,51 +10796,6 @@ public class FragmentMessages extends FragmentBase
         }.serial().execute(this, args, "decrypt:s/mime");
     }
 
-    private static boolean checkPep(EntityMessage message, List<EntityAttachment> remotes, Context context) {
-        DB db = DB.getInstance(context);
-        for (EntityAttachment remote : remotes)
-            if ("message/rfc822".equals(remote.getMimeType()))
-                try {
-                    Properties props = MessageHelper.getSessionProperties(true);
-                    Session isession = Session.getInstance(props, null);
-
-                    MimeMessage imessage;
-                    try (InputStream fis = new FileInputStream(remote.getFile(context))) {
-                        imessage = new MimeMessage(isession, fis);
-                    }
-
-                    String[] xpep = imessage.getHeader("X-pEp-Wrapped-Message-Info");
-                    if (xpep == null || xpep.length == 0 || !"INNER".equalsIgnoreCase(xpep[0]))
-                        continue;
-
-                    MessageHelper helper = new MessageHelper(imessage, context);
-                    String subject = helper.getSubject();
-                    String html = helper.getMessageParts().getHtml(context);
-
-                    if (!TextUtils.isEmpty(html))
-                        Helper.writeText(message.getFile(context), html);
-
-                    try {
-                        db.beginTransaction();
-
-                        if (!TextUtils.isEmpty(subject))
-                            db.message().setMessageSubject(message.id, subject);
-
-                        // Prevent showing the embedded message
-                        db.attachment().setType(remote.id, "application/octet-stream");
-
-                        db.setTransactionSuccessful();
-                    } finally {
-                        db.endTransaction();
-                    }
-
-                    return true;
-                } catch (Throwable ex) {
-                    Log.e(ex);
-                }
-        return false;
-    }
-
     private void onDelete(long id) {
         Bundle args = new Bundle();
         args.putLong("id", id);