mirror of
https://github.com/M66B/FairEmail.git
synced 2025-02-24 15:11:03 +00:00
Keep current primary account on import
This commit is contained in:
parent
99412f294f
commit
4363218b7b
1 changed files with 5 additions and 0 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue