NitrokeyManager: Refactor get_serial_number

To avoid duplicate code, this patch refactors the get_serial_number
method to use get_serial_number_as_u32 internally.  It does not change
get_serial_number’s behavior.

1 files changed, 8 insertions, 14 deletions

diff --git a/NitrokeyManager.cc b/NitrokeyManager.cc
index 496496e..b6a076a 100644
--- a/NitrokeyManager.cc
+++ b/NitrokeyManager.cc
@@ -380,22 +380,16 @@ using nitrokey::misc::strcpyT;
 
 
     string NitrokeyManager::get_serial_number() {
-        if (device == nullptr) { return ""; };
-      switch (device->get_device_model()) {
-        case DeviceModel::PRO: {
-          auto response = GetStatus::CommandTransaction::run(device);
-          return nitrokey::misc::toHex(response.data().card_serial_u32);
-        }
-          break;
-
-        case DeviceModel::STORAGE:
-        {
-          auto response = stick20::GetDeviceStatus::CommandTransaction::run(device);
-          return nitrokey::misc::toHex(response.data().ActiveSmartCardID_u32);
+      try {
+        auto serial_number = this->get_serial_number_as_u32();
+        if (serial_number == 0) {
+          return "NA";
+        } else {
+          return nitrokey::misc::toHex(serial_number);
         }
-          break;
+      } catch (DeviceNotConnected& e) {
+        return "";
       }
-      return "NA";
     }
 
     uint32_t NitrokeyManager::get_serial_number_as_u32() {