Merge pull request #1145 from deXol/develop

[BLE] Fetch and send password for special no bundle upload
mooltipass · Feb 7, 2023 · d12b31b · d12b31b
2 parents ac80162 + 67727ff
commit d12b31b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/BleDev.cpp b/src/BleDev.cpp
@@ -142,7 +142,7 @@ bool BleDev::isValidBundleFile(QFile* file) const
     return true;
 }
 
-bool BleDev::checkBundleFilePassword(const QFileInfo& fileInfo, QString &password)
+bool BleDev::checkBundleFilePassword(const QFileInfo& fileInfo, QString &password, bool skipDeviceChecks /* =false */)
 {
     const auto baseFilename = fileInfo.baseName();
     const auto baseNameWithExt = fileInfo.fileName();
@@ -157,14 +157,14 @@ bool BleDev::checkBundleFilePassword(const QFileInfo& fileInfo, QString &passwor
             return false;
         }
         const auto serial = fileParts[SERIAL_FILE_PART].toUInt();
-        if (wsClient->get_hwSerial() != serial)
+        if (!skipDeviceChecks && wsClient->get_hwSerial() != serial)
         {
             QMessageBox::warning(this, INVALID_BUNDLE_TEXT,
                                  tr("The device serial number is not correct in bundle filename."));
             return false;
         }
         const auto bundleVersion = fileParts[BUNDLE_FILE_PART].toInt();
-        if (wsClient->get_bundleVersion() != bundleVersion)
+        if (!skipDeviceChecks && wsClient->get_bundleVersion() != bundleVersion)
         {
             QMessageBox::warning(this, INVALID_BUNDLE_TEXT,
                                  tr("The bundle version is not correct in bundle filename."));
@@ -187,7 +187,7 @@ void BleDev::on_btnFileBrowser_clicked()
     }
     QSettings s;
 
-    bool skipFilePwdCheck = wsClient->get_status() == Common::NoBundle &&
+    bool skipDeviceChecks = wsClient->get_status() == Common::NoBundle &&
                                 DeviceDetector::instance().isCtrlPressed();
 
     QString fileName = QFileDialog::getOpenFileName(this, tr("Select bundle file"),
@@ -224,7 +224,7 @@ void BleDev::on_btnFileBrowser_clicked()
     }
 
     QString password = "";
-    if (!skipFilePwdCheck && !checkBundleFilePassword(QFileInfo{file}, password))
+    if (!checkBundleFilePassword(QFileInfo{file}, password, skipDeviceChecks))
     {
         qCritical() << "Invalid bundle file password";
         return;

diff --git a/src/BleDev.h b/src/BleDev.h
@@ -42,7 +42,7 @@ private slots:
     void initUITexts();
     void fetchData(const Common::FetchType &fetchType);
     bool isValidBundleFile(QFile* file) const;
-    bool checkBundleFilePassword(const QFileInfo& fileInfo, QString& password);
+    bool checkBundleFilePassword(const QFileInfo& fileInfo, QString& password, bool skipDeviceChecks = false);
 
     Ui::BleDev *ui;
     WSClient *wsClient = nullptr;