From 545d4664aef500cb4942883c4c39ff1f2011bce2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 17 Aug 2021 14:21:08 +0200
Subject: [PATCH] Prevent crash

---
 app/src/main/java/eu/faircode/email/Core.java      |  2 +-
 app/src/main/java/eu/faircode/email/DB.java        |  2 ++
 app/src/main/java/eu/faircode/email/EntityLog.java | 12 ++++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index 57297727b9..1a25f3273f 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -5272,7 +5272,7 @@ class Core {
                                 groupNotifying.put(group, new ArrayList<>());
 
                             if (id > 0) {
-                                EntityLog.log(context, null, null, null, id,
+                                EntityLog.log(context, EntityLog.Type.Notification, null, null, id,
                                         "Notify restore " + tag + " id=" + id);
                                 groupNotifying.get(group).add(id);
                             }
diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java
index ebf7e15538..a575323682 100644
--- a/app/src/main/java/eu/faircode/email/DB.java
+++ b/app/src/main/java/eu/faircode/email/DB.java
@@ -2250,6 +2250,8 @@ public abstract class DB extends RoomDatabase {
 
         @TypeConverter
         public static int fromLogType(EntityLog.Type type) {
+            if (type == null)
+                type = EntityLog.Type.General;
             return type.ordinal();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/EntityLog.java b/app/src/main/java/eu/faircode/email/EntityLog.java
index 9669a6bd95..70eff60ac5 100644
--- a/app/src/main/java/eu/faircode/email/EntityLog.java
+++ b/app/src/main/java/eu/faircode/email/EntityLog.java
@@ -71,27 +71,27 @@ public class EntityLog {
         log(context, Type.General, data);
     }
 
-    static void log(final Context context, Type type, EntityAccount account, String data) {
+    static void log(final Context context, @NonNull Type type, EntityAccount account, String data) {
         log(context, type, account.id, null, null, account.name + " " + data);
     }
 
-    static void log(final Context context, Type type, EntityAccount account, EntityFolder folder, String data) {
+    static void log(final Context context, @NonNull Type type, EntityAccount account, EntityFolder folder, String data) {
         log(context, type, account.id, folder.id, null, account.name + "/" + folder.name + " " + data);
     }
 
-    static void log(final Context context, Type type, EntityFolder folder, String data) {
+    static void log(final Context context, @NonNull Type type, EntityFolder folder, String data) {
         log(context, type, folder.account, folder.id, null, folder.name + " " + data);
     }
 
-    static void log(final Context context, Type type, EntityMessage message, String data) {
+    static void log(final Context context, @NonNull Type type, EntityMessage message, String data) {
         log(context, type, message.account, message.folder, message.id, data);
     }
 
-    static void log(final Context context, Type type, String data) {
+    static void log(final Context context, @NonNull Type type, String data) {
         log(context, type, null, null, null, data);
     }
 
-    static void log(final Context context, Type type, Long account, Long folder, Long message, String data) {
+    static void log(final Context context, @NonNull Type type, Long account, Long folder, Long message, String data) {
         Log.i(data);
 
         if (context == null)