From 2b3eba1a5742575d3f3c0e84442976d3141678b2 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 23 Jul 2024 16:13:38 +0200 Subject: [PATCH] Single account is primary --- .../main/java/eu/faircode/email/FairEmailBackupAgent.java | 7 +++++++ .../main/java/eu/faircode/email/FragmentOptionsBackup.java | 3 +++ 2 files changed, 10 insertions(+) diff --git a/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java b/app/src/main/java/eu/faircode/email/FairEmailBackupAgent.java index 8ebd58723a..ea2b1ce062 100644 --- 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; diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBackup.java index 00a693d7f5..fcd052f7d8 100644 --- 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;