From b1afe4646833a0308588b9e6c8e37db84c66c601 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 6 Mar 2023 15:58:30 +0100
Subject: [PATCH] Error account protocol

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 1 +
 app/src/main/java/eu/faircode/email/ServiceSend.java    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 40b92c45e8..6ebe8c44b1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4826,6 +4826,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 intent.putExtra("message", message.error);
                 intent.putExtra("provider", "outlookgraph");
                 intent.putExtra("account", message.account);
+                intent.putExtra("protocol", message.accountProtocol);
                 intent.putExtra("identity", message.identity);
                 intent.putExtra("authorize", true);
                 intent.putExtra("personal", message.identityName);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index f71584e26e..bf750c56f2 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -490,12 +490,16 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                                                     this, PI_FIX, intent, PendingIntent.FLAG_UPDATE_CURRENT);
                                             builder.setContentIntent(piFix);
                                         } else {
+                                            EntityAccount account = db.account().getAccount(identity.account);
+                                            int protocol = (account == null ? -1 : account.protocol);
+
                                             Intent intent = new Intent(this, ActivityError.class);
                                             intent.setAction("535:" + identity.id);
                                             intent.putExtra("title", ex.getMessage());
                                             intent.putExtra("message", Log.formatThrowable(ex, "\n", false));
                                             intent.putExtra("provider", "outlookgraph");
                                             intent.putExtra("account", identity.account);
+                                            intent.putExtra("protocol", protocol);
                                             intent.putExtra("identity", identity.id);
                                             intent.putExtra("authorize", true);
                                             intent.putExtra("personal", identity.name);