history: Fix regression + integer overflow

While not documented, "0" was used as "unlimited hsitory", but
with the recent change, it became "no history". It may make sense
to use -1 as unlimited, but that would break compatibility for
those who imported sflphone configs into Ring.

Also use "long long" as holder for the seconds count. LLVM
UBSAN asserted on an interget overflow on (32bit) ARMv7.

Change-Id: I7137d7f015fd3b42bd46624fa342a39246f05a59
Tuleap: #103

src/categorizedhistorymodel.cpp

@@ -281,6 +281,13 @@ void CategorizedHistoryModel::setHistoryLimited(bool isLimited)
       ConfigurationManager::instance().setHistoryLimit(0);
 }
 
+///Set if the history is enabled
+void CategorizedHistoryModel::setHistoryEnabled(bool isEnabled)
+{
+   if (!isEnabled)
+      ConfigurationManager::instance().setHistoryLimit(-1);
+}
+
 ///Set the number of days before history items are discarded
 void CategorizedHistoryModel::setHistoryLimit(int numberOfDays)
 {
@@ -290,7 +297,7 @@ void CategorizedHistoryModel::setHistoryLimit(int numberOfDays)
 ///Is history items are being deleted after "historyLimit()" days
 bool CategorizedHistoryModel::isHistoryLimited() const
 {
-   return ConfigurationManager::instance().getHistoryLimit() != 0;
+   return ConfigurationManager::instance().getHistoryLimit() > 0;
 }
 
 ///Number of days before items are discarded (0 = never)
@@ -299,6 +306,12 @@ int CategorizedHistoryModel::historyLimit() const
    return ConfigurationManager::instance().getHistoryLimit();
 }
 
+///Get if the history is enabled
+bool CategorizedHistoryModel::isHistoryEnabled() const
+{
+   return ConfigurationManager::instance().getHistoryLimit() >= 0;
+}
+
 
 /*****************************************************************************
  *                                                                           *

src/categorizedhistorymodel.h

@@ -53,6 +53,8 @@ public:
 
    //Properties
    Q_PROPERTY(bool hasCollections   READ hasCollections  )
+   Q_PROPERTY(bool historyEnabled   READ isHistoryEnabled WRITE setHistoryEnabled)
+   Q_PROPERTY(bool historyLimited   READ isHistoryLimited WRITE setHistoryLimited)
 
    //Singleton
    static CategorizedHistoryModel& instance();
@@ -60,6 +62,7 @@ public:
    //Getters
    int  acceptedPayloadTypes       () const;
    bool isHistoryLimited           () const;
+   bool isHistoryEnabled           () const;
    int  historyLimit               () const;
    const CallMap getHistoryCalls   () const;
 
@@ -70,6 +73,7 @@ public:
    void setCategoryRole(int role);
    void setHistoryLimited(bool isLimited);
    void setHistoryLimit(int numberOfDays);
+   void setHistoryEnabled(bool isEnabled);
 
    //Model implementation
    virtual bool          setData     ( const QModelIndex& index, const QVariant &value, int role   ) override;
@@ -120,4 +124,3 @@ Q_SIGNALS:
    ///Emitted when a new item is added to prevent full reload
    void newHistoryCall          ( Call* call );
 };
-

src/localhistorycollection.cpp

@@ -80,6 +80,9 @@ LocalHistoryCollection::~LocalHistoryCollection()
 
 void LocalHistoryEditor::saveCall(QTextStream& stream, const Call* call)
 {
+   if (!CategorizedHistoryModel::instance().isHistoryEnabled())
+      return;
+
    stream.setCodec("UTF-8");
    const QString direction = (call->direction()==Call::Direction::INCOMING)?
       Call::HistoryStateName::INCOMING : Call::HistoryStateName::OUTGOING;
@@ -209,6 +212,9 @@ bool LocalHistoryCollection::isEnabled() const
 
 bool LocalHistoryCollection::load()
 {
+   if (!CategorizedHistoryModel::instance().isHistoryEnabled())
+      return false;
+
    QFile file(QStandardPaths::writableLocation(QStandardPaths::DataLocation) + QLatin1Char('/') +"history.ini");
    if ( file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
       QMap<QString,QString> hc;
@@ -218,7 +224,9 @@ bool LocalHistoryCollection::load()
          lines << file.readLine().trimmed();
       file.close();
 
-      int dayLimit = CategorizedHistoryModel::instance().historyLimit() * 24 * 3600;
+      const bool      isLimited = CategorizedHistoryModel::instance().isHistoryLimited();
+      const long long dayLimit  = CategorizedHistoryModel::instance().historyLimit() * 24 * 3600;
+
       time_t now = time(0); // get time now
 
       for (const QString& line : lines) {
@@ -226,7 +234,7 @@ bool LocalHistoryCollection::load()
          if ((line.isEmpty() || !line.size()) && hc.size()) {
             Call* pastCall = Call::buildHistoryCall(hc);
 
-            if ((now - pastCall->startTimeStamp()) < dayLimit) {
+            if (!isLimited || ( (now - pastCall->startTimeStamp()) < dayLimit) ) {
                pastCall->setCollection(this);
                editor<Call>()->addExisting(pastCall);
             }