Reduced timeout on fallback

This saves 4 x 10 seconds keeping the device awake
5 years ago · 84d717e182
parent 61e5beb7a0
commit 84d717e182
1 changed files with 6 additions and 0 deletions
--- 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) {