From 9f1a3ad7d648e7400a60d7e73a91ad9ac1bdf8e4 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:06:32 +0530
Subject: [PATCH 1/4] [mob] Handle int value for face[blur] json

---
 mobile/lib/models/ml/face/face.dart | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/models/ml/face/face.dart b/mobile/lib/models/ml/face/face.dart
index 4a794baff5..2aeeb7aff3 100644
--- a/mobile/lib/models/ml/face/face.dart
+++ b/mobile/lib/models/ml/face/face.dart
@@ -101,7 +101,7 @@ class Face {
       json['score'] as double,
       Detection.fromJson(json['detection'] as Map<String, dynamic>),
       // high value means t
-      (json['blur'] ?? kLapacianDefault) as double,
+      parseIntOrDoubleAsDouble(json['blur']) ?? kLapacianDefault,
     );
   }
 
@@ -116,6 +116,13 @@ class Face {
       };
 }
 
+double? parseIntOrDoubleAsDouble(dynamic value) {
+  if (value == null) return null;
+  if (value is int) return value * 1.0;
+  if (value is double) return value;
+  return null;
+}
+
 List<double> parseAsDoubleList(List<dynamic> inputList) {
   if (inputList.isEmpty) return const [];
 

From bee9694f344f80ebd93158576b730a06f9e263c2 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:13:14 +0530
Subject: [PATCH 2/4] [mob] Add mount check

---
 .../ui/viewer/file/native_video_player_controls/seek_bar.dart  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
index f37791d56e..dafd812db4 100644
--- a/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
+++ b/mobile/lib/ui/viewer/file/native_video_player_controls/seek_bar.dart
@@ -112,6 +112,9 @@ class _SeekBarState extends State<SeekBar> with SingleTickerProviderStateMixin {
     //Video starts playing after a slight delay. This delay is to ensure that
     //the seek bar animation starts after the video starts playing.
     Future.delayed(const Duration(milliseconds: 700), () {
+      if (!mounted) {
+        return;
+      }
       if (widget.duration != null) {
         unawaited(
           _animationController.animateTo(

From 2e15cb35bc89c4420572c0380243e9ab771bcdf3 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:18:26 +0530
Subject: [PATCH 3/4] [mob] Handle invalid logger name

---
 mobile/lib/ui/viewer/gallery/gallery.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/lib/ui/viewer/gallery/gallery.dart b/mobile/lib/ui/viewer/gallery/gallery.dart
index db2f1d2906..c9c0f35a4b 100644
--- a/mobile/lib/ui/viewer/gallery/gallery.dart
+++ b/mobile/lib/ui/viewer/gallery/gallery.dart
@@ -115,8 +115,9 @@ class GalleryState extends State<Gallery> {
   @override
   void initState() {
     super.initState();
+    // end the tag with x to avoid `.` in the end if logger name
     _logTag =
-        "Gallery_${widget.tagPrefix}${kDebugMode ? "_" + widget.albumName! : ""}";
+        "Gallery_${widget.tagPrefix}${kDebugMode ? "_" + widget.albumName! : ""}_x";
     _logger = Logger(_logTag);
     _logger.finest("init Gallery");
     _debouncer = Debouncer(

From 270aa4301e453b907cc6ca3417d0f112068bda97 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Tue, 15 Oct 2024 15:41:24 +0530
Subject: [PATCH 4/4] [mob] Fix query for getPersonToClusterIdToFaceIds

---
 mobile/lib/db/ml/db.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/lib/db/ml/db.dart b/mobile/lib/db/ml/db.dart
index 3103e80442..0d4b0c2772 100644
--- a/mobile/lib/db/ml/db.dart
+++ b/mobile/lib/db/ml/db.dart
@@ -449,7 +449,7 @@ class MLDataDB {
     final db = await instance.asyncDB;
     final List<Map<String, dynamic>> maps = await db.getAll(
       'SELECT $personIdColumn, $faceClustersTable.$clusterIDColumn, $faceIDColumn FROM $clusterPersonTable '
-      'LEFT JOIN $faceClustersTable ON $clusterPersonTable.$clusterIDColumn = $faceClustersTable.$clusterIDColumn',
+      'INNER JOIN $faceClustersTable ON $clusterPersonTable.$clusterIDColumn = $faceClustersTable.$clusterIDColumn',
     );
     final Map<String, Map<String, Set<String>>> result = {};
     for (final map in maps) {