Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Simplify database future cleanup

laurenspriem10f7820ed942
diff --git a/mobile/apps/photos/lib/db/collections_db.dart b/mobile/apps/photos/lib/db/collections_db.dart
index f87e4aa1da..ac8df13b31 100644
--- a/mobile/apps/photos/lib/db/collections_db.dart
+++ b/mobile/apps/photos/lib/db/collections_db.dart
@@ -63,13 +63,10 @@ class CollectionsDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/file_updation_db.dart b/mobile/apps/photos/lib/db/file_updation_db.dart
index d6e94ad30c..56e4d8e2d7 100644
--- a/mobile/apps/photos/lib/db/file_updation_db.dart
+++ b/mobile/apps/photos/lib/db/file_updation_db.dart
@@ -49,13 +49,10 @@ class FileUpdationDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/ignored_files_db.dart b/mobile/apps/photos/lib/db/ignored_files_db.dart
index 01dcf7fde9..3e50f8e878 100644
--- a/mobile/apps/photos/lib/db/ignored_files_db.dart
+++ b/mobile/apps/photos/lib/db/ignored_files_db.dart
@@ -39,13 +39,10 @@ class IgnoredFilesDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/memories_db.dart b/mobile/apps/photos/lib/db/memories_db.dart
index 84bfeaf6b2..735c08cc0c 100644
--- a/mobile/apps/photos/lib/db/memories_db.dart
+++ b/mobile/apps/photos/lib/db/memories_db.dart
@@ -26,13 +26,10 @@ class MemoriesDB with SqlDbBase {
Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/memory_shares_db.dart b/mobile/apps/photos/lib/db/memory_shares_db.dart
index f6a0785969..54f720e0b4 100644
--- a/mobile/apps/photos/lib/db/memory_shares_db.dart
+++ b/mobile/apps/photos/lib/db/memory_shares_db.dart
@@ -32,13 +32,10 @@ class MemorySharesDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/social_db.dart b/mobile/apps/photos/lib/db/social_db.dart
index ccb7522fed..be5f01ca37 100644
--- a/mobile/apps/photos/lib/db/social_db.dart
+++ b/mobile/apps/photos/lib/db/social_db.dart
@@ -98,13 +98,10 @@ class SocialDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/trash_db.dart b/mobile/apps/photos/lib/db/trash_db.dart
index 3376b36e17..5cb737c3bb 100644
--- a/mobile/apps/photos/lib/db/trash_db.dart
+++ b/mobile/apps/photos/lib/db/trash_db.dart
@@ -73,13 +73,10 @@ class TrashDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/apps/photos/lib/db/upload_locks_db.dart b/mobile/apps/photos/lib/db/upload_locks_db.dart
index fb7b76a0ba..d67e23e8cb 100644
--- a/mobile/apps/photos/lib/db/upload_locks_db.dart
+++ b/mobile/apps/photos/lib/db/upload_locks_db.dart
@@ -89,13 +89,10 @@ class UploadLocksDB with SqlDbBase {
static Future<SqliteDatabase>? _dbFuture;
Future<SqliteDatabase> get database async {
- final databaseFuture = _dbFuture ??= _initDatabase();
try {
- return await databaseFuture;
+ return await (_dbFuture ??= _initDatabase());
} catch (_) {
- if (identical(_dbFuture, databaseFuture)) {
- _dbFuture = null;
- }
+ _dbFuture = null;
rethrow;
}
}
diff --git a/mobile/packages/log_viewer/lib/src/core/log_database.dart b/mobile/packages/log_viewer/lib/src/core/log_database.dart
index 93a9e84c75..25e340f7a4 100644
--- a/mobile/packages/log_viewer/lib/src/core/log_database.dart
+++ b/mobile/packages/log_viewer/lib/src/core/log_database.dart
@@ -429,9 +429,7 @@ class LogDatabase {
if (databaseFuture != null) {
final db = await databaseFuture;
await db.close();
- if (identical(_databaseFuture, databaseFuture)) {
- _databaseFuture = null;
- }
+ _databaseFuture = null;
}
}