From 24d05aa57cf925893761f9404432449dcdfee029 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 6 May 2026 08:33:37 +0200
Subject: [PATCH] Revert "Added Zoho Oauth"

This reverts commit 29bfcaef73e05beb74a40ed49214f84c9a62d175.

Zoho does not support OAuth for IMAP/SMTP
---
 app/src/main/res/xml/providers.xml | 62 +++++++-----------------------
 1 file changed, 13 insertions(+), 49 deletions(-)

diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index bf3927b4dc..0ee5dfed1b 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -787,10 +787,9 @@
             starttls="false" />
     </provider>
     <provider
-        name="Zoho personal"
+        name="Zoho"
         documentation="You might need to &lt;a href=&quot;https://www.zoho.com/mail/help/imap-access.html#EnableIMAP&quot;&gt;enable IMAP&lt;/a&gt; and use &lt;a href=&quot;https://help.zoho.com/portal/en/kb/bigin/channels/email/articles/generate-an-app-specific-password&quot;&gt;an app password&lt;/a&gt;."
         domain="zoho\\.com"
-        id="zoho"
         link="https://www.zoho.com/mail/help/imap-access.html"
         maxtls="1.2">
         <imap
@@ -801,81 +800,46 @@
             host="smtp.zoho.com"
             port="465"
             starttls="false" />
-        <!-- https://www.zoho.com/mail/help/api/using-oauth-2.html -->
-        <oauth
-            askAccount="true"
-            authorizationEndpoint="https://accounts.zoho.com/oauth/v2/auth"
-            clientId="1000.54H0AT9HC009NH4487PTRMJ0OBZG3E"
-            clientSecret="0df0714db9cfaf52f79902172351dcd956ebffa111"
-            enabled="true"
-            privacy="https://www.zoho.com/privacy.html"
-            prompt="consent"
-            redirectUri="https://oauth.faircode.eu/"
-            scopes="ZohoMail.messages.ALL"
-            tokenEndpoint="https://accounts.zoho.com/oauth/v2/token"
-            tokenScopes="false">
-            <parameter
-                key="access_type"
-                value="offline" />
-        </oauth>
     </provider>
     <provider
-        name="Zoho pro"
+        name="Zoho EU"
         documentation="You might need to &lt;a href=&quot;https://www.zoho.com/mail/help/imap-access.html#EnableIMAP&quot;&gt;enable IMAP&lt;/a&gt; and use &lt;a href=&quot;https://help.zoho.com/portal/en/kb/bigin/channels/email/articles/generate-an-app-specific-password&quot;&gt;an app password&lt;/a&gt;."
-        id="zohopro"
-        link="https://www.zoho.com/mail/help/imap-access.html"
+        domain="zohomail\\.eu,zoho\\.eu"
+        link="https://www.zoho.eu/mail/help/imap-access.html"
         maxtls="1.2">
         <imap
-            host="imappro.zoho.com"
+            host="imap.zoho.eu"
             port="993"
             starttls="false" />
         <smtp
-            host="smtppro.zoho.com"
+            host="smtp.zoho.eu"
             port="465"
             starttls="false" />
-        <oauth
-            askAccount="true"
-            authorizationEndpoint="https://accounts.zoho.com/oauth/v2/auth"
-            clientId="1000.54H0AT9HC009NH4487PTRMJ0OBZG3E"
-            clientSecret="0df0714db9cfaf52f79902172351dcd956ebffa111"
-            enabled="true"
-            privacy="https://www.zoho.com/privacy.html"
-            prompt="consent"
-            redirectUri="https://oauth.faircode.eu/"
-            scopes="ZohoMail.messages.ALL"
-            tokenEndpoint="https://accounts.zoho.com/oauth/v2/token"
-            tokenScopes="false">
-            <parameter
-                key="access_type"
-                value="offline" />
-        </oauth>
     </provider>
     <provider
-        name="Zoho EU"
+        name="Zoho AU"
         documentation="You might need to &lt;a href=&quot;https://www.zoho.com/mail/help/imap-access.html#EnableIMAP&quot;&gt;enable IMAP&lt;/a&gt; and use &lt;a href=&quot;https://help.zoho.com/portal/en/kb/bigin/channels/email/articles/generate-an-app-specific-password&quot;&gt;an app password&lt;/a&gt;."
-        domain="zohomail\\.eu,zoho\\.eu"
-        link="https://www.zoho.eu/mail/help/imap-access.html"
+        domain="zohomail\\.com\\.au"
         maxtls="1.2">
         <imap
-            host="imap.zoho.eu"
+            host="imap.zoho.com.au"
             port="993"
             starttls="false" />
         <smtp
-            host="smtp.zoho.eu"
+            host="smtp.zoho.com.au"
             port="465"
             starttls="false" />
     </provider>
     <provider
-        name="Zoho AU"
+        name="Zoho pro"
         documentation="You might need to &lt;a href=&quot;https://www.zoho.com/mail/help/imap-access.html#EnableIMAP&quot;&gt;enable IMAP&lt;/a&gt; and use &lt;a href=&quot;https://help.zoho.com/portal/en/kb/bigin/channels/email/articles/generate-an-app-specific-password&quot;&gt;an app password&lt;/a&gt;."
-        domain="zohomail\\.com\\.au"
         maxtls="1.2">
         <imap
-            host="imap.zoho.com.au"
+            host="imappro.zoho.com"
             port="993"
             starttls="false" />
         <smtp
-            host="smtp.zoho.com.au"
+            host="smtppro.zoho.com"
             port="465"
             starttls="false" />
     </provider>