Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions open_wearable/lib/models/firmware_version_comparison.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import 'package:pub_semver/pub_semver.dart';

/// Compare firmware precedence, ignoring transport padding and build metadata.
bool isNewerFirmwareVersion(String latest, String current) {
Version parse(String value) {
final normalized = value
.replaceAll('\x00', '')
.trim()
.replaceFirst(RegExp(r'^v(?=\d)'), '');
final version = Version.parse(normalized);
return Version(
version.major,
version.minor,
version.patch,
pre: version.preRelease.join('.'),
);
}

return parse(latest) > parse(current);
}
3 changes: 2 additions & 1 deletion open_wearable/lib/view_models/wearables_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'package:open_wearable/models/wearable_status_cache.dart';
import 'package:open_wearable/view_models/sensor_configuration_provider.dart';

import '../models/logger.dart';
import '../models/firmware_version_comparison.dart';

/// Event emitted when a newer firmware version is available for a wearable.
class NewFirmwareAvailableEvent extends WearableEvent {
Expand Down Expand Up @@ -452,7 +453,7 @@ class WearablesProvider with ChangeNotifier {
.getLatestFirmwareVersion()
.then((version) => version.toString());

if (firmwareImageRepository.isNewerVersion(
if (isNewerFirmwareVersion(
latestVersion,
currentVersion,
)) {
Expand Down
26 changes: 26 additions & 0 deletions open_wearable/test/models/firmware_version_comparison_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import 'package:flutter_test/flutter_test.dart';
import 'package:open_wearable/models/firmware_version_comparison.dart';

void main() {
test('compares released firmware against the installed development build',
() {
expect(
isNewerFirmwareVersion('2.2.9', '2.2.10-dev.60+ga99d057fa'), isFalse,);
expect(
isNewerFirmwareVersion('2.2.10', '2.2.10-dev.60+ga99d057fa'), isTrue,);
expect(
isNewerFirmwareVersion('2.2.11', '2.2.10-dev.60+ga99d057fa'), isTrue,);
});
test('prerelease numbers are numeric and build metadata has no precedence',
() {
expect(isNewerFirmwareVersion('2.2.10-dev.10', '2.2.10-dev.9'), isTrue);
expect(isNewerFirmwareVersion('2.2.10+z', '2.2.10+a'), isFalse);
expect(isNewerFirmwareVersion(' v2.2.10\x00 ', '2.2.9'), isTrue);
expect(isNewerFirmwareVersion('2.2.9', '2.2.9'), isFalse);
});
test('unrecognized labels fail explicitly instead of suggesting a downgrade',
() {
expect(() => isNewerFirmwareVersion('2.2.9', 'PR #123'),
throwsFormatException,);
});
}
Loading