Fossil HR: fixed version calculation

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/qhybrid/adapter/fossil_hr/FossilHRWatchAdapter.java

@@ -192,6 +192,8 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
 
     Messenger voiceMessenger = null;
 
+    private Version cleanFirmwareVersion = null;
+
     ServiceConnection voiceServiceConnection = new ServiceConnection() {
         @Override
         public void onServiceConnected(ComponentName name, IBinder service) {
@@ -1850,8 +1852,18 @@ public class FossilHRWatchAdapter extends FossilWatchAdapter {
     }
 
     private Version getCleanFWVersion() {
+        if(cleanFirmwareVersion != null){
+            return cleanFirmwareVersion;
+        }
         String firmware = getDeviceSupport().getDevice().getFirmwareVersion();
-        return new Version(firmware.substring(6, 9));
+        Matcher matcher = Pattern
+                .compile("(?<=[A-Z]{2}[0-9]\\.[0-9]\\.)[0-9]+\\.[0-9]+")
+                .matcher(firmware);
+        if(!matcher.find()){
+            return null;
+        }
+        cleanFirmwareVersion = new Version(matcher.group());
+        return cleanFirmwareVersion;
     }
 
     public String getInstalledAppNameFromUUID(UUID uuid) {

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/Version.java

@@ -16,6 +16,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 package nodomain.freeyourgadget.gadgetbridge.util;
 
+import androidx.annotation.NonNull;
+
 // http://stackoverflow.com/questions/198431/how-do-you-compare-two-version-strings-in-java
 public class Version implements Comparable<Version> {
 
@@ -88,4 +90,10 @@ public class Version implements Comparable<Version> {
     public int hashCode() {
         return version.hashCode();
     }
+
+    @NonNull
+    @Override
+    public String toString() {
+        return version;
+    }
 }