Merge pull request #647 from deXol/develop

limpkin · web-flow · commit 3f6d44275f85 · 2020-04-15T12:52:36.000+02:00
Prevent ble backup file import into the standard mini
diff --git a/src/MPDevice.cpp b/src/MPDevice.cpp
@@ -5134,6 +5134,13 @@ bool MPDevice::readExportPayload(QJsonArray dataArray, QString &errorString)
         return false;
     }
 
+    if (isBleExport && !isBLE())
+    {
+        qWarning() << "Cannot use BLE export file for mini";
+        errorString = "Selected File Is A BLE Backup";
+        return false;
+    }
+
     /* Know which bundle we're dealing with */
     if (deviceVersion == "mooltipass")
     {

Original file line number	Diff line number	Diff line change
`@@ -5134,6 +5134,13 @@ bool MPDevice::readExportPayload(QJsonArray dataArray, QString &errorString)`
`5134`	`5134`	`return false;`
`5135`	`5135`	`}`
`5136`	`5136`
	`5137`	`+ if (isBleExport && !isBLE())`
	`5138`	`+ {`
	`5139`	`+ qWarning() << "Cannot use BLE export file for mini";`
	`5140`	`+ errorString = "Selected File Is A BLE Backup";`
	`5141`	`+ return false;`
	`5142`	`+ }`
	`5143`	`+`
`5137`	`5144`	`/* Know which bundle we're dealing with */`
`5138`	`5145`	`if (deviceVersion == "mooltipass")`
`5139`	`5146`	`{`