OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Remove unnecessary type checks and imports

This commit is contained in:
Krille Fear 2021-12-23 11:46:45 +01:00
parent 5a72287d41
commit 3bce8b4489
18 changed files with 7 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/encryption/key_manager.dart
View File

@ -596,9 +596,6 @@ class KeyManager {
final sessionId = sessionEntry.key;
final session = sessionEntry.value;
final sessionData = session.sessionData;
if (!(sessionData is Map)) {
continue;
}
Map<String, dynamic>? decrypted;
try {
decrypted = json.decode(decryption.decrypt(sessionData['ephemeral'],

11
lib/src/client.dart
View File

@ -30,18 +30,7 @@ import 'package:collection/collection.dart' show IterableExtension;
import '../encryption.dart';
import '../matrix.dart';
import 'database/database_api.dart';
import 'event.dart';
import 'room.dart';
import 'user.dart';
import 'utils/commands_extension.dart';
import 'utils/device_keys_list.dart';
import 'utils/event_update.dart';
import 'utils/http_timeout.dart';
import 'utils/matrix_file.dart';
import 'utils/run_benchmarked.dart';
import 'utils/to_device_event.dart';
import 'utils/uia_request.dart';
import 'utils/multilock.dart';
typedef RoomSorter = int Function(Room a, Room b);

1
lib/src/database/hive_database.dart
View File

@ -27,7 +27,6 @@ import 'package:matrix/encryption/utils/outbound_group_session.dart';
import 'package:matrix/encryption/utils/ssss_cache.dart';
import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
import 'package:matrix/matrix.dart';
import 'package:matrix/src/event_status.dart';
import 'package:matrix/src/utils/queued_to_device_event.dart';
import 'package:matrix/src/utils/run_benchmarked.dart';

5
lib/src/event.dart
View File

@ -22,13 +22,8 @@ import 'dart:typed_data';
import 'package:http/http.dart' as http;
import '../matrix.dart';
import 'event_status.dart';
import 'room.dart';
import 'utils/crypto/encrypted_file.dart';
import 'utils/event_localizations.dart';
import 'utils/html_to_text.dart';
import 'utils/matrix_localizations.dart';
import 'utils/receipt.dart';
abstract class RelationshipTypes {
static const String reply = 'm.in_reply_to';

25
lib/src/room.dart
View File

@ -24,18 +24,8 @@ import 'package:html_unescape/html_unescape.dart';
import 'package:matrix/src/utils/space_child.dart';
import '../matrix.dart';
import 'client.dart';
import 'event.dart';
import 'event_status.dart';
import 'timeline.dart';
import 'user.dart';
import 'utils/crypto/encrypted_file.dart';
import 'utils/event_update.dart';
import 'utils/markdown.dart';
import 'utils/marked_unread.dart';
import 'utils/matrix_file.dart';
import 'utils/matrix_localizations.dart';
import 'voip_content.dart';
/// https://github.com/matrix-org/matrix-doc/pull/2746
/// version 1
@ -317,14 +307,11 @@ class Room {
}
}
if (client.directChats is Map<String, dynamic>) {
return client.directChats.entries
.firstWhereOrNull((MapEntry<String, dynamic> e) {
final roomIds = e.value;
return roomIds is List<dynamic> && roomIds.contains(id);
})?.key;
}
return null;
return client.directChats.entries
.firstWhereOrNull((MapEntry<String, dynamic> e) {
final roomIds = e.value;
return roomIds is List<dynamic> && roomIds.contains(id);
})?.key;
}
/// Wheither this is a direct chat or not
@ -1171,7 +1158,7 @@ class Room {
]]) {
final userList = <User>[];
final members = states[EventTypes.RoomMember];
if (members != null && members is Map<String, dynamic>) {
if (members != null) {
for (final entry in members.entries) {
final state = entry.value;
if (state.type == EventTypes.RoomMember) userList.add(state.asUser);

4
lib/src/timeline.dart
View File

@ -21,10 +21,6 @@ import 'dart:async';
import 'package:collection/src/iterable_extensions.dart';
import '../matrix.dart';
import 'event.dart';
import 'event_status.dart';
import 'room.dart';
import 'utils/event_update.dart';
/// Represents the timeline of a room. The callback [onUpdate] will be triggered
/// automatically. The initial

3
lib/src/user.dart
View File

@ -18,9 +18,6 @@
import '../matrix.dart';
import 'event.dart';
import 'room.dart';
/// Represents a Matrix User which may be a participant in a Matrix Room.
class User extends Event {
factory User(

9
lib/src/utils/device_keys_list.dart
View File

@ -24,9 +24,6 @@ import 'package:matrix/matrix.dart';
import 'package:olm/olm.dart' as olm;
import '../../encryption.dart';
import '../client.dart';
import '../event.dart';
import '../room.dart';
enum UserVerifiedStatus { verified, unknown, unknownDevice }
@ -242,8 +239,7 @@ abstract class SignableKey extends MatrixSignableKey {
for (final signatureEntries in signatures!.entries) {
final otherUserId = signatureEntries.key;
if (!(signatureEntries.value is Map) ||
!client.userDeviceKeys.containsKey(otherUserId)) {
if (!client.userDeviceKeys.containsKey(otherUserId)) {
continue;
}
// we don't allow transitive trust unless it is for ourself
@ -253,9 +249,6 @@ abstract class SignableKey extends MatrixSignableKey {
for (final signatureEntry in signatureEntries.value.entries) {
final fullKeyId = signatureEntry.key;
final signature = signatureEntry.value;
if (!(fullKeyId is String) || !(signature is String)) {
continue;
}
final keyId = fullKeyId.substring('ed25519:'.length);
// we ignore self-signatures here
if (otherUserId == userId && keyId == identifier) {

3
lib/src/utils/event_localizations.dart
View File

@ -20,9 +20,6 @@ import 'package:collection/collection.dart';
import '../../encryption.dart';
import '../../matrix.dart';
import '../event.dart';
import '../room.dart';
import 'matrix_localizations.dart';
abstract class EventLocalizations {
// As we need to create the localized body off of a different set of parameters, we

1
lib/src/utils/matrix_file.dart
View File

@ -20,7 +20,6 @@
import 'dart:typed_data';
import 'crypto/encrypted_file.dart';
import 'package:mime/mime.dart';
import '../../matrix.dart';

3
test/client_test.dart
View File

@ -22,9 +22,6 @@ import 'dart:typed_data';
import 'package:matrix/matrix.dart';
import 'package:matrix/src/client.dart';
import 'package:matrix/src/utils/event_update.dart';
import 'package:matrix/src/utils/matrix_file.dart';
import 'package:olm/olm.dart' as olm;
import 'package:test/test.dart';
import 'package:canonical_json/canonical_json.dart';

4
test/event_test.dart
View File

@ -21,8 +21,6 @@ import 'dart:typed_data';
import 'package:matrix/encryption.dart';
import 'package:matrix/matrix.dart';
import 'package:matrix/src/event.dart';
import 'package:matrix/src/event_status.dart';
import 'package:olm/olm.dart' as olm;
import 'package:test/test.dart';
@ -404,8 +402,6 @@ void main() {
'membership': 'join'
}
}, room);
expect(
event.getLocalizedBody(MatrixDefaultLocalizations()) is String, true);
expect(event.isEventTypeKnown, true);
event = Event.fromJson({

2
test/fake_database.dart
View File

@ -20,10 +20,8 @@ import 'dart:io';
import 'dart:math';
import 'package:matrix/matrix.dart';
import 'package:matrix/src/database/hive_database.dart';
import 'package:file/memory.dart';
import 'package:hive/hive.dart';
import 'package:matrix/src/database/fluffybox_database.dart';
Future<DatabaseApi> getDatabase(Client? _) => getHiveDatabase(_);

1
test/matrix_database_test.dart
View File

@ -18,7 +18,6 @@
*/
import 'package:matrix/matrix.dart';
import 'package:matrix/src/event_status.dart';
import 'package:test/test.dart';
import 'fake_database.dart';

2
test/mxc_uri_extension_test.dart
View File

@ -19,8 +19,6 @@
import 'package:matrix/matrix.dart';
import 'package:test/test.dart';
import 'package:matrix/src/client.dart';
import 'package:matrix/src/utils/uri_extension.dart';
import 'fake_matrix_api.dart';

5
test/room_test.dart
View File

@ -20,11 +20,6 @@ import 'dart:convert';
import 'dart:typed_data';
import 'package:matrix/matrix.dart';
import 'package:matrix/src/client.dart';
import 'package:matrix/src/event.dart';
import 'package:matrix/src/room.dart';
import 'package:matrix/src/user.dart';
import 'package:matrix/src/utils/matrix_file.dart';
import 'package:test/test.dart';

5
test/timeline_test.dart
View File

@ -17,13 +17,8 @@
*/
import 'package:matrix/matrix.dart';
import 'package:matrix/src/event_status.dart';
import 'package:test/test.dart';
import 'package:matrix/src/client.dart';
import 'package:matrix/src/room.dart';
import 'package:matrix/src/timeline.dart';
import 'package:matrix/src/utils/event_update.dart';
import 'package:olm/olm.dart' as olm;
import 'fake_client.dart';

2
test/user_test.dart
View File

@ -17,8 +17,6 @@
*/
import 'package:matrix/matrix.dart';
import 'package:matrix/src/event.dart';
import 'package:matrix/src/user.dart';
import 'package:test/test.dart';