From 9a7802d31968ddf68c81752a72d2fcf42e3c20c3 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 13 Nov 2018 10:27:25 +0100 Subject: [PATCH] Reload on delete only if synchronizing --- app/src/main/java/eu/faircode/email/FragmentAccount.java | 7 +++++-- app/src/main/java/eu/faircode/email/FragmentIdentity.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java index ec1d6cb148..880b763174 100644 --- a/app/src/main/java/eu/faircode/email/FragmentAccount.java +++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java @@ -840,8 +840,11 @@ public class FragmentAccount extends FragmentEx { @Override protected Void onLoad(Context context, Bundle args) { long id = args.getLong("id"); - DB.getInstance(context).account().deleteAccount(id); - ServiceSynchronize.reload(getContext(), "delete account"); + DB db = DB.getInstance(context); + EntityAccount account = db.account().getAccount(id); + db.account().deleteAccount(id); + if (account.synchronize) + ServiceSynchronize.reload(getContext(), "delete account"); return null; } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 1b1589886d..964ff656ad 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -521,8 +521,11 @@ public class FragmentIdentity extends FragmentEx { @Override protected Void onLoad(Context context, Bundle args) { long id = args.getLong("id"); - DB.getInstance(context).identity().deleteIdentity(id); - ServiceSynchronize.reload(getContext(), "delete identity"); + DB db = DB.getInstance(context); + EntityIdentity identity = db.identity().getIdentity(id); + db.identity().deleteIdentity(id); + if (identity.synchronize) + ServiceSynchronize.reload(getContext(), "delete identity"); return null; }