|
@@ -3,7 +3,6 @@ import 'dart:io';
|
|
|
|
|
|
import 'package:path/path.dart';
|
|
|
import 'package:path_provider/path_provider.dart';
|
|
|
-// ignore: import_of_legacy_library_into_null_safe
|
|
|
import 'package:photos/models/collection.dart';
|
|
|
import 'package:sqflite/sqflite.dart';
|
|
|
import 'package:sqflite_migration/sqflite_migration.dart';
|
|
@@ -192,7 +191,7 @@ class CollectionsDB {
|
|
|
Map<String, dynamic> _getRowForCollection(Collection collection) {
|
|
|
final row = <String, dynamic>{};
|
|
|
row[columnID] = collection.id;
|
|
|
- row[columnOwner] = collection.owner.toJson();
|
|
|
+ row[columnOwner] = collection.owner!.toJson();
|
|
|
row[columnEncryptedKey] = collection.encryptedKey;
|
|
|
row[columnKeyDecryptionNonce] = collection.keyDecryptionNonce;
|
|
|
row[columnName] = collection.name;
|
|
@@ -203,16 +202,16 @@ class CollectionsDB {
|
|
|
row[columnPathDecryptionNonce] = collection.attributes.pathDecryptionNonce;
|
|
|
row[columnVersion] = collection.attributes.version;
|
|
|
row[columnSharees] =
|
|
|
- json.encode(collection.sharees?.map((x) => x?.toMap())?.toList());
|
|
|
+ json.encode(collection.sharees?.map((x) => x?.toMap()).toList());
|
|
|
row[columnPublicURLs] =
|
|
|
- json.encode(collection.publicURLs?.map((x) => x?.toMap())?.toList());
|
|
|
+ json.encode(collection.publicURLs?.map((x) => x?.toMap()).toList());
|
|
|
row[columnUpdationTime] = collection.updationTime;
|
|
|
- if (collection.isDeleted ?? false) {
|
|
|
+ if (collection.isDeleted) {
|
|
|
row[columnIsDeleted] = _sqlBoolTrue;
|
|
|
} else {
|
|
|
row[columnIsDeleted] = _sqlBoolFalse;
|
|
|
}
|
|
|
- row[columnMMdVersion] = collection.mMdVersion ?? 0;
|
|
|
+ row[columnMMdVersion] = collection.mMdVersion;
|
|
|
row[columnMMdEncodedJson] = collection.mMdEncodedJson ?? '{}';
|
|
|
return row;
|
|
|
}
|