Fallback to usable addresses only

4 years ago · 97189ca6b6
parent b3b320a4ef
commit 97189ca6b6
1 changed files with 13 additions and 11 deletions
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@ -417,18 +417,20 @@ public class EmailService implements AutoCloseable {
                        if (iaddr.equals(main))
                            continue;

-                        if (!vpn) {
-                            if (iaddr instanceof Inet4Address) {
-                                if (ip4 || !has4)
-                                    continue;
-                                ip4 = true;
-                            }
+                        if (iaddr instanceof Inet4Address) {
+                            if (!has4)
+                                continue;
+                            if (!vpn && ip4)
+                                continue;
+                            ip4 = true;
+                        }

-                            if (iaddr instanceof Inet6Address) {
-                                if (ip6 || !has6)
-                                    continue;
-                                ip6 = true;
-                            }
+                        if (iaddr instanceof Inet6Address) {
+                            if (!has6)
+                                continue;
+                            if (!vpn && ip6)
+                                continue;
+                            ip6 = true;
                        }

                        try {