Merge branch 'silence' into 'master'

[mkcal] Use QMailStore::queryAccounts to check that an id is an email account. See merge request mer-core/mkcal!42
sailfishos · Aug 24, 2020 · 91a9530 · 91a9530
2 parents 56242d3 + 780fcb4
commit 91a9530
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/plugins/defaultinvitationplugin/defaultinvitationplugin.cpp b/plugins/defaultinvitationplugin/defaultinvitationplugin.cpp
@@ -74,12 +74,15 @@ class DefaultInvitationPlugin::Private
         if (accountId.isEmpty()) {
             return QString();
         }
-        QMailAccount account(QMailAccountId(accountId.toULongLong()));
         QString email;
-        if (account.id().isValid() && (account.status() & QMailAccount::CanTransmit)) {
-            email = account.fromAddress().address();
-        } else {
-            qDebug() << "Default plugin: account" << accountId << "is not an email account";
+        const QMailAccountId accId(accountId.toULongLong());
+        if (!QMailStore::instance()->queryAccounts(QMailAccountKey::id(accId)).isEmpty()) {
+            QMailAccount account(accId);
+            if (account.id().isValid() && (account.status() & QMailAccount::CanTransmit)) {
+                email = account.fromAddress().address();
+            } else {
+                qWarning() << "Default plugin: account" << accountId << "is invalid or cannot transmit";
+            }
         }
         if (email.isEmpty()) {
             qDebug() << "Default plugin: account" << accountId << "do not have a valid email address";