From 4a2ebd0c8119c78ad949cd2c432824a32cda8889 Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Thu, 8 Aug 2024 22:13:39 +0000
Subject: [PATCH] feat: allow using OAuth 2 with SOCKS5

SOCKS5 for HTTP requests is supported since
fa198c3b5e5e543f9ac6d78a495bc2250da8c2d9
(PR <https://github.com/deltachat/deltachat-core-rust/pull/4017>)
---
 src/configure.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/configure.rs b/src/configure.rs
index 74961ac9c..8f9f2d500 100644
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -189,10 +189,8 @@ async fn configure(ctx: &Context, param: &mut LoginParam) -> Result<()> {
 
     // Step 1: Load the parameters and check email-address and password
 
-    // Do oauth2 only if socks5 is disabled. As soon as we have a http library that can do
-    // socks5 requests, this can work with socks5 too.  OAuth is always set either for both
-    // IMAP and SMTP or not at all.
-    if param.imap.oauth2 && !socks5_enabled {
+    // OAuth is always set either for both IMAP and SMTP or not at all.
+    if param.imap.oauth2 {
         // the used oauth2 addr may differ, check this.
         // if get_oauth2_addr() is not available in the oauth2 implementation, just use the given one.
         progress!(ctx, 10);