mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Keep current primary account on import

This commit is contained in:
M66B 2019-07-29 20:10:30 +02:00
parent 99412f294f
commit 4363218b7b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/eu/faircode/email/ActivitySetup.java
View File

@ -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;