From ec0d62f67bb79b3f663a3ee49e8d701159488091 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Mon, 6 Aug 2018 20:26:39 +0200
Subject: [PATCH] If firmwareRevision is null, use softwareRevision

---
 .../gadgetbridge/service/devices/huami/HuamiSupport.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index b0c46b62f..0a7aa530b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -1319,8 +1319,10 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
 
         LOG.warn("Device info: " + info);
         versionCmd.hwVersion = info.getHardwareRevision();
-//        versionCmd.fwVersion = info.getFirmwareRevision(); // always null
-        versionCmd.fwVersion = info.getSoftwareRevision();
+        versionCmd.fwVersion = info.getFirmwareRevision();
+        if (versionCmd.fwVersion == null) {
+            versionCmd.fwVersion = info.getSoftwareRevision();
+        }
         if (versionCmd.fwVersion != null && versionCmd.fwVersion.length() > 0 && versionCmd.fwVersion.charAt(0) == 'V') {
             versionCmd.fwVersion = versionCmd.fwVersion.substring(1);
         }