Skip to content

Commit 9499dbe

Browse files
committed
message [nfc]: Consolidate "disposed" checks onto substore methods
For most of these methods, we check the store isn't disposed within the substore's implementation; for a few, we check in the proxy implementation. Simplify the proxies by always checking in the substore's implementation.
1 parent f83c9c1 commit 9499dbe

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

lib/model/message.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,10 @@ class MessageStoreImpl extends HasRealmStore with MessageStore, _OutboxMessageSt
278278
}
279279

280280
@override
281-
bool? getEditMessageErrorStatus(int messageId) =>
282-
_editMessageRequests[messageId]?.hasError;
281+
bool? getEditMessageErrorStatus(int messageId) {
282+
assert(!_disposed);
283+
return _editMessageRequests[messageId]?.hasError;
284+
}
283285

284286
final Map<int, _EditMessageRequestStatus> _editMessageRequests = {};
285287

lib/model/store.dart

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,6 @@ class PerAccountStore extends PerAccountStoreBase with
632632
_messages.markReadFromScroll(messageIds);
633633
@override
634634
Future<void> sendMessage({required MessageDestination destination, required String content}) {
635-
assert(!_disposed);
636635
return _messages.sendMessage(destination: destination, content: content);
637636
}
638637
@override
@@ -646,7 +645,6 @@ class PerAccountStore extends PerAccountStoreBase with
646645
}
647646
@override
648647
bool? getEditMessageErrorStatus(int messageId) {
649-
assert(!_disposed);
650648
return _messages.getEditMessageErrorStatus(messageId);
651649
}
652650
@override
@@ -655,13 +653,11 @@ class PerAccountStore extends PerAccountStoreBase with
655653
required String originalRawContent,
656654
required String newContent,
657655
}) {
658-
assert(!_disposed);
659656
return _messages.editMessage(messageId: messageId,
660657
originalRawContent: originalRawContent, newContent: newContent);
661658
}
662659
@override
663660
({String originalRawContent, String newContent}) takeFailedMessageEdit(int messageId) {
664-
assert(!_disposed);
665661
return _messages.takeFailedMessageEdit(messageId);
666662
}
667663

0 commit comments

Comments
 (0)