From f42ebd00ec9bba516987bf9d2fc4f4f14f56f819 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 18 Jun 2021 09:50:44 +0200
Subject: [PATCH] Added email provider description

---
 app/src/main/java/eu/faircode/email/EmailProvider.java | 4 ++++
 app/src/main/java/eu/faircode/email/FragmentSetup.java | 4 ++--
 app/src/main/res/xml/providers.xml                     | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 521b0c50c4..9c69243767 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -53,6 +53,7 @@ import java.util.concurrent.Future;
 public class EmailProvider {
     public String id;
     public String name;
+    public String description;
     public boolean enabled;
     public List<String> domain;
     public int order;
@@ -131,6 +132,9 @@ public class EmailProvider {
                         provider = new EmailProvider();
                         provider.id = xml.getAttributeValue(null, "id");
                         provider.name = xml.getAttributeValue(null, "name");
+                        provider.description = xml.getAttributeValue(null, "description");
+                        if (provider.description == null)
+                            provider.description = name;
                         provider.enabled = xml.getAttributeBooleanValue(null, "enabled", true);
                         String domain = xml.getAttributeValue(null, "domain");
                         if (domain != null)
diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index d04137b004..462d61016f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -191,10 +191,10 @@ public class FragmentSetup extends FragmentBase {
                     if (provider.oauth != null &&
                             (provider.oauth.enabled || BuildConfig.DEBUG)) {
                         MenuItem item = menu
-                                .add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.name))
+                                .add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.description))
                                 .setIntent(new Intent(ActivitySetup.ACTION_QUICK_OAUTH)
                                         .putExtra("id", provider.id)
-                                        .putExtra("name", provider.name)
+                                        .putExtra("name", provider.description)
                                         .putExtra("askAccount", provider.oauth.askAccount));
                         int resid = context.getResources()
                                 .getIdentifier("provider_" + provider.id, "drawable", context.getPackageName());
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index d995692d86..21d86416af 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -77,7 +77,8 @@
             starttls="true" />
     </provider>
     <provider
-        name="Outlook/Office 365"
+        name="Outlook"
+        description="Outlook/Office 365"
         id="office365"
         link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
         order="5"