Merge pull request #1060 from deXol/develop

Move getUntilNullByte to a function for QByteArray
mooltipass · Jun 29, 2022 · 1179e28 · 1179e28
2 parents 52e54fc + 603b514
commit 1179e28
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/Common.cpp b/src/Common.cpp
@@ -514,3 +514,12 @@ QString Common::getMcAgent()
     }
     return "";
 }
+
+QByteArray Common::getUntilNullByte(const QByteArray &arr)
+{
+    if (arr.contains(ZERO_BYTE))
+    {
+        return arr.left(arr.indexOf(ZERO_BYTE));
+    }
+    return arr;
+}
diff --git a/src/Common.h b/src/Common.h
@@ -264,6 +264,8 @@ class Common
 
     static QString getMcAgent();
 
+    static QByteArray getUntilNullByte(const QByteArray& arr);
+
     typedef enum
     {
         MP_Classic = 0,
@@ -352,6 +354,7 @@ class Common
     static const int BLE_LATEST_BUNDLE_VERSION = 7;
     static const int BLE_BUNDLE_WITH_NOTES = 1;
     static const int BLE_BUNDLE_WITH_BLE_NAME = 9;
+    static const char ZERO_BYTE = static_cast<char>(0x00);
 };
 
 struct FidoCredential

diff --git a/src/MPDeviceBleImpl.cpp b/src/MPDeviceBleImpl.cpp
@@ -1913,11 +1913,7 @@ void MPDeviceBleImpl::getBleName(const MessageHandlerCbData &cb)
             bleNameArr = DEFAULT_BLE_NAME.toUtf8();
             qWarning() << "Invalid character in BLE name";
         }
-        if (bleNameArr.contains(ZERO_BYTE))
-        {
-            // Cut zero bytes from the end of the array
-            bleNameArr = bleNameArr.left(bleNameArr.indexOf(ZERO_BYTE));
-        }
+        bleNameArr = Common::getUntilNullByte(bleNameArr);
         cb(true, "", bleNameArr);
     });