From 228e6b4dc9f05609b5cc64175833befeb86e6c85 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 5 Aug 2019 10:28:14 +0200 Subject: [PATCH] Small improvement --- app/src/main/java/eu/faircode/email/DB.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/DB.java b/app/src/main/java/eu/faircode/email/DB.java index 0cd4f835c9..388355927d 100644 --- a/app/src/main/java/eu/faircode/email/DB.java +++ b/app/src/main/java/eu/faircode/email/DB.java @@ -1075,13 +1075,12 @@ public abstract class DB extends RoomDatabase { } for (int i = 0; i < jaddresses.length(); i++) { JSONObject jaddress = (JSONObject) jaddresses.get(i); - if (jaddress.has("personal")) - result.add(new InternetAddress( - jaddress.getString("address"), - jaddress.getString("personal"))); + String email = jaddress.getString("address"); + String personal = jaddress.optString("personal"); + if (TextUtils.isEmpty(personal)) + result.add(new InternetAddress(email)); else - result.add(new InternetAddress( - jaddress.getString("address"))); + result.add(new InternetAddress(email, personal)); } } catch (Throwable ex) { // Compose can store invalid addresses