refactor: rename stuff

lib/core/configuration.dart

@@ -135,7 +135,7 @@ class Configuration {
     await MemoriesDB.instance.clearTable();
     await PublicKeysDB.instance.clearTable();
     await UploadLocksDB.instance.clearTable();
-    await IgnoreFilesDB.instance.clearTable();
+    await IgnoredFilesDB.instance.clearTable();
     await TrashDB.instance.clearTable();
     CollectionsService.instance.clearCache();
     FavoritesService.instance.clearCache();

lib/db/ignored_files_db.dart

@@ -9,7 +9,7 @@ import 'package:sqflite/sqflite.dart';
 // user's intervention.
 // Common use case:
 // when a user deletes a file just from ente on current or different device.
-class IgnoreFilesDB {
+class IgnoredFilesDB {
   static final _databaseName = "ente.ignored_files.db";
   static final _databaseVersion = 1;
   static final Logger _logger = Logger("IgnoredFilesDB");
@@ -31,9 +31,9 @@ class IgnoreFilesDB {
       ''');
   }
 
-  IgnoreFilesDB._privateConstructor();
+  IgnoredFilesDB._privateConstructor();
 
-  static final IgnoreFilesDB instance = IgnoreFilesDB._privateConstructor();
+  static final IgnoredFilesDB instance = IgnoredFilesDB._privateConstructor();
 
   // only have a single app-wide reference to the database
   static Future<Database> _dbFuture;

lib/services/collections_service.dart

@@ -225,7 +225,9 @@ class CollectionsService {
     if (!_cachedKeys.containsKey(collectionID)) {
       final collection = _collectionIDToCollections[collectionID];
       if (collection == null) {
-        // trigger async fetch for collection
+        // Async fetch for collection. A collection might be
+        // missing from older clients when we used to delete the collection
+        // from db. For trashed files, we need collection data for decryption.
         fetchCollectionByID(collectionID);
         throw AssertionError('collectionID $collectionID is not cached');
       }
@@ -422,12 +424,12 @@ class CollectionsService {
     final params = <String, dynamic>{};
     params["collectionID"] = toCollectionID;
     params["files"] = [];
+    final toCollectionKey = getCollectionKey(toCollectionID);
     for (final file in files) {
       final key = decryptFileKey(file);
       file.generatedID = null; // So that a new entry is created in the FilesDB
       file.collectionID = toCollectionID;
-      final encryptedKeyData =
-          CryptoUtil.encryptSync(key, getCollectionKey(toCollectionID));
+      final encryptedKeyData = CryptoUtil.encryptSync(key, toCollectionKey);
       file.encryptedKey = Sodium.bin2base64(encryptedKeyData.encryptedData);
       file.keyDecryptionNonce = Sodium.bin2base64(encryptedKeyData.nonce);
       params["files"].add(CollectionFileItem(

lib/services/remote_sync_service.dart

@@ -158,8 +158,8 @@ class RemoteSyncService {
           .removeWhere((element) => element.fileType == FileType.video);
     }
     if (filesToBeUploaded.isNotEmpty) {
-      final ignoredFilesMap = await IgnoreFilesDB.instance.getIgnoredFiles();
-      int prevCount = filesToBeUploaded.length;
+      final ignoredFilesMap = await IgnoredFilesDB.instance.getIgnoredFiles();
+      final int prevCount = filesToBeUploaded.length;
       filesToBeUploaded.removeWhere(
           (file) => _shouldIgnoreFileUpload(ignoredFilesMap, file));
       if (prevCount != filesToBeUploaded.length) {

lib/services/trash_sync_service.dart

@@ -32,9 +32,9 @@ class TrashSyncService {
   }
 
   Future<void> syncTrash() async {
-    final lastSyncTime = getSyncTime();
+    final lastSyncTime = _getSyncTime();
     _logger.fine('sync trash sinceTime : $lastSyncTime');
-    var diff = await _diffFetcher.getTrashFilesDiff(lastSyncTime, kDiffLimit);
+    final diff = await _diffFetcher.getTrashFilesDiff(lastSyncTime, kDiffLimit);
     if (diff.trashedFiles.isNotEmpty) {
       _logger.fine("inserting ${diff.trashedFiles.length} items in trash");
       await _trashDB.insertMultiple(diff.trashedFiles);
@@ -53,7 +53,7 @@ class TrashSyncService {
     await _updateIgnoredFiles(diff);
 
     if (diff.lastSyncedTimeStamp != 0) {
-      await setSyncTime(diff.lastSyncedTimeStamp);
+      await _setSyncTime(diff.lastSyncedTimeStamp);
     }
     if (diff.fetchCount == kDiffLimit) {
       return await syncTrash();
@@ -76,18 +76,15 @@ class TrashSyncService {
     }
     if (ignoredFiles.isNotEmpty) {
       _logger.fine('updating ${ignoredFiles.length} ignored files ');
-      await IgnoreFilesDB.instance.insertMultiple(ignoredFiles);
+      await IgnoredFilesDB.instance.insertMultiple(ignoredFiles);
     }
   }
 
-  Future<void> setSyncTime(int time) async {
-    if (time == null) {
-      return _prefs.remove(kLastTrashSyncTime);
-    }
+  Future<void> _setSyncTime(int time) async {
     return _prefs.setInt(kLastTrashSyncTime, time);
   }
 
-  int getSyncTime() {
+  int _getSyncTime() {
     return _prefs.getInt(kLastTrashSyncTime) ?? 0;
   }
 

lib/ui/trash_page.dart

@@ -49,7 +49,7 @@ class TrashPage extends StatelessWidget {
         tagPrefix: tagPrefix,
         selectedFiles: _selectedFiles,
         initialFiles: null,
-        footer: footerWidget());
+        footer: _footerWidget());
 
     return Scaffold(
       appBar: PreferredSize(
@@ -64,7 +64,7 @@ class TrashPage extends StatelessWidget {
     );
   }
 
-  StatefulWidget footerWidget() {
+  Widget _footerWidget() {
     return FutureBuilder<FileLoadResult>(
         future: TrashDB.instance
             .getTrashedFiles(0, DateTime.now().microsecondsSinceEpoch),