resolve merge conflicts

lib/app.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:adaptive_theme/adaptive_theme.dart';

lib/core/cache/image_cache.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io' as io;
 
 import 'package:photos/core/cache/lru_map.dart';

lib/core/cache/lru_map.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:collection';
 
 typedef EvictionHandler<K, V> = Function(K key, V value);

lib/core/cache/thumbnail_cache.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:typed_data';
 
 import 'package:photos/core/cache/lru_map.dart';

lib/core/cache/thumbnail_cache_manager.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 class ThumbnailCacheManager {

lib/core/cache/video_cache_manager.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:flutter_cache_manager/flutter_cache_manager.dart';
 
 class VideoCacheManager {

lib/core/configuration.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:io' as io;
 import 'dart:typed_data';

lib/core/constants.dart

@@ -1,3 +1,5 @@
+// @dart = 2.7
+
 const int kThumbnailSmallSize = 256;
 const int kThumbnailQuality = 50;
 const int kThumbnailLargeSize = 512;

lib/core/error-reporting/super_logging.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library super_logging;
 
 import 'dart:async';

lib/core/error-reporting/tunneled_transport.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:http/http.dart';

lib/core/errors.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class InvalidFileError extends ArgumentError {
   InvalidFileError(String message) : super(message);
 }

lib/core/event_bus.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:event_bus/event_bus.dart';
 
 class Bus {

lib/core/network.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:alice/alice.dart';

lib/data/holidays.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/search/holiday_search_result.dart';
 
 const List<HolidayData> allHolidays = [

lib/data/months.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/search/month_search_result.dart';
 
 List<MonthData> allMonths = [

lib/data/years.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/utils/date_time_util.dart';
 
 class YearsData {

lib/db/collections_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:io';
 

lib/db/device_files_db.dart

@@ -1,3 +1,4 @@
+// @dart = 2.9
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
 import 'package:photo_manager/photo_manager.dart';

lib/db/file_updation_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';

lib/db/files_db.dart

@@ -1,5 +1,6 @@
+// @dart=2.9
+
 import 'dart:io' as io;
-import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:logging/logging.dart';
@@ -101,7 +102,7 @@ class FilesDB {
 
   // this opens the database (and creates it if it doesn't exist)
   Future<Database> _initDatabase() async {
-    final Directory documentsDirectory =
+    final io.Directory documentsDirectory =
         await getApplicationDocumentsDirectory();
     final String path = join(documentsDirectory.path, _databaseName);
     _logger.info("DB path " + path);
@@ -931,7 +932,7 @@ class FilesDB {
     // on iOS, match using localID and fileType. title can either match or
     // might be null based on how the file was imported
     String whereClause = ''' ($columnOwnerID = ? OR $columnOwnerID IS NULL) AND 
-        $columnLocalID = ? AND $columnFileType = ? AND 
+        $columnLocalID = ? AND $columnFileType = ? AND ß
         ($columnTitle=? OR $columnTitle IS NULL) ''';
     List<Object> whereArgs = [
       ownerID,
@@ -939,7 +940,7 @@ class FilesDB {
       getInt(fileType),
       title,
     ];
-    if (Platform.isAndroid) {
+    if (io.Platform.isAndroid) {
       whereClause = ''' ($columnOwnerID = ? OR $columnOwnerID IS NULL) AND 
           $columnLocalID = ? AND $columnFileType = ? AND $columnTitle=? AND $columnDeviceFolder= ? 
            ''';

lib/db/ignored_files_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:logging/logging.dart';

lib/db/memories_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 

lib/db/public_keys_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 

lib/db/trash_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:io';
 

lib/db/upload_locks_db.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 

lib/ente_theme_data.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/material.dart';
 import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
 

lib/events/account_configured_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class AccountConfiguredEvent extends Event {}

lib/events/backup_folders_updated_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class BackupFoldersUpdatedEvent extends Event {}

lib/events/collection_updated_event.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/events/files_updated_event.dart';
 
 class CollectionUpdatedEvent extends FilesUpdatedEvent {

lib/events/event.dart

@@ -1 +1,3 @@
+
+
 class Event {}

lib/events/files_updated_event.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/events/event.dart';
 import 'package:photos/models/file.dart';
 

lib/events/force_reload_home_gallery_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class ForceReloadHomeGalleryEvent extends Event {

lib/events/force_reload_trash_page_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class ForceReloadTrashPageEvent extends Event {

lib/events/local_photos_updated_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/files_updated_event.dart';
 
 class LocalPhotosUpdatedEvent extends FilesUpdatedEvent {

lib/events/permission_granted_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class PermissionGrantedEvent extends Event {}

lib/events/signed_in_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class SignedInEvent extends Event {}

lib/events/subscription_purchased_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class SubscriptionPurchasedEvent extends Event {}

lib/events/sync_status_update_event.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/events/event.dart';
 
 class SyncStatusUpdate extends Event {

lib/events/tab_changed_event.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/events/event.dart';
 
 class TabChangedEvent extends Event {

lib/events/trigger_logout_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class TriggerLogoutEvent extends Event {}

lib/events/two_factor_status_change_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class TwoFactorStatusChangeEvent extends Event {

lib/events/user_details_changed_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class UserDetailsChangedEvent extends Event {}

lib/events/user_logged_out_event.dart

@@ -1,3 +1,5 @@
+
+
 import 'package:photos/events/event.dart';
 
 class UserLoggedOutEvent extends Event {}

lib/l10n/l10n.dart

@@ -1,3 +1,5 @@
+
+
 import 'dart:ui';
 
 class L10n {

lib/main.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 

lib/models/backup_status.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class BackupStatus {
   final List<String> localIDs;
   final int size;

lib/models/billing_plan.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';

lib/models/collection.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:core';
 

lib/models/collection_file_item.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 class CollectionFileItem {

lib/models/collection_items.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/collection.dart';
 import 'package:photos/models/device_collection.dart';
 import 'package:photos/models/file.dart';

lib/models/delete_account.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/foundation.dart';
 
 class DeleteChallengeResponse {

lib/models/derived_key_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:typed_data';
 
 class DerivedKeyResult {

lib/models/device_collection.dart

@@ -1,3 +1,4 @@
+// @dart = 2.9
 import 'package:photos/models/file.dart';
 import 'package:photos/models/upload_strategy.dart';
 

lib/models/duplicate_files.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:photos/models/file.dart';

lib/models/encryption_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:typed_data';
 
 class EncryptionResult {

lib/models/ente_file.dart

@@ -1,5 +1,8 @@
 // EnteFile is base file entry for various type of files
 // like DeviceFile,RemoteFile or TrashedFile
+
+// @dart=2.9
+
 abstract class EnteFile {
   // returns cacheKey which should be used while caching entry related to
   // this file.

lib/models/file.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:path/path.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:photos/core/configuration.dart';

lib/models/file_load_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 
 class FileLoadResult {

lib/models/file_type.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 enum FileType {
   image,
   video,

lib/models/filters/gallery_items_filter.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 
 class GalleryItemsFilter {

lib/models/filters/important_items_filter.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:path/path.dart';

lib/models/gallery_type.dart

@@ -1,3 +1,5 @@
+
+
 enum GalleryType {
   homepage,
   archive,

lib/models/ignored_file.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/trash_file.dart';
 
 const kIgnoreReasonTrash = "trash";

lib/models/key_attributes.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 class KeyAttributes {

lib/models/key_gen_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/key_attributes.dart';
 import 'package:photos/models/private_key_attributes.dart';
 

lib/models/location.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class Location {
   final double latitude;
   final double longitude;

lib/models/magic_metadata.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 const kVisibilityVisible = 0;

lib/models/memory.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 
 class Memory {

lib/models/private_key_attributes.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class PrivateKeyAttributes {
   final String key;
   final String recoveryKey;

lib/models/public_key.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class PublicKey {
   final String email;
   final String publicKey;

lib/models/search/album_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/collection_items.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/search/file_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/search/holiday_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/search/location_api_response.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class LocationApiResponse {
   final List<LocationDataFromResponse> results;
   LocationApiResponse({

lib/models/search/location_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/search/month_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/search/search_results.dart

@@ -1 +1,3 @@
+
+
 class SearchResult {}

lib/models/search/year_search_result.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 import 'package:photos/models/search/search_results.dart';
 

lib/models/selected_files.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/foundation.dart';
 import 'package:photos/models/file.dart';
 

lib/models/sessions.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';

lib/models/set_keys_request.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 class SetKeysRequest {

lib/models/set_recovery_key_request.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 class SetRecoveryKeyRequest {

lib/models/subscription.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 const kFreeProductID = "free";

lib/models/trash_file.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:photos/models/file.dart';
 
 class TrashFile extends File {

lib/models/trash_item_request.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 class TrashRequest {
   final int fileID;
   final int collectionID;

lib/models/update_share_url_request.dart

@@ -1 +0,0 @@
-

lib/models/upload_url.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 class UploadURL {

lib/models/user_details.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:math';
 
 import 'package:collection/collection.dart';

lib/services/app_lifecycle_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:logging/logging.dart';
 
 class AppLifecycleService {

lib/services/billing_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:io';
 
 import 'package:dio/dio.dart';

lib/services/collections_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:math';
 import 'dart:typed_data';

lib/services/deduplication_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:dio/dio.dart';
 import 'package:logging/logging.dart';
 import 'package:photos/core/configuration.dart';

lib/services/favorites_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:flutter_sodium/flutter_sodium.dart';

lib/services/feature_flag_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 import 'dart:io';
 

lib/services/file_magic_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:convert';
 
 import 'package:dio/dio.dart';

lib/services/ignored_files_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';
 

lib/services/local/local_sync_util.dart

@@ -1,3 +1,4 @@
+// @dart = 2.9
 import 'dart:math';
 
 import 'package:computer/computer.dart';

lib/services/local_authentication_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'package:flutter/material.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:photos/core/configuration.dart';

lib/services/local_file_update_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:core';
 import 'dart:io';

lib/services/local_sync_service.dart

@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'dart:async';
 import 'dart:io';