Merge pull request #14 from lduboeuf/xenial_-_sentdateempty

handle case where sms or mms don't have the sent date set

ofonotextchannel.cpp

@@ -461,7 +461,7 @@ void oFonoTextChannel::messageReceived(const QString &message, uint handle, cons
     Tp::MessagePart header;
     header["message-token"] = QDBusVariant(info["SentTime"].toString() +"-" + QString::number(mMessageCounter++));
     header["message-received"] = QDBusVariant(QDateTime::currentDateTime().toTime_t());
-    header["message-sent"] = QDBusVariant(QDateTime::fromString(info["SentTime"].toString(), Qt::ISODate).toTime_t());
+    header["message-sent"] = QDBusVariant(getSentDate(info["SentTime"].toString()).toTime_t());
     header["message-sender"] = QDBusVariant(handle);
     header["message-sender-id"] = QDBusVariant(mPhoneNumbers[0]);
     header["message-type"] = QDBusVariant(Tp::ChannelTextMessageTypeNormal);
@@ -480,7 +480,7 @@ void oFonoTextChannel::mmsReceived(const QString &id, uint handle, const QVarian
     header["message-token"] = QDBusVariant(id);
     header["message-sender"] = QDBusVariant(handle);
     header["message-received"] = QDBusVariant(QDateTime::currentDateTimeUtc().toTime_t());
-    header["message-sent"] = QDBusVariant(QDateTime::fromString(properties["SentTime"].toString(), Qt::ISODate).toTime_t());
+    header["message-sent"] = QDBusVariant(getSentDate(properties["Date"].toString()).toTime_t());
     header["message-type"] = QDBusVariant(Tp::DeliveryStatusDelivered);
     header["x-canonical-mms"] = QDBusVariant(true);
     if (!subject.isEmpty())
@@ -518,3 +518,14 @@ void oFonoTextChannel::mmsReceived(const QString &id, uint handle, const QVarian
 
     mTextChannel->addReceivedMessage(message);
 }
+
+QDateTime oFonoTextChannel::getSentDate(const QString &sentTime){
+    QDateTime dt = QDateTime::fromString(sentTime, Qt::ISODate);
+    QDateTime currentDate  = QDateTime::currentDateTimeUtc();
+    //some text message may not have the Sentime set, use the received one in that case
+    if (!dt.isValid() || dt > currentDate){
+        dt = currentDate;
+    }
+
+    return dt;
+}

ofonotextchannel.h

@@ -60,6 +60,7 @@ private Q_SLOTS:
 
 private:
     ~oFonoTextChannel();
+    QDateTime getSentDate(const QString &sentTime);
     Tp::BaseChannelPtr mBaseChannel;
     QStringList mPhoneNumbers;
     oFonoConnection *mConnection;