From 84d717e182f7f8477e831068acb87c7a3064f0be Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 9 Mar 2020 17:15:05 +0100
Subject: [PATCH] Reduced timeout on fallback

This saves 4 x 10 seconds keeping the device awake
---
 app/src/main/java/eu/faircode/email/EmailService.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index 9babc21832..66aa9badfc 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -414,12 +414,18 @@ public class EmailService implements AutoCloseable {
                                 ip6 = true;
                             }
 
+                            String prop = "mail." + protocol + ".connectiontimeout";
+                            String timeout = properties.getProperty(prop);
                             try {
                                 Log.i("Falling back to " + iaddr.getHostAddress());
+                                properties.put(prop, Integer.toString(DEFAULT_CONNECT_TIMEOUT / 2));
                                 _connect(iaddr.getHostAddress(), port, user, password, factory);
                                 return;
                             } catch (MessagingException ex1) {
                                 Log.w(ex1);
+                            } finally {
+                                if (timeout != null)
+                                    properties.put(prop, timeout);
                             }
                         }
                 } catch (Throwable ex1) {