TF-4081 Fix return type mismatch in Future.catchError handler

Author: dab246

lib/features/caching/clients/hive_cache_version_client.dart

@@ -17,13 +17,19 @@ class HiveCacheVersionClient extends CacheVersionClient {
     return Future.sync(() {
       final latestVersion = _sharedPreferences.getInt(versionKey);
       return latestVersion;
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
   Future<bool> storeVersion(int newVersion) {
     return Future.sync(() async {
       return await _sharedPreferences.setInt(versionKey, newVersion);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 }

lib/features/cleanup/data/datasource_impl/cleanup_datasource_impl.dart

@@ -30,27 +30,39 @@ class CleanupDataSourceImpl extends CleanupDataSource {
   Future<void> cleanEmailCache(EmailCleanupRule cleanupRule) {
     return Future.sync(() async {
       return await emailCacheManager.clean(cleanupRule);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
   Future<void> cleanRecentSearchCache(RecentSearchCleanupRule cleanupRule) {
     return Future.sync(() async {
       return await recentSearchCacheManager.clean(cleanupRule);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
   Future<void> cleanRecentLoginUrlCache(RecentLoginUrlCleanupRule cleanupRule) {
     return Future.sync(() async {
       return await recentLoginUrlCacheManager.clean(cleanupRule);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
   Future<void> cleanRecentLoginUsernameCache(RecentLoginUsernameCleanupRule cleanupRule) {
     return Future.sync(() async {
       return await recentLoginUsernameCacheManager.clean(cleanupRule);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 }

lib/features/composer/data/datasource_impl/composer_datasource_impl.dart

@@ -31,6 +31,9 @@ class ComposerDataSourceImpl extends ComposerDataSource {
         filePath: fileInfo.filePath,
         maxWidth: maxWidth,
         compress: compress);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 }

lib/features/composer/data/datasource_impl/contact_datasource_impl.dart

@@ -25,7 +25,10 @@ class ContactDataSourceImpl extends ContactDataSource {
           return <DeviceContact>[];
         }
       }
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   List<DeviceContact> _toDeviceContact(contact_service.Contact contact) {

lib/features/contact/data/datasource_impl/tmail_contact_datasource_impl.dart

@@ -18,6 +18,9 @@ class TMailContactDataSourceImpl extends AutoCompleteDataSource {
     return Future.sync(() async {
       final listContacts = await _contactAPI.getAutoComplete(autoCompletePattern);
       return listContacts.map((contact) => contact.toEmailAddress()).toList();
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 }

lib/features/email/data/datasource_impl/calendar_event_datasource_impl.dart

@@ -20,7 +20,10 @@ class CalendarEventDataSourceImpl extends CalendarEventDataSource {
   Future<List<BlobCalendarEvent>> parse(AccountId accountId, Set<Id> blobIds) {
     return Future.sync(() async {
       return await _calendarEventAPI.parse(accountId, blobIds);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
@@ -30,7 +33,10 @@ class CalendarEventDataSourceImpl extends CalendarEventDataSource {
     String? language) {
     return Future.sync(() async {
       return await _calendarEventAPI.acceptEventInvitation(accountId, blobIds, language);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
@@ -40,7 +46,10 @@ class CalendarEventDataSourceImpl extends CalendarEventDataSource {
     String? language) {
     return Future.sync(() async {
       return await _calendarEventAPI.maybeEventInvitation(accountId, blobIds, language);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
@@ -50,7 +59,10 @@ class CalendarEventDataSourceImpl extends CalendarEventDataSource {
     String? language) {
     return Future.sync(() async {
       return await _calendarEventAPI.rejectEventInvitation(accountId, blobIds, language);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 
   @override
@@ -60,6 +72,9 @@ class CalendarEventDataSourceImpl extends CalendarEventDataSource {
   ) {
     return Future.sync(() async {
       return await _calendarEventAPI.acceptCounterEvent(accountId, blobIds);
-    }).catchError(_exceptionThrower.throwException);
+    }).catchError((error, stackTrace) async {
+      await _exceptionThrower.throwException(error, stackTrace);
+      throw error;
+    });
   }
 }