Merge branch 'main' into independent

analysis_options.yaml

@@ -61,7 +61,7 @@ analyzer:
     cancel_subscriptions: error
 
 
-    unawaited_futures: ignore # convert to warning after fixing existing issues
+    unawaited_futures: warning # convert to warning after fixing existing issues
     invalid_dependency: info
     use_build_context_synchronously: ignore # experimental lint, requires many changes
     prefer_interpolation_to_compose_strings: ignore # later too many warnings

lib/core/configuration.dart

@@ -171,7 +171,7 @@ class Configuration {
       SearchService.instance.clearCache();
       Bus.instance.fire(UserLoggedOutEvent());
     } else {
-      _preferences.setBool("auto_logout", true);
+      await _preferences.setBool("auto_logout", true);
     }
   }
 

lib/core/error-reporting/super_logging.dart

@@ -171,7 +171,7 @@ class SuperLogging {
       await setupLogDir();
     }
     if (sentryIsEnabled) {
-      setupSentry();
+      setupSentry().ignore();
     }
 
     Logger.root.level = Level.ALL;
@@ -266,7 +266,7 @@ class SuperLogging {
 
     // add error to sentry queue
     if (sentryIsEnabled && rec.error != null) {
-      _sendErrorToSentry(rec.error!, null);
+      _sendErrorToSentry(rec.error!, null).ignore();
     }
   }
 
@@ -303,7 +303,7 @@ class SuperLogging {
   static Future<void> setupSentry() async {
     await for (final error in sentryQueueControl.stream.asBroadcastStream()) {
       try {
-        Sentry.captureException(
+        await Sentry.captureException(
           error,
         );
       } catch (e) {

lib/db/file_updation_db.dart

@@ -14,6 +14,7 @@ class FileUpdationDB {
   static const tableName = 're_upload_tracker';
   static const columnLocalID = 'local_id';
   static const columnReason = 'reason';
+  static const livePhotoSize = 'livePhotoSize';
 
   static const modificationTimeUpdated = 'modificationTimeUpdated';
 

lib/db/files_db.dart

@@ -789,7 +789,7 @@ class FilesDB {
     return uploadedFileIDs;
   }
 
-  Future<EnteFile?> getUploadedLocalFileInAnyCollection(
+  Future<List<EnteFile>> getFilesInAllCollection(
     int uploadedFileID,
     int userID,
   ) async {
@@ -802,12 +802,11 @@ class FilesDB {
         userID,
         uploadedFileID,
       ],
-      limit: 1,
     );
     if (results.isEmpty) {
-      return null;
+      return <EnteFile>[];
     }
-    return convertToFiles(results)[0];
+    return convertToFiles(results);
   }
 
   Future<Set<String>> getExistingLocalFileIDs(int ownerID) async {
@@ -1450,6 +1449,28 @@ class FilesDB {
     return result;
   }
 
+  // For a given userID, return unique uploadedFileId for the given userID
+  Future<List<String>> getLivePhotosWithBadSize(
+    int userId,
+    int sizeInBytes,
+  ) async {
+    final db = await instance.database;
+    final rows = await db.query(
+      filesTable,
+      columns: [columnLocalID],
+      distinct: true,
+      where: '$columnOwnerID = ? AND '
+          '($columnFileSize IS NULL OR $columnFileSize = ?) AND '
+          '$columnFileType = ? AND $columnLocalID IS NOT NULL',
+      whereArgs: [userId, sizeInBytes, getInt(FileType.livePhoto)],
+    );
+    final result = <String>[];
+    for (final row in rows) {
+      result.add(row[columnLocalID] as String);
+    }
+    return result;
+  }
+
   // updateSizeForUploadIDs takes a map of upploadedFileID and fileSize and
   // update the fileSize for the given uploadedFileID
   Future<void> updateSizeForUploadIDs(