[nemo-qml-plugin-email] Remove artificial one week limit for date sec…

…tions. Contributes to JB#17582
sailfishos · May 6, 2020 · a602851 · a602851
1 parent 5d0819a
commit a602851
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 39 deletions.
diff --git a/src/emailmessagelistmodel.cpp b/src/emailmessagelistmodel.cpp
@@ -31,8 +31,7 @@ EmailMessageListModel::EmailMessageListModel(QObject *parent)
       m_searchBody(true),
       m_searchRemainingOnRemote(0),
       m_searchCanceled(false),
-      m_folderAccessor(new FolderAccessor(this)),
-      m_currentDate(QDate::currentDate())
+      m_folderAccessor(new FolderAccessor(this))
 {
     roles[QMailMessageModelBase::MessageAddressTextRole] = "sender";
     roles[QMailMessageModelBase::MessageSubjectTextRole] = "subject";
@@ -195,17 +194,11 @@ QVariant EmailMessageListModel::data(const QModelIndex & index, int role) const
     } else if (role == MessageSenderEmailAddressRole) {
         return messageMetaData.from().address();
     } else if (role == MessageTimeStampRole) {
-        return (messageMetaData.date().toLocalTime());
+        return messageMetaData.date().toLocalTime();
     } else if (role == MessagePreviewRole) {
         return messageMetaData.preview().simplified();
     } else if (role == MessageTimeSectionRole) {
-        const int daysDiff = m_currentDate.toJulianDay() - (messageMetaData.date().toLocalTime()).date().toJulianDay();
-        if (daysDiff < 7) {
-            return (messageMetaData.date().toLocalTime()).date();
-        } else {
-            //returns epoch time for items older than a week
-            return QDateTime::fromTime_t(0);
-        }
+        return messageMetaData.date().toLocalTime().date();
     } else if (role == MessagePriorityRole) {
         if (messageMetaData.status() & QMailMessage::HighPriority) {
             return HighPriority;
@@ -399,25 +392,6 @@ bool EmailMessageListModel::unreadMailsSelected() const
     return !m_selectedUnreadIdx.isEmpty();
 }
 
-void EmailMessageListModel::notifyDateChanged()
-{
-    dataChanged(index(0), index(rowCount() - 1), QVector<int>() << MessageTimeSectionRole);
-}
-
-void EmailMessageListModel::setCurrentDate(const QDate &dt)
-{
-    if (m_currentDate != dt) {
-        m_currentDate = dt;
-        emit currentDateChanged();
-        emit dataChanged(index(0), index(rowCount() - 1), QVector<int>() << MessageTimeSectionRole);
-    }
-}
-
-QDate EmailMessageListModel::currentDate() const
-{
-    return m_currentDate;
-}
-
 void EmailMessageListModel::setSortBy(EmailMessageListModel::Sort sort)
 {
     Qt::SortOrder order = Qt::AscendingOrder;

diff --git a/src/emailmessagelistmodel.h b/src/emailmessagelistmodel.h
@@ -43,7 +43,6 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
     Q_PROPERTY(int searchRemainingOnRemote READ searchRemainingOnRemote NOTIFY searchRemainingOnRemoteChanged FINAL)
     Q_PROPERTY(EmailMessageListModel::Sort sortBy READ sortBy WRITE setSortBy NOTIFY sortByChanged)
     Q_PROPERTY(bool unreadMailsSelected READ unreadMailsSelected NOTIFY unreadMailsSelectedChanged FINAL)
-    Q_PROPERTY(QDate currentDate READ currentDate WRITE setCurrentDate NOTIFY currentDateChanged)
 
 public:
     enum Roles {
@@ -62,7 +61,7 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
         MessageTimeStampRole,                                  // returns timestamp in QDateTime format
         MessageSelectModeRole,                                 // returns the select mode
         MessagePreviewRole,                                    // returns message preview if available
-        MessageTimeSectionRole,                                // returns time section relative to the current time
+        MessageTimeSectionRole,                                // returns time section
         MessagePriorityRole,                                   // returns message priority
         MessageAccountIdRole,                                  // returns parent account id for the message
         MessageHasAttachmentsRole,                             // returns 1 if message has attachments, 0 otherwise
@@ -109,10 +108,6 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
     void setSortBy(Sort sort);
     EmailMessageListModel::Sort sortBy() const;
     bool unreadMailsSelected() const;
-    void setCurrentDate(const QDate &dt);
-    QDate currentDate() const;
-
-    Q_INVOKABLE void notifyDateChanged();
 
 Q_SIGNALS:
     void folderAccessorChanged();
@@ -129,7 +124,6 @@ class Q_DECL_EXPORT EmailMessageListModel : public QMailMessageListModel
     void searchRemainingOnRemoteChanged();
     void sortByChanged();
     void unreadMailsSelectedChanged();
-    void currentDateChanged();
 
 public:
     Q_INVOKABLE void setSearch(const QString &search);
@@ -188,7 +182,6 @@ private slots:
     QList<int> m_selectedUnreadIdx;
     QTimer m_remoteSearchTimer;
     FolderAccessor *m_folderAccessor;
-    QDate m_currentDate;
 };
 
 #endif
diff --git a/src/plugin/plugins.qmltypes b/src/plugin/plugins.qmltypes
@@ -825,8 +825,6 @@ Module {
         Property { name: "searchRemainingOnRemote"; type: "int"; isReadonly: true }
         Property { name: "sortBy"; type: "EmailMessageListModel::Sort" }
         Property { name: "unreadMailsSelected"; type: "bool"; isReadonly: true }
-        Property { name: "currentDate"; type: "QDate" }
-        Method { name: "notifyDateChanged" }
         Method {
             name: "setSearch"
             Parameter { name: "search"; type: "string" }