Update email status

3 files changed, 33 insertions, 4 deletions

diff --git a/components/package/contents/ui/ConversationView.qml b/components/package/contents/ui/ConversationView.qml
index 3f5976c2..aa3abcd2 100644
--- a/components/package/contents/ui/ConversationView.qml
+++ b/components/package/contents/ui/ConversationView.qml
@@ -476,9 +476,20 @@ Rectangle {
                         rightMargin: Kirigami.Units.largeSpacing
                         topMargin: Math.max(attachments.height, Kirigami.Units.largeSpacing)
                     }
-                    //TODO Change text if we're fetching the body
-                    text: "Incomplete body..."
                     visible: model.incomplete
+                    text: "Incomplete body..."
+                    color: Kirigami.Theme.textColor
+                    enabled: false
+                    states: [
+                        State {
+                            name: "inprogress"; when: model.status == KubeFramework.MailListModel.InProgressStatus
+                            PropertyChanges { target: incompleteBody; text: "Downloading message..." }
+                        },
+                        State {
+                            name: "error"; when: model.status == KubeFramework.MailListModel.ErrorStatus
+                            PropertyChanges { target: incompleteBody; text: "Failed to download message..." }
+                        }
+                    ]
                 }
                 Item {
                     id: footer
diff --git a/framework/domain/maillistmodel.cpp b/framework/domain/maillistmodel.cpp
index bdf7b9f5..278dca22 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/domain/maillistmodel.cpp
@@ -67,6 +67,7 @@ QHash< int, QByteArray > MailListModel::roleNames() const
     roles[ThreadSize] = "threadSize";
     roles[Mail] = "mail";
     roles[Incomplete] = "incomplete";
+    roles[Status] = "status";
 
     return roles;
 }
@@ -137,6 +138,15 @@ QVariant MailListModel::data(const QModelIndex &idx, int role) const
             return QVariant::fromValue(mail);
         case Incomplete:
             return !mail->getFullPayloadAvailable();
+        case Status:
+            const auto status = srcIdx.data(Sink::Store::StatusRole).toInt();
+            if (status == Sink::ApplicationDomain::SyncStatus::SyncInProgress) {
+                return InProgressStatus;
+            }
+            if (status == Sink::ApplicationDomain::SyncStatus::SyncError) {
+                return ErrorStatus;
+            }
+            return NoStatus;
     }
     return QSortFilterProxyModel::data(idx, role);
 }
@@ -208,7 +218,7 @@ void MailListModel::setMail(const QVariant &variant)
     }
     mCurrentQueryItem = mail->identifier();
     Sink::Query query = Sink::StandardQueries::completeThread(*mail);
-    query.setFlags(Sink::Query::LiveQuery);
+    query.setFlags(Sink::Query::LiveQuery | Sink::Query::UpdateStatus);
     query.request<Mail::Subject>();
     query.request<Mail::Sender>();
     query.request<Mail::To>();
diff --git a/framework/domain/maillistmodel.h b/framework/domain/maillistmodel.h
index 8f61fce6..8e22da60 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/domain/maillistmodel.h
@@ -34,6 +34,13 @@ class MailListModel : public QSortFilterProxyModel
     Q_PROPERTY (QString filter READ filter WRITE setFilter)
 
 public:
+    enum Status {
+        NoStatus,
+        InProgressStatus,
+        ErrorStatus
+    };
+    Q_ENUMS(Status)
+
     MailListModel(QObject *parent = Q_NULLPTR);
     ~MailListModel();
 
@@ -59,7 +66,8 @@ public:
         DomainObject,
         ThreadSize,
         Mail,
-        Incomplete
+        Incomplete,
+        Status
     };
 
     QHash<int, QByteArray> roleNames() const Q_DECL_OVERRIDE;