π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Guard database future reset against stale failures
laurenspriembc15c6d5bea1
diff --git a/mobile/apps/photos/lib/db/collections_db.dart b/mobile/apps/photos/lib/db/collections_db.dartindex ac8df13b31..f87e4aa1da 100644--- a/mobile/apps/photos/lib/db/collections_db.dart+++ b/mobile/apps/photos/lib/db/collections_db.dart@@ -63,10 +63,13 @@ class CollectionsDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/file_updation_db.dart b/mobile/apps/photos/lib/db/file_updation_db.dartindex 56e4d8e2d7..d6e94ad30c 100644--- a/mobile/apps/photos/lib/db/file_updation_db.dart+++ b/mobile/apps/photos/lib/db/file_updation_db.dart@@ -49,10 +49,13 @@ class FileUpdationDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/ignored_files_db.dart b/mobile/apps/photos/lib/db/ignored_files_db.dartindex 3e50f8e878..01dcf7fde9 100644--- a/mobile/apps/photos/lib/db/ignored_files_db.dart+++ b/mobile/apps/photos/lib/db/ignored_files_db.dart@@ -39,10 +39,13 @@ class IgnoredFilesDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/memories_db.dart b/mobile/apps/photos/lib/db/memories_db.dartindex 735c08cc0c..84bfeaf6b2 100644--- a/mobile/apps/photos/lib/db/memories_db.dart+++ b/mobile/apps/photos/lib/db/memories_db.dart@@ -26,10 +26,13 @@ class MemoriesDB with SqlDbBase {Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/memory_shares_db.dart b/mobile/apps/photos/lib/db/memory_shares_db.dartindex 54f720e0b4..f6a0785969 100644--- a/mobile/apps/photos/lib/db/memory_shares_db.dart+++ b/mobile/apps/photos/lib/db/memory_shares_db.dart@@ -32,10 +32,13 @@ class MemorySharesDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/social_db.dart b/mobile/apps/photos/lib/db/social_db.dartindex be5f01ca37..ccb7522fed 100644--- a/mobile/apps/photos/lib/db/social_db.dart+++ b/mobile/apps/photos/lib/db/social_db.dart@@ -98,10 +98,13 @@ class SocialDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/trash_db.dart b/mobile/apps/photos/lib/db/trash_db.dartindex 5cb737c3bb..3376b36e17 100644--- a/mobile/apps/photos/lib/db/trash_db.dart+++ b/mobile/apps/photos/lib/db/trash_db.dart@@ -73,10 +73,13 @@ class TrashDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}diff --git a/mobile/apps/photos/lib/db/upload_locks_db.dart b/mobile/apps/photos/lib/db/upload_locks_db.dartindex d67e23e8cb..fb7b76a0ba 100644--- a/mobile/apps/photos/lib/db/upload_locks_db.dart+++ b/mobile/apps/photos/lib/db/upload_locks_db.dart@@ -89,10 +89,13 @@ class UploadLocksDB with SqlDbBase {static Future<SqliteDatabase>? _dbFuture;Future<SqliteDatabase> get database async {+ final databaseFuture = _dbFuture ??= _initDatabase();try {- return await (_dbFuture ??= _initDatabase());+ return await databaseFuture;} catch (_) {- _dbFuture = null;+ if (identical(_dbFuture, databaseFuture)) {+ _dbFuture = null;+ }rethrow;}}