[update] fixed version comparison

plum-tech · Sep 23, 2024 · 188fa87 · 188fa87
1 parent 5bacd17
commit 188fa87
Showing 1 changed file with 19 additions and 1 deletion.
diff --git a/lib/backend/update/utils.dart b/lib/backend/update/utils.dart
@@ -60,7 +60,7 @@ Future<void> _checkAppUpdate({
     await Future.delayed(delayAtLeast);
   }
   if (!context.mounted) return;
-  if (latest.version > currentVersion) {
+  if (latest.version.compareToIncludingBuild(currentVersion) > 0) {
     await context.showSheet(
       (ctx) => ArtifactUpdatePage(info: latest),
       dismissible: false,
@@ -74,6 +74,24 @@ Future<void> _checkAppUpdate({
   }
 }
 
+extension VersionEx on Version {
+  int compareToIncludingBuild(Version other) {
+    final result = compareTo(other);
+    if (result == 0) {
+      final thisBuild = int.tryParse(build);
+      final otherBuild = int.tryParse(other.build);
+      if (thisBuild != null && otherBuild == null) {
+        return 1;
+      } else if (thisBuild == null && otherBuild != null) {
+        return -1;
+      } else if (thisBuild != null && otherBuild != null) {
+        return thisBuild.compareTo(otherBuild);
+      }
+    }
+    return result;
+  }
+}
+
 Version? _getSkippedVersion() {
   final skippedVersionRaw = Settings.update.skippedVersion;
   if (skippedVersionRaw != null) {