Merge pull request #645 from deXol/develop

[BLE] #644 Remove cpzCtr check for ble during database import

Author: limpkin

src/MPDevice.cpp

@@ -3280,22 +3280,25 @@ bool MPDevice::generateSavePackets(AsyncJobs *jobs, bool tackleCreds, bool tackl
 
     /* We need to diff cpz ctr values for firmwares running < v1.2 */
     /* Diff: cpzctr values can only be added by design */
-    for (qint32 i = 0; i < cpzCtrValue.length(); i++)
+    if (!isBLE())
     {
-        bool cpzCtrFound = false;
-        for (qint32 j = 0; j < cpzCtrValueClone.length(); j++)
+        for (qint32 i = 0; i < cpzCtrValue.length(); i++)
         {
-            if (cpzCtrValue[i] == cpzCtrValueClone[j])
+            bool cpzCtrFound = false;
+            for (qint32 j = 0; j < cpzCtrValueClone.length(); j++)
             {
-                cpzCtrFound = true;
-                break;
+                if (cpzCtrValue[i] == cpzCtrValueClone[j])
+                {
+                    cpzCtrFound = true;
+                    break;
+                }
+            }
+            if (!cpzCtrFound)
+            {
+                qDebug() << "Adding missing cpzctr";
+                diagSavePacketsGenerated = true;
+                jobs->append(new MPCommandJob(this, MPCmd::ADD_CARD_CPZ_CTR, cpzCtrValue[i], pMesProt->getDefaultFuncDone()));
             }
-        }
-        if (!cpzCtrFound)
-        {
-            qDebug() << "Adding missing cpzctr";
-            diagSavePacketsGenerated = true;
-            jobs->append(new MPCommandJob(this, MPCmd::ADD_CARD_CPZ_CTR, cpzCtrValue[i], pMesProt->getDefaultFuncDone()));
         }
     }
 
@@ -5327,23 +5330,26 @@ void MPDevice::startImportFileMerging(const MPDeviceProgressCb &cbProgress, Mess
         /* We arrive here knowing that the CPZ is in the CPZ/CTR list */
         qInfo() << "Starting File Merging...";
 
-        /// Know if we need to add CPZ CTR packets (additive process)
-        for (qint32 i = 0; i < importedCpzCtrValue.size(); i++)
+        if (!isBLE())
         {
-            bool cpzFound = false;
-            for (qint32 j = 0; j < cpzCtrValue.size(); j++)
+            /// Know if we need to add CPZ CTR packets (additive process)
+            for (qint32 i = 0; i < importedCpzCtrValue.size(); i++)
             {
-                if (cpzCtrValue[j] == importedCpzCtrValue[i])
+                bool cpzFound = false;
+                for (qint32 j = 0; j < cpzCtrValue.size(); j++)
                 {
-                    cpzFound = true;
-                    break;
+                    if (cpzCtrValue[j] == importedCpzCtrValue[i])
+                    {
+                        cpzFound = true;
+                        break;
+                    }
                 }
-            }
 
-            if (!cpzFound)
-            {
-                qDebug() << "CPZ CTR not in our DB: " << importedCpzCtrValue[i].toHex();
-                cpzCtrValue.append(importedCpzCtrValue[i]);
+                if (!cpzFound)
+                {
+                    qDebug() << "CPZ CTR not in our DB: " << importedCpzCtrValue[i].toHex();
+                    cpzCtrValue.append(importedCpzCtrValue[i]);
+                }
             }
         }