From 59826ee56bea65b2a7f41209f407463714c03662 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 29 Jan 2023 18:47:56 +0100 Subject: [PATCH] Fixed importing searches --- app/src/main/java/eu/faircode/email/EntitySearch.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EntitySearch.java b/app/src/main/java/eu/faircode/email/EntitySearch.java index 0082b0bfca..3a8a59cb81 100644 --- a/app/src/main/java/eu/faircode/email/EntitySearch.java +++ b/app/src/main/java/eu/faircode/email/EntitySearch.java @@ -64,14 +64,14 @@ public class EntitySearch { public static EntitySearch fromJSON(JSONObject json) throws JSONException { EntitySearch search = new EntitySearch(); // id - if (json.has("account")) + if (json.has("account") && !json.isNull("account")) search.account_uuid = json.getString("account"); - if (json.has("folder")) + if (json.has("folder") && !json.isNull("folder")) search.folder_name = json.getString("folder"); search.name = json.getString("name"); - if (json.has("order")) + if (json.has("order") && !json.isNull("order")) search.order = json.getInt("order"); - if (json.has("color")) + if (json.has("color") && !json.isNull("color")) search.order = json.getInt("color"); search.data = json.getString("data");