From 414b787d5ef5dc84e302cb3b37de6757b846e64c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 28 May 2020 10:13:29 +0200
Subject: [PATCH] Added Outlook to wizard menu

---
 app/src/main/java/eu/faircode/email/FragmentSetup.java | 4 +++-
 app/src/main/res/values/strings.xml                    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java
index 5a315d7104..2e0f0a3251 100644
--- a/app/src/main/java/eu/faircode/email/FragmentSetup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java
@@ -167,10 +167,11 @@ public class FragmentSetup extends FragmentBase {
 
                 int order = 1;
                 popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_gmail, order++, R.string.title_setup_gmail);
+                popupMenu.getMenu().add(Menu.NONE, R.string.title_setup_outlook, order++, R.string.title_setup_outlook);
 
                 if (Helper.hasValidFingerprint(getContext()) || BuildConfig.DEBUG)
                     for (EmailProvider provider : EmailProvider.loadProfiles(getContext()))
-                        if (provider.oauth != null && (provider.oauth.enabled || BuildConfig.DEBUG))
+                        if (provider.oauth != null && provider.oauth.enabled)
                             popupMenu.getMenu()
                                     .add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.name))
                                     .setIntent(new Intent(ActivitySetup.ACTION_QUICK_OAUTH)
@@ -195,6 +196,7 @@ public class FragmentSetup extends FragmentBase {
                             case R.string.title_setup_activesync:
                                 Helper.viewFAQ(getContext(), 133);
                                 return true;
+                            case R.string.title_setup_outlook:
                             case R.string.title_setup_other:
                                 lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_QUICK_SETUP));
                                 return true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce05bb7045..82ed4916b1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -156,6 +156,7 @@
     <string name="title_setup_wizard_multiple">The installation wizard can be used multiple times to set up multiple accounts</string>
     <string name="title_setup_wizard_remark">Go \'back\' to go to the inbox</string>
     <string name="title_setup_gmail" translatable="false">Gmail</string>
+    <string name="title_setup_outlook" translatable="false">Outlook</string>
     <string name="title_setup_oauth" translatable="false">%1$s (OAuth)</string>
     <string name="title_setup_activesync" translatable="false">Exchange ActiveSync</string>
     <string name="title_setup_other">Other provider</string>