From e170325cae4cac1e0c8c5d5ae92c56d1bfb7d5dd Mon Sep 17 00:00:00 2001 From: Krille Date: Fri, 5 May 2023 13:38:56 +0200 Subject: [PATCH] refactor: Make parameters more clear and remove unused methods --- lib/src/database/database_api.dart | 14 +++---------- .../database/hive_collections_database.dart | 20 ------------------- lib/src/database/hive_database.dart | 19 ------------------ 3 files changed, 3 insertions(+), 50 deletions(-) diff --git a/lib/src/database/database_api.dart b/lib/src/database/database_api.dart index 97020f37..02059ce3 100644 --- a/lib/src/database/database_api.dart +++ b/lib/src/database/database_api.dart @@ -82,15 +82,15 @@ abstract class DatabaseApi { Future> getEventList( Room room, { int start = 0, - bool onlySending, - int limit, + bool onlySending = false, + int? limit, }); Future> getEventIdList( Room room, { int start = 0, bool includeSending = false, - int limit, + int? limit, }); Future getFile(Uri mxcUri); @@ -232,20 +232,12 @@ abstract class DatabaseApi { Future removeEvent(String eventId, String roomId); - Future updateRoomSortOrder( - double oldestSortOrder, - double newestSortOrder, - String roomId, - ); - Future setRoomPrevBatch( String prevBatch, String roomId, Client client, ); - Future resetNotificationCount(String roomId); - Future setVerifiedUserCrossSigningKey( bool verified, String userId, diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart index 80fa1597..1234c5c1 100644 --- a/lib/src/database/hive_collections_database.dart +++ b/lib/src/database/hive_collections_database.dart @@ -893,15 +893,6 @@ class HiveCollectionsDatabase extends DatabaseApi { return; } - @override - Future resetNotificationCount(String roomId) async { - final raw = await _roomsBox.get(roomId); - if (raw == null) return; - raw['notification_count'] = raw['highlight_count'] = 0; - await _roomsBox.put(roomId, raw); - return; - } - @override Future setBlockedUserCrossSigningKey( bool blocked, String userId, String publicKey) async { @@ -1430,17 +1421,6 @@ class HiveCollectionsDatabase extends DatabaseApi { return; } - @override - Future updateRoomSortOrder( - double oldestSortOrder, double newestSortOrder, String roomId) async { - final raw = await _roomsBox.get(roomId); - if (raw == null) throw ('Room not found'); - raw['oldest_sort_order'] = oldestSortOrder; - raw['newest_sort_order'] = newestSortOrder; - await _roomsBox.put(roomId, raw); - return; - } - @override Future> getAllInboundGroupSessions() async { final rawSessions = await _inboundGroupSessionsBox.getAllValues(); diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart index 240b6a8d..05bcaf9c 100644 --- a/lib/src/database/hive_database.dart +++ b/lib/src/database/hive_database.dart @@ -829,15 +829,6 @@ class FamedlySdkHiveDatabase extends DatabaseApi { return; } - @override - Future resetNotificationCount(String roomId) async { - final raw = await _roomsBox.get(roomId.toHiveKey); - if (raw == null) return; - raw['notification_count'] = raw['highlight_count'] = 0; - await _roomsBox.put(roomId.toHiveKey, raw); - return; - } - @override Future setBlockedUserCrossSigningKey( bool blocked, String userId, String publicKey) async { @@ -1390,16 +1381,6 @@ class FamedlySdkHiveDatabase extends DatabaseApi { return; } - @override - Future updateRoomSortOrder( - double oldestSortOrder, double newestSortOrder, String roomId) async { - final raw = await _roomsBox.get(roomId.toHiveKey); - raw['oldest_sort_order'] = oldestSortOrder; - raw['newest_sort_order'] = newestSortOrder; - await _roomsBox.put(roomId.toHiveKey, raw); - return; - } - @override Future> getAllInboundGroupSessions() async { final rawSessions = await Future.wait(_inboundGroupSessionsBox.keys