Single account is primary

4 months ago · 2b3eba1a57
parent ac716f66a5
commit 2b3eba1a57
2 changed files with 10 additions and 0 deletions
--- a/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java
+++ b/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java
@ -208,6 +208,13 @@ public class FairEmailBackupAgent extends BackupAgent {
                                        db.account().getAccountByUUID(account.uuid) != null)
                                    continue;

+                                if (jaccounts.length() == 1)
+                                    account.primary = true;
+
+                                EntityAccount primary = db.account().getPrimaryAccount();
+                                if (primary != null)
+                                    account.primary = false;
+
                                if (account.auth_type == ServiceAuthenticator.AUTH_TYPE_GMAIL)
                                    account.synchronize = false;

--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java
@ -947,6 +947,9 @@ public class FragmentOptionsBackup extends FragmentBase implements SharedPrefere
                            Long aid = account.id;
                            account.id = null;

+                            if (jaccounts.length() == 1)
+                                account.primary = true;
+
                            EntityAccount primary = db.account().getPrimaryAccount();
                            if (primary != null)
                                account.primary = false;