From 9182ffb1573c77367ad6b5e4b1f3e4f52b3c3ea4 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@jolla.com>
Date: Mon, 9 Mar 2026 09:43:54 +0100
Subject: Fix Mastodon sync and transfer reliability edge cases

---
 transferengine-plugins/mastodonshareservicestatus.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'transferengine-plugins/mastodonshareservicestatus.cpp')

diff --git a/transferengine-plugins/mastodonshareservicestatus.cpp b/transferengine-plugins/mastodonshareservicestatus.cpp
index f3c96ca..3ac05d5 100644
--- a/transferengine-plugins/mastodonshareservicestatus.cpp
+++ b/transferengine-plugins/mastodonshareservicestatus.cpp
@@ -186,7 +186,7 @@ void MastodonShareServiceStatus::queryStatus(QueryStatusMode mode)
 
     bool signInActive = false;
     Q_FOREACH (Accounts::AccountId id, m_accountManager->accountList()) {
-        Accounts::Account *acc = m_accountManager->account(id);
+        Accounts::Account *acc = Accounts::Account::fromId(m_accountManager, id, this);
 
         if (!acc) {
             qWarning() << Q_FUNC_INFO << "Failed to get account for id:" << id;
@@ -206,6 +206,7 @@ void MastodonShareServiceStatus::queryStatus(QueryStatusMode mode)
         }
 
         if (!service.isValid() || !serviceFound) {
+            acc->deleteLater();
             continue;
         }
 
@@ -214,12 +215,14 @@ void MastodonShareServiceStatus::queryStatus(QueryStatusMode mode)
         const bool shareServiceEnabled = acc->enabled();
         if (!accountEnabled || !shareServiceEnabled) {
             acc->selectService(Accounts::Service());
+            acc->deleteLater();
             continue;
         }
 
         if (acc->value(QStringLiteral("CredentialsNeedUpdate")).toBool()) {
             qWarning() << Q_FUNC_INFO << "Credentials need update for account id:" << id;
             acc->selectService(Accounts::Service());
+            acc->deleteLater();
             continue;
         }
 
@@ -256,6 +259,7 @@ void MastodonShareServiceStatus::queryStatus(QueryStatusMode mode)
         }
 
         acc->selectService(Accounts::Service());
+        acc->deleteLater();
     }
 
     if (!signInActive) {
-- 
cgit v1.2.3