Fixed duplicate Outlook provider

pull/210/head
M66B 2 years ago
parent 796fcc1071
commit d3498f079e

@ -306,7 +306,7 @@ public class FragmentSetup extends FragmentBase {
// OAuth // OAuth
for (EmailProvider provider : providers) for (EmailProvider provider : providers)
if (provider.oauth != null && if (provider.oauth != null &&
(provider.oauth.enabled || BuildConfig.DEBUG) && provider.oauth.enabled &&
!TextUtils.isEmpty(provider.oauth.clientId)) { !TextUtils.isEmpty(provider.oauth.clientId)) {
String title = getString(R.string.title_setup_oauth, provider.description); String title = getString(R.string.title_setup_oauth, provider.description);
item = menu item = menu

@ -144,6 +144,7 @@
<provider <provider
name="Outlook" name="Outlook"
description="Outlook" description="Outlook"
enabled="false"
id="outlook" id="outlook"
link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14" link="https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq14"
noop="true" noop="true"
@ -167,7 +168,7 @@
askAccount="true" askAccount="true"
authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize" authorizationEndpoint="https://login.microsoftonline.com/{tenant}/oauth2/v2.0/authorize"
clientId="17e57eca-a59b-4574-ac91-b343004898a6" clientId="17e57eca-a59b-4574-ac91-b343004898a6"
enabled="false" enabled="true"
privacy="https://privacy.microsoft.com/privacystatement" privacy="https://privacy.microsoft.com/privacystatement"
prompt="login" prompt="login"
redirectUri="msauth.eu.faircode.email://auth" redirectUri="msauth.eu.faircode.email://auth"

Loading…
Cancel
Save