From 0619d2eb9ffe868d775539fce7301de2bdaca8d4 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 11 Apr 2021 08:59:36 +0200
Subject: [PATCH] Added OAuth for Mail.ru

Under review by Mail.ru
---
 .../main/java/eu/faircode/email/FragmentOAuth.java    |  3 +++
 app/src/main/res/xml/providers.xml                    | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 5a92e985cc..52cba54740 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -275,6 +275,9 @@ public class FragmentOAuth extends FragmentBase {
                 params.put("force_confirm", "true");
             }
 
+            if ("mailru".equals(provider))
+                params.put("prompt_force", "1");
+
             AuthorizationRequest.Builder authRequestBuilder =
                     new AuthorizationRequest.Builder(
                             serviceConfig,
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index a45c3cf874..02a85926dc 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -483,6 +483,7 @@
     <provider
         name="Mail.ru"
         domain="mail\\.ru,inbox\\.ru,list\\.ru,bk\\.ru"
+        id="mailru"
         link="https://help.mail.ru/mail-help/mailer/popsmtp">
         <imap
             host="imap.mail.ru"
@@ -492,6 +493,16 @@
             host="smtp.mail.ru"
             port="465"
             starttls="false" />
+        <oauth
+            askAccount="true"
+            authorizationEndpoint="https://oauth.mail.ru/login"
+            clientId="ce54d27dc1574b3a8b50e6789cd1a44a"
+            clientSecret="5f1525783e1d4defb3bc9c2c4b7d0c54"
+            enabled="false"
+            redirectUri="https://oauth.faircode.eu/"
+            scopes="userinfo,mail.imap"
+            tokenEndpoint="https://oauth.mail.ru/token" />
+        <!-- https://oauth.mail.ru/docs -->
     </provider>
     <provider
         name="KPN mail"