Prevent NPE

10 months ago · fc40808cb8
parent a8394d2d50
commit fc40808cb8
1 changed files with 7 additions and 4 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@ -4116,11 +4116,14 @@ public class FragmentMessages extends FragmentBase
                    long last = new Date().getTime() - MAX_FORWARD_ADDRESS_AGE;
                    List<String> fwds = db.message().getForwardAddresses(message.account, last);
                    if (fwds != null)
-                        for (String fwd : fwds)
-                            for (Address address : DB.Converters.decodeAddresses(fwd))
+                        for (String fwd : fwds) {
+                            Address[] afwds = DB.Converters.decodeAddresses(fwd);
+                            if (afwds != null)
+                                for (Address address : afwds)
                                    if (address instanceof InternetAddress)
                                        result.forwarded.add((InternetAddress) address);
                        }
+                }

                return result;
            }