From 4363218b7b5d2071d9d40aac1be7c27c69a717bf Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 29 Jul 2019 20:10:30 +0200 Subject: [PATCH] Keep current primary account on import --- app/src/main/java/eu/faircode/email/ActivitySetup.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 563fe5e261..7a1baa9f8f 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -762,6 +762,8 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac Log.i("Imported answer=" + answer.name + " id=" + answer.id + " (" + id + ")"); } + EntityAccount primary = db.account().getPrimaryAccount(); + // Accounts JSONArray jaccounts = jimport.getJSONArray("accounts"); for (int a = 0; a < jaccounts.length(); a++) { @@ -770,6 +772,9 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac Long aid = account.id; account.id = null; + if (primary != null) + account.primary = false; + // Forward referenced Long swipe_left = account.swipe_left; Long swipe_right = account.swipe_right;