Dev.

Sources/VoipSMS/CSMSMessage.cpp

@@ -1,9 +0,0 @@
-#include "CSMSMessage.h"
-
-
-
-CSMSMessage::CSMSMessage()
-{
-
-}
-

Sources/VoipSMS/SMSMessage.cpp

@@ -0,0 +1,38 @@
+#include "SMSMessage.h"
+#include <QDataStream>
+
+
+
+CSMSMessage::CSMSMessage()
+{
+
+}
+
+QDataStream &operator<<(QDataStream &out, const CSMSMessage &source)
+{
+
+    out << source.mDID
+        << source.mDateTime
+        << source.mMessageText
+        << source.mContact
+        << (qint32)source.mType
+        << source.mVOIPMSDatabaseID;
+
+
+    return out;
+}
+
+QDataStream &operator>>(QDataStream &in, CSMSMessage &dest)
+{
+    qint32 temp;
+    in >> dest.mDID
+       >> dest.mDateTime
+       >> dest.mMessageText
+       >> dest.mContact
+       >> temp
+       >> dest.mVOIPMSDatabaseID;
+
+    dest.mType = (eSMSType)temp;
+
+    return in;
+}

Sources/VoipSMS/SMSMessage.h

@@ -33,4 +33,7 @@ public:
 
 };
 
+QDataStream &operator<<(QDataStream &out, const CSMSMessage &source);
+QDataStream &operator>>(QDataStream &in, CSMSMessage &dest);
+
 #endif // CSMSOBJECT_H

Sources/VoipSMS/VoipMsSMSClient.cpp

@@ -56,7 +56,7 @@ int CVoipMsSMSClient::SendSMSDownloadRequest(QDate StartDate, QDate EndDate)
     Url.clear();
     QTextStream UrlStream(&Url);
 
-    qDebug() << "Sending request for dates from: " << StartDate.toString("yyyy-MM-dd") << " to: " << EndDate.toString("yyyy-MM-dd");
+ //   qDebug() << "Sending request for dates from: " << StartDate.toString("yyyy-MM-dd") << " to: " << EndDate.toString("yyyy-MM-dd");
 
     //   Url = "https://www.voip.ms/api/v1/rest.php?api_username=jean-francois.martel@polymtl.ca&api_password=Pentium2&method=getSMS&from=2015-11-01&to=2015-11-11&did=5143606463&limit=50";
 
@@ -69,7 +69,7 @@ int CVoipMsSMSClient::SendSMSDownloadRequest(QDate StartDate, QDate EndDate)
               << "did=" << mVOIPMsSettings.mDefaultDID << "&"
               << "limit=" << VOIP_MS_SMS_MAX_COUNT;
 
-    qDebug() << "Cmd: " << Url;
+//    qDebug() << "Cmd: " << Url;
     mVOIPMSSocket->get(QNetworkRequest(Url));
     mCurStartDate = EndDate;
 
@@ -166,7 +166,7 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
         }
 
         NBMsgReceived = NewMessages.size();
-        qDebug() << "Received " << NBMsgReceived << "messages";
+   //     qDebug() << "Received " << NBMsgReceived << "messages";
 
 
         if(mSMSMessagesList.size() >0 && NewMessages.size() > 0)
@@ -198,7 +198,7 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
                         finished = true;
                     }
                 }
-                if(mFirstDownloadDone == true)
+                if(mFirstDownloadDone == true && NewMessages.size() > 0)
                 {
                     qDebug() << "Added " << NewMessages.size() << " new SMS messages";
                     qDebug("-----------------------------------------------------------------------");
@@ -238,7 +238,7 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
                     }
                 }
                  mSMSMessagesList.append(NewMessages);
-                 if(mFirstDownloadDone == true)
+                 if(mFirstDownloadDone == true && NewMessages.size() > 0)
                  {
                      qDebug() << "Added " << NewMessages.size() << " new SMS messages";
                      qDebug("-----------------------------------------------------------------------");
@@ -271,15 +271,15 @@ unsigned int CVoipMsSMSClient::SMSReceived(QJsonArray *SMSArray)
         {
             if(mFirstDownloadDone == false)
             {
-                qDebug() << "Finished download of " << mSMSMessagesList.size() << " SMS messages";
-                qDebug("-----------------------------------------------------------------------");
-                qDebug(" ");
-                for(int i = 0; i < mSMSMessagesList.size(); i++)
-                {
-                    qDebug() << mSMSMessagesList.at(i).mDateTime.toString("yyyy-MM-dd hh:mm:ss") << " : " << mSMSMessagesList.at(i).mContact  << " : " << mSMSMessagesList.at(i).mMessageText.toUtf8().data();
-                }
-                qDebug("-----------------------------------------------------------------------");
-                qDebug(" ");
+//                qDebug() << "Finished download of " << mSMSMessagesList.size() << " SMS messages";
+//                qDebug("-----------------------------------------------------------------------");
+//                qDebug(" ");
+//                for(int i = 0; i < mSMSMessagesList.size(); i++)
+//                {
+//                    qDebug() << mSMSMessagesList.at(i).mDateTime.toString("yyyy-MM-dd hh:mm:ss") << " : " << mSMSMessagesList.at(i).mContact  << " : " << mSMSMessagesList.at(i).mMessageText.toUtf8().data();
+//                }
+//                qDebug("-----------------------------------------------------------------------");
+//                qDebug(" ");
 
 
                 mFirstDownloadDone = true;
@@ -383,6 +383,21 @@ void CVoipMsSMSClient::CheckNewSMSTimerExpired()
     CheckForNewSMS();
 }
 
+QList<CSMSMessage> *CVoipMsSMSClient::GetSMSList()
+{
+    return &mSMSMessagesList;
+}
+
+int CVoipMsSMSClient::GetSMSCount()
+{
+    return mSMSMessagesList.size();
+}
+
+QString CVoipMsSMSClient::GetDefaultDID()
+{
+    return mVOIPMsSettings.mDefaultDID;
+}
+
 
 //https://www.voip.ms/api/v1/rest.php?api_username=jean-francois.martel@polymtl.ca&api_password=Pentium2&method=getBalance&advanced=True
 

Sources/VoipSMS/VoipMsSMSClient.h

@@ -6,7 +6,7 @@
 #include <QNetworkReply>
 #include "GlobalDefine.h"
 #include <QList>
-#include "CSMSMessage.h"
+#include "SMSMessage.h"
 #include <QStringList>
 #include <QJsonArray>
 #include "ProgramSettings.h"
@@ -46,6 +46,11 @@ public:
 
 
 
+    QList<CSMSMessage> *GetSMSList();
+    int GetSMSCount();
+    QString GetDefaultDID();
+
+
 private:
     QNetworkAccessManager *mVOIPMSSocket;