Prevent exception

5 years ago · 4e82cc88b2
parent 4c2eb9e073
commit 4e82cc88b2
2 changed files with 3 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
+++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
@ -457,7 +457,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
                                    rules, null);
                            found++;
                        }
-                        db.message().setMessageFound(message.account, message.thread);
+                        if (message != null)
+                            db.message().setMessageFound(message.account, message.thread);
                    } catch (MessageRemovedException ex) {
                        Log.w(browsable.name + " boundary server", ex);
                    } catch (FolderClosedException ex) {
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@ -1849,7 +1849,7 @@ class Core {
                                istore, ifolder, (MimeMessage) isub[j],
                                false, download,
                                rules, state);
-                        ids[from + j] = message.id;
+                        ids[from + j] = (message == null ? null : message.id);
                    } catch (MessageRemovedException ex) {
                        Log.w(folder.name, ex);
                    } catch (FolderClosedException ex) {