From ddc64a56e580058d84ce57fca3daedaf661bf8e8 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 12 Jan 2019 12:39:39 +0000 Subject: [PATCH] Prevent crash --- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 5c77091220..3c6b2366f8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -558,10 +558,12 @@ public class FragmentIdentity extends FragmentEx { DB db = DB.getInstance(context); EntityIdentity identity = db.identity().getIdentity(id); + String identityRealm = (identity == null ? null : identity.realm); + boolean check = (synchronize && (identity == null || !host.equals(identity.host) || Integer.parseInt(port) != identity.port || !user.equals(identity.user) || !password.equals(identity.password) || - realm == null ? identity.realm != null : !realm.equals(identity.realm))); + realm == null ? identityRealm != null : !realm.equals(identityRealm))); boolean reload = (identity == null || identity.synchronize != synchronize || check); // Check SMTP server