Prevent crash

5 years ago · e9521e20a1
parent e4632f3ba9
commit e9521e20a1
2 changed files with 4 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@ -276,6 +276,8 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                                    db.beginTransaction();

                                    EntityMessage message = db.message().getMessage(mid);
+                                    if (message == null)
+                                        continue;

                                    if (rule.matches(context, message, null))
                                        if (rule.execute(context, message))
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@ -1160,6 +1160,8 @@ public class FragmentRule extends FragmentBase {
                            db.message().getMessageIdsByFolder(rule.folder, null, null, null);
                    for (long id : ids) {
                        EntityMessage message = db.message().getMessage(id);
+                        if (message == null)
+                            continue;

                        if (rule.matches(context, message, null))
                            matching.add(message);