From a6f39a1fac9fe8e459bb7d3e1625569cccd52775 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 9 Nov 2022 16:16:40 +0100
Subject: [PATCH] OAuth/PCKE is used by default

---
 app/src/main/java/eu/faircode/email/EmailProvider.java | 2 --
 app/src/main/java/eu/faircode/email/FragmentOAuth.java | 3 ---
 app/src/main/res/xml/providers.xml                     | 2 --
 3 files changed, 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index dcd32c87b2..1209ee2816 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -281,7 +281,6 @@ public class EmailProvider implements Parcelable {
                         provider.oauth.askAccount = getAttributeBooleanValue(xml, "askAccount", false);
                         provider.oauth.clientId = xml.getAttributeValue(null, "clientId");
                         provider.oauth.clientSecret = xml.getAttributeValue(null, "clientSecret");
-                        provider.oauth.pcke = getAttributeBooleanValue(xml, "pcke", false);
                         provider.oauth.scopes = xml.getAttributeValue(null, "scopes").split(",");
                         provider.oauth.authorizationEndpoint = xml.getAttributeValue(null, "authorizationEndpoint");
                         provider.oauth.tokenEndpoint = xml.getAttributeValue(null, "tokenEndpoint");
@@ -1306,7 +1305,6 @@ public class EmailProvider implements Parcelable {
         boolean askAccount;
         String clientId;
         String clientSecret;
-        boolean pcke;
         String[] scopes;
         String authorizationEndpoint;
         String tokenEndpoint;
diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
index 7a61ad5f24..693202b299 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java
@@ -460,9 +460,6 @@ public class FragmentOAuth extends FragmentBase {
                     authRequestBuilder.setLoginHint(address);
             }
 
-            if (provider.oauth.pcke)
-                authRequestBuilder.setCodeVerifier(CodeVerifierUtil.generateRandomCodeVerifier());
-
             if (!TextUtils.isEmpty(provider.oauth.prompt))
                 authRequestBuilder.setPrompt(provider.oauth.prompt);
 
diff --git a/app/src/main/res/xml/providers.xml b/app/src/main/res/xml/providers.xml
index 206db07cd7..a61bbbee10 100644
--- a/app/src/main/res/xml/providers.xml
+++ b/app/src/main/res/xml/providers.xml
@@ -232,7 +232,6 @@
             clientId="dj0yJmk9SWtNZm1vUFc2THJDJnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWRi"
             clientSecret="261a91fbbdb2852c4e80fdd3d1db4a8ebfa4c42b"
             enabled="true"
-            pcke="true"
             privacy="https://www.verizonmedia.com/policies/us/en/verizonmedia/privacy/index.html"
             redirectUri="https://oauth.faircode.eu/"
             scopes="mail-w"
@@ -872,7 +871,6 @@
             authorizationEndpoint="https://api.login.aol.com/oauth2/request_auth"
             clientId="dj0yJmk9SFVJYWVtS21RMjYyJmQ9WVdrOVJVcENRMXBTT1drbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTJh"
             enabled="true"
-            pcke="true"
             privacy="https://legal.yahoo.com/us/en/yahoo/privacy/index.html"
             redirectUri="https://oauth.faircode.eu/"
             scopes="mail-w"