From 2aa333ee173be783ed9e87626a06fe9287fbeaca Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 26 Dec 2021 10:08:21 +0100
Subject: [PATCH] Revert "Debug correlation ID"

This reverts commit e78602db93e7df7c190653ebe6651d2066138224.
---
 .../eu/faircode/email/AdapterMessage.java     | 21 ++++++-------------
 .../java/eu/faircode/email/MessageHelper.java |  6 ------
 .../java/eu/faircode/email/ServiceSend.java   |  1 -
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 825823bda6..26c834c05f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2908,13 +2908,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private void bindExtras(TupleMessageEx message) {
             int resid = 0;
             if (infra && message.infrastructure != null) {
-                if ("fairemail".equals(message.infrastructure))
-                    resid = R.mipmap.ic_launcher_round;
-                else {
-                    String resname = "infra_" + message.infrastructure;
-                    resid = context.getResources()
-                            .getIdentifier(resname, "drawable", context.getPackageName());
-                }
+                String resname = "infra_" + message.infrastructure;
+                resid = context.getResources()
+                        .getIdentifier(resname, "drawable", context.getPackageName());
             }
             if (resid != 0)
                 ibInfrastructure.setImageResource(resid);
@@ -4974,14 +4970,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionShowInfra(TupleMessageEx message) {
-            int resid;
-            if ("fairemail".equals(message.infrastructure))
-                resid = R.string.app_name;
-            else {
-                String resname = "infra_" + message.infrastructure;
-                resid = context.getResources()
-                        .getIdentifier(resname, "string", context.getPackageName());
-            }
+            String resname = "infra_" + message.infrastructure;
+            int resid = context.getResources()
+                    .getIdentifier(resname, "string", context.getPackageName());
             String infra = (resid < 0 ? message.infrastructure : context.getString(resid));
             ToastEx.makeText(context, infra, Toast.LENGTH_LONG).show();
         }
diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index c856fd246e..01e69fb6c6 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -2024,12 +2024,6 @@ public class MessageHelper {
                 return "flowmailer";
         }
 
-        if (BuildConfig.DEBUG) {
-            String fairemail = imessage.getHeader(HEADER_CORRELATION_ID, null);
-            if (!TextUtils.isEmpty(fairemail))
-                return "fairemail";
-        }
-
         return null;
     }
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 6fef51ee62..56f153c445 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -626,7 +626,6 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 message.ui_hide = true;
                 message.ui_busy = Long.MAX_VALUE; // Needed to keep messages in user folders
                 message.error = null;
-                message.infrastructure = "fairemail";
                 message.id = db.message().insertMessage(message);
 
                 File file = EntityMessage.getFile(this, message.id);