diff --git a/lib/encryption.dart b/lib/encryption.dart index 2239ee23..6ebb4f74 100644 --- a/lib/encryption.dart +++ b/lib/encryption.dart @@ -18,7 +18,7 @@ library encryption; -export './encryption/encryption.dart'; -export './encryption/key_manager.dart'; -export './encryption/ssss.dart'; -export './encryption/utils/key_verification.dart'; +export 'encryption/encryption.dart'; +export 'encryption/key_manager.dart'; +export 'encryption/ssss.dart'; +export 'encryption/utils/key_verification.dart'; diff --git a/lib/encryption/cross_signing.dart b/lib/encryption/cross_signing.dart index c8e22498..a44a85e1 100644 --- a/lib/encryption/cross_signing.dart +++ b/lib/encryption/cross_signing.dart @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -import 'dart:typed_data'; import 'dart:convert'; +import 'dart:typed_data'; import 'package:olm/olm.dart' as olm; -import 'package:famedlysdk/famedlysdk.dart'; +import '../famedlysdk.dart'; import 'encryption.dart'; const SELF_SIGNING_KEY = 'm.cross_signing.self_signing'; diff --git a/lib/encryption/encryption.dart b/lib/encryption/encryption.dart index 62c5a053..6b78c952 100644 --- a/lib/encryption/encryption.dart +++ b/lib/encryption/encryption.dart @@ -18,13 +18,14 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/matrix_api.dart'; import 'package:pedantic/pedantic.dart'; -import 'key_manager.dart'; -import 'olm_manager.dart'; -import 'key_verification_manager.dart'; + +import '../famedlysdk.dart'; +import '../matrix_api.dart'; import 'cross_signing.dart'; +import 'key_manager.dart'; +import 'key_verification_manager.dart'; +import 'olm_manager.dart'; import 'ssss.dart'; class Encryption { diff --git a/lib/encryption/key_manager.dart b/lib/encryption/key_manager.dart index a0e18096..59efb647 100644 --- a/lib/encryption/key_manager.dart +++ b/lib/encryption/key_manager.dart @@ -18,15 +18,15 @@ import 'dart:convert'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:pedantic/pedantic.dart'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/matrix_api.dart'; import 'package:olm/olm.dart' as olm; +import 'package:pedantic/pedantic.dart'; import './encryption.dart'; -import './utils/session_key.dart'; import './utils/outbound_group_session.dart'; +import './utils/session_key.dart'; +import '../famedlysdk.dart'; +import '../matrix_api.dart'; +import '../src/utils/logs.dart'; const MEGOLM_KEY = 'm.megolm_backup.v1'; diff --git a/lib/encryption/key_verification_manager.dart b/lib/encryption/key_verification_manager.dart index d02d1071..387836dd 100644 --- a/lib/encryption/key_verification_manager.dart +++ b/lib/encryption/key_verification_manager.dart @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; -import './encryption.dart'; -import './utils/key_verification.dart'; +import '../famedlysdk.dart'; +import 'encryption.dart'; +import 'utils/key_verification.dart'; class KeyVerificationManager { final Encryption encryption; diff --git a/lib/encryption/olm_manager.dart b/lib/encryption/olm_manager.dart index 6bb94934..a0078ecc 100644 --- a/lib/encryption/olm_manager.dart +++ b/lib/encryption/olm_manager.dart @@ -18,14 +18,15 @@ import 'dart:convert'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:pedantic/pedantic.dart'; import 'package:canonical_json/canonical_json.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; import 'package:olm/olm.dart' as olm; -import './encryption.dart'; -import './utils/olm_session.dart'; +import 'package:pedantic/pedantic.dart'; + +import '../src/utils/logs.dart'; +import 'encryption.dart'; +import 'utils/olm_session.dart'; class OlmManager { final Encryption encryption; diff --git a/lib/encryption/ssss.dart b/lib/encryption/ssss.dart index fb53ae2e..d6463971 100644 --- a/lib/encryption/ssss.dart +++ b/lib/encryption/ssss.dart @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -import 'dart:typed_data'; import 'dart:convert'; +import 'dart:typed_data'; -import 'package:encrypt/encrypt.dart'; -import 'package:crypto/crypto.dart'; import 'package:base58check/base58.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; +import 'package:crypto/crypto.dart'; +import 'package:encrypt/encrypt.dart'; import 'package:password_hash/password_hash.dart'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/matrix_api.dart'; +import '../famedlysdk.dart'; +import '../matrix_api.dart'; +import '../src/utils/logs.dart'; import 'encryption.dart'; const CACHE_TYPES = [ diff --git a/lib/encryption/utils/key_verification.dart b/lib/encryption/utils/key_verification.dart index 4b89f068..8075a216 100644 --- a/lib/encryption/utils/key_verification.dart +++ b/lib/encryption/utils/key_verification.dart @@ -18,13 +18,14 @@ import 'dart:async'; import 'dart:typed_data'; -import 'package:canonical_json/canonical_json.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:pedantic/pedantic.dart'; -import 'package:olm/olm.dart' as olm; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/matrix_api.dart'; +import 'package:canonical_json/canonical_json.dart'; +import 'package:olm/olm.dart' as olm; +import 'package:pedantic/pedantic.dart'; + +import '../../famedlysdk.dart'; +import '../../matrix_api.dart'; +import '../../src/utils/logs.dart'; import '../encryption.dart'; /* diff --git a/lib/encryption/utils/olm_session.dart b/lib/encryption/utils/olm_session.dart index 73d8a98c..2edf4cb6 100644 --- a/lib/encryption/utils/olm_session.dart +++ b/lib/encryption/utils/olm_session.dart @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/src/utils/logs.dart'; import 'package:olm/olm.dart' as olm; + import '../../src/database/database.dart' show DbOlmSessions; +import '../../src/utils/logs.dart'; class OlmSession { String identityKey; diff --git a/lib/encryption/utils/outbound_group_session.dart b/lib/encryption/utils/outbound_group_session.dart index bf108188..d3da8cb5 100644 --- a/lib/encryption/utils/outbound_group_session.dart +++ b/lib/encryption/utils/outbound_group_session.dart @@ -18,9 +18,10 @@ import 'dart:convert'; -import 'package:famedlysdk/src/utils/logs.dart'; import 'package:olm/olm.dart' as olm; + import '../../src/database/database.dart' show DbOutboundGroupSession; +import '../../src/utils/logs.dart'; class OutboundGroupSession { List devices; diff --git a/lib/encryption/utils/session_key.dart b/lib/encryption/utils/session_key.dart index 176c9e00..523ff7a8 100644 --- a/lib/encryption/utils/session_key.dart +++ b/lib/encryption/utils/session_key.dart @@ -18,11 +18,11 @@ import 'dart:convert'; -import 'package:famedlysdk/src/utils/logs.dart'; import 'package:olm/olm.dart' as olm; -import 'package:famedlysdk/famedlysdk.dart'; +import '../../famedlysdk.dart'; import '../../src/database/database.dart' show DbInboundGroupSession; +import '../../src/utils/logs.dart'; class SessionKey { Map content; diff --git a/lib/famedlysdk.dart b/lib/famedlysdk.dart index 3a1c51d6..a6617e9c 100644 --- a/lib/famedlysdk.dart +++ b/lib/famedlysdk.dart @@ -19,20 +19,20 @@ library famedlysdk; export 'matrix_api.dart'; -export 'package:famedlysdk/src/utils/room_update.dart'; -export 'package:famedlysdk/src/utils/event_update.dart'; -export 'package:famedlysdk/src/utils/device_keys_list.dart'; -export 'package:famedlysdk/src/utils/matrix_file.dart'; -export 'package:famedlysdk/src/utils/matrix_id_string_extension.dart'; -export 'package:famedlysdk/src/utils/uri_extension.dart'; -export 'package:famedlysdk/src/utils/matrix_localizations.dart'; -export 'package:famedlysdk/src/utils/receipt.dart'; -export 'package:famedlysdk/src/utils/states_map.dart'; -export 'package:famedlysdk/src/utils/sync_update_extension.dart'; -export 'package:famedlysdk/src/utils/to_device_event.dart'; -export 'package:famedlysdk/src/client.dart'; -export 'package:famedlysdk/src/event.dart'; -export 'package:famedlysdk/src/room.dart'; -export 'package:famedlysdk/src/timeline.dart'; -export 'package:famedlysdk/src/user.dart'; -export 'package:famedlysdk/src/database/database.dart' show Database; +export 'src/utils/room_update.dart'; +export 'src/utils/event_update.dart'; +export 'src/utils/device_keys_list.dart'; +export 'src/utils/matrix_file.dart'; +export 'src/utils/matrix_id_string_extension.dart'; +export 'src/utils/uri_extension.dart'; +export 'src/utils/matrix_localizations.dart'; +export 'src/utils/receipt.dart'; +export 'src/utils/states_map.dart'; +export 'src/utils/sync_update_extension.dart'; +export 'src/utils/to_device_event.dart'; +export 'src/client.dart'; +export 'src/event.dart'; +export 'src/room.dart'; +export 'src/timeline.dart'; +export 'src/user.dart'; +export 'src/database/database.dart' show Database; diff --git a/lib/matrix_api.dart b/lib/matrix_api.dart index be120a31..e918827b 100644 --- a/lib/matrix_api.dart +++ b/lib/matrix_api.dart @@ -18,49 +18,49 @@ library matrix_api; -export 'package:famedlysdk/matrix_api/matrix_api.dart'; -export 'package:famedlysdk/matrix_api/model/basic_event_with_sender.dart'; -export 'package:famedlysdk/matrix_api/model/basic_event.dart'; -export 'package:famedlysdk/matrix_api/model/device.dart'; -export 'package:famedlysdk/matrix_api/model/basic_room_event.dart'; -export 'package:famedlysdk/matrix_api/model/event_context.dart'; -export 'package:famedlysdk/matrix_api/model/matrix_event.dart'; -export 'package:famedlysdk/matrix_api/model/event_types.dart'; -export 'package:famedlysdk/matrix_api/model/events_sync_update.dart'; -export 'package:famedlysdk/matrix_api/model/filter.dart'; -export 'package:famedlysdk/matrix_api/model/keys_query_response.dart'; -export 'package:famedlysdk/matrix_api/model/login_response.dart'; -export 'package:famedlysdk/matrix_api/model/login_types.dart'; -export 'package:famedlysdk/matrix_api/model/matrix_exception.dart'; -export 'package:famedlysdk/matrix_api/model/matrix_keys.dart'; -export 'package:famedlysdk/matrix_api/model/message_types.dart'; -export 'package:famedlysdk/matrix_api/model/presence_content.dart'; -export 'package:famedlysdk/matrix_api/model/notifications_query_response.dart'; -export 'package:famedlysdk/matrix_api/model/one_time_keys_claim_response.dart'; -export 'package:famedlysdk/matrix_api/model/open_graph_data.dart'; -export 'package:famedlysdk/matrix_api/model/open_id_credentials.dart'; -export 'package:famedlysdk/matrix_api/model/presence.dart'; -export 'package:famedlysdk/matrix_api/model/profile.dart'; -export 'package:famedlysdk/matrix_api/model/public_rooms_response.dart'; -export 'package:famedlysdk/matrix_api/model/push_rule_set.dart'; -export 'package:famedlysdk/matrix_api/model/pusher.dart'; -export 'package:famedlysdk/matrix_api/model/request_token_response.dart'; -export 'package:famedlysdk/matrix_api/model/room_alias_informations.dart'; -export 'package:famedlysdk/matrix_api/model/room_keys_info.dart'; -export 'package:famedlysdk/matrix_api/model/room_keys_keys.dart'; -export 'package:famedlysdk/matrix_api/model/room_summary.dart'; -export 'package:famedlysdk/matrix_api/model/server_capabilities.dart'; -export 'package:famedlysdk/matrix_api/model/stripped_state_event.dart'; -export 'package:famedlysdk/matrix_api/model/supported_protocol.dart'; -export 'package:famedlysdk/matrix_api/model/supported_versions.dart'; -export 'package:famedlysdk/matrix_api/model/sync_update.dart'; -export 'package:famedlysdk/matrix_api/model/tag.dart'; -export 'package:famedlysdk/matrix_api/model/third_party_identifier.dart'; -export 'package:famedlysdk/matrix_api/model/third_party_location.dart'; -export 'package:famedlysdk/matrix_api/model/third_party_user.dart'; -export 'package:famedlysdk/matrix_api/model/timeline_history_response.dart'; -export 'package:famedlysdk/matrix_api/model/turn_server_credentials.dart'; -export 'package:famedlysdk/matrix_api/model/upload_key_signatures_response.dart'; -export 'package:famedlysdk/matrix_api/model/user_search_result.dart'; -export 'package:famedlysdk/matrix_api/model/well_known_informations.dart'; -export 'package:famedlysdk/matrix_api/model/who_is_info.dart'; +export 'matrix_api/matrix_api.dart'; +export 'matrix_api/model/basic_event.dart'; +export 'matrix_api/model/basic_event_with_sender.dart'; +export 'matrix_api/model/basic_room_event.dart'; +export 'matrix_api/model/device.dart'; +export 'matrix_api/model/event_context.dart'; +export 'matrix_api/model/event_types.dart'; +export 'matrix_api/model/events_sync_update.dart'; +export 'matrix_api/model/filter.dart'; +export 'matrix_api/model/keys_query_response.dart'; +export 'matrix_api/model/login_response.dart'; +export 'matrix_api/model/login_types.dart'; +export 'matrix_api/model/matrix_event.dart'; +export 'matrix_api/model/matrix_exception.dart'; +export 'matrix_api/model/matrix_keys.dart'; +export 'matrix_api/model/message_types.dart'; +export 'matrix_api/model/notifications_query_response.dart'; +export 'matrix_api/model/one_time_keys_claim_response.dart'; +export 'matrix_api/model/open_graph_data.dart'; +export 'matrix_api/model/open_id_credentials.dart'; +export 'matrix_api/model/presence.dart'; +export 'matrix_api/model/presence_content.dart'; +export 'matrix_api/model/profile.dart'; +export 'matrix_api/model/public_rooms_response.dart'; +export 'matrix_api/model/push_rule_set.dart'; +export 'matrix_api/model/pusher.dart'; +export 'matrix_api/model/request_token_response.dart'; +export 'matrix_api/model/room_alias_informations.dart'; +export 'matrix_api/model/room_keys_info.dart'; +export 'matrix_api/model/room_keys_keys.dart'; +export 'matrix_api/model/room_summary.dart'; +export 'matrix_api/model/server_capabilities.dart'; +export 'matrix_api/model/stripped_state_event.dart'; +export 'matrix_api/model/supported_protocol.dart'; +export 'matrix_api/model/supported_versions.dart'; +export 'matrix_api/model/sync_update.dart'; +export 'matrix_api/model/tag.dart'; +export 'matrix_api/model/third_party_identifier.dart'; +export 'matrix_api/model/third_party_location.dart'; +export 'matrix_api/model/third_party_user.dart'; +export 'matrix_api/model/timeline_history_response.dart'; +export 'matrix_api/model/turn_server_credentials.dart'; +export 'matrix_api/model/upload_key_signatures_response.dart'; +export 'matrix_api/model/user_search_result.dart'; +export 'matrix_api/model/well_known_informations.dart'; +export 'matrix_api/model/who_is_info.dart'; diff --git a/lib/matrix_api/matrix_api.dart b/lib/matrix_api/matrix_api.dart index 50b66c05..f738a83a 100644 --- a/lib/matrix_api/matrix_api.dart +++ b/lib/matrix_api/matrix_api.dart @@ -19,19 +19,6 @@ import 'dart:async'; import 'dart:convert'; -import 'package:famedlysdk/matrix_api/model/filter.dart'; -import 'package:famedlysdk/matrix_api/model/keys_query_response.dart'; -import 'package:famedlysdk/matrix_api/model/login_types.dart'; -import 'package:famedlysdk/matrix_api/model/notifications_query_response.dart'; -import 'package:famedlysdk/matrix_api/model/open_graph_data.dart'; -import 'package:famedlysdk/matrix_api/model/profile.dart'; -import 'package:famedlysdk/matrix_api/model/request_token_response.dart'; -import 'package:famedlysdk/matrix_api/model/server_capabilities.dart'; -import 'package:famedlysdk/matrix_api/model/supported_versions.dart'; -import 'package:famedlysdk/matrix_api/model/sync_update.dart'; -import 'package:famedlysdk/matrix_api/model/third_party_location.dart'; -import 'package:famedlysdk/matrix_api/model/timeline_history_response.dart'; -import 'package:famedlysdk/matrix_api/model/user_search_result.dart'; import 'package:http/http.dart' as http; import 'package:mime/mime.dart'; import 'package:moor/moor.dart'; @@ -39,25 +26,38 @@ import 'package:moor/moor.dart'; import 'model/device.dart'; import 'model/event_context.dart'; import 'model/events_sync_update.dart'; +import 'model/filter.dart'; +import 'model/keys_query_response.dart'; import 'model/login_response.dart'; +import 'model/login_types.dart'; import 'model/matrix_event.dart'; import 'model/matrix_exception.dart'; import 'model/matrix_keys.dart'; +import 'model/notifications_query_response.dart'; import 'model/one_time_keys_claim_response.dart'; +import 'model/open_graph_data.dart'; import 'model/open_id_credentials.dart'; import 'model/presence_content.dart'; +import 'model/profile.dart'; import 'model/public_rooms_response.dart'; import 'model/push_rule_set.dart'; import 'model/pusher.dart'; +import 'model/request_token_response.dart'; import 'model/room_alias_informations.dart'; import 'model/room_keys_info.dart'; import 'model/room_keys_keys.dart'; +import 'model/server_capabilities.dart'; import 'model/supported_protocol.dart'; +import 'model/supported_versions.dart'; +import 'model/sync_update.dart'; import 'model/tag.dart'; import 'model/third_party_identifier.dart'; +import 'model/third_party_location.dart'; import 'model/third_party_user.dart'; +import 'model/timeline_history_response.dart'; import 'model/turn_server_credentials.dart'; import 'model/upload_key_signatures_response.dart'; +import 'model/user_search_result.dart'; import 'model/well_known_informations.dart'; import 'model/who_is_info.dart'; diff --git a/lib/matrix_api/model/basic_room_event.dart b/lib/matrix_api/model/basic_room_event.dart index c8f7564c..de8ee75c 100644 --- a/lib/matrix_api/model/basic_room_event.dart +++ b/lib/matrix_api/model/basic_room_event.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/matrix_api/model/basic_event.dart'; +import 'basic_event.dart'; class BasicRoomEvent extends BasicEvent { String roomId; diff --git a/lib/matrix_api/model/matrix_event.dart b/lib/matrix_api/model/matrix_event.dart index e70f8b55..2f5f35f0 100644 --- a/lib/matrix_api/model/matrix_event.dart +++ b/lib/matrix_api/model/matrix_event.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/matrix_api/model/stripped_state_event.dart'; +import 'stripped_state_event.dart'; class MatrixEvent extends StrippedStateEvent { String eventId; diff --git a/lib/matrix_api/model/stripped_state_event.dart b/lib/matrix_api/model/stripped_state_event.dart index 86511a57..29c0740a 100644 --- a/lib/matrix_api/model/stripped_state_event.dart +++ b/lib/matrix_api/model/stripped_state_event.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/matrix_api/model/basic_event_with_sender.dart'; +import 'basic_event_with_sender.dart'; class StrippedStateEvent extends BasicEventWithSender { String stateKey; diff --git a/lib/src/client.dart b/lib/src/client.dart index 806f9a09..40b2bd7c 100644 --- a/lib/src/client.dart +++ b/lib/src/client.dart @@ -20,22 +20,21 @@ import 'dart:async'; import 'dart:convert'; import 'dart:core'; -import 'package:famedlysdk/encryption.dart'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/room.dart'; -import 'package:famedlysdk/src/utils/device_keys_list.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:famedlysdk/src/utils/matrix_file.dart'; -import 'package:famedlysdk/src/utils/to_device_event.dart'; import 'package:http/http.dart' as http; import 'package:pedantic/pedantic.dart'; +import '../encryption.dart'; +import '../famedlysdk.dart'; import 'database/database.dart' show Database; import 'event.dart'; import 'room.dart'; import 'user.dart'; +import 'utils/device_keys_list.dart'; import 'utils/event_update.dart'; +import 'utils/logs.dart'; +import 'utils/matrix_file.dart'; import 'utils/room_update.dart'; +import 'utils/to_device_event.dart'; typedef RoomSorter = int Function(Room a, Room b); diff --git a/lib/src/database/database.dart b/lib/src/database/database.dart index 793fd48f..a1ad0cb4 100644 --- a/lib/src/database/database.dart +++ b/lib/src/database/database.dart @@ -1,13 +1,13 @@ -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:moor/moor.dart'; import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart' as sdk; -import 'package:famedlysdk/matrix_api.dart' as api; +import 'package:moor/moor.dart'; import 'package:olm/olm.dart' as olm; +import '../../famedlysdk.dart' as sdk; +import '../../matrix_api.dart' as api; import '../../matrix_api.dart'; import '../room.dart'; +import '../utils/logs.dart'; part 'database.g.dart'; diff --git a/lib/src/event.dart b/lib/src/event.dart index 23c53ca0..92cafeb4 100644 --- a/lib/src/event.dart +++ b/lib/src/event.dart @@ -18,16 +18,18 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:famedlysdk/src/utils/receipt.dart'; + import 'package:http/http.dart' as http; import 'package:matrix_file_e2ee/matrix_file_e2ee.dart'; + +import '../encryption.dart'; +import '../famedlysdk.dart'; import '../matrix_api.dart'; -import './room.dart'; +import 'database/database.dart' show DbRoomState, DbEvent; +import 'room.dart'; +import 'utils/logs.dart'; import 'utils/matrix_localizations.dart'; -import './database/database.dart' show DbRoomState, DbEvent; +import 'utils/receipt.dart'; abstract class RelationshipTypes { static const String Reply = 'm.in_reply_to'; diff --git a/lib/src/room.dart b/lib/src/room.dart index f8d25c1c..943fe89e 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -18,23 +18,23 @@ import 'dart:async'; -import 'package:famedlysdk/matrix_api.dart'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/client.dart'; -import 'package:famedlysdk/src/event.dart'; -import 'package:famedlysdk/src/utils/event_update.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; -import 'package:famedlysdk/src/utils/room_update.dart'; -import 'package:famedlysdk/src/utils/matrix_file.dart'; -import 'package:matrix_file_e2ee/matrix_file_e2ee.dart'; import 'package:html_unescape/html_unescape.dart'; +import 'package:matrix_file_e2ee/matrix_file_e2ee.dart'; -import './user.dart'; +import '../famedlysdk.dart'; +import '../matrix_api.dart'; +import 'client.dart'; +import 'database/database.dart' show DbRoom; +import 'event.dart'; import 'timeline.dart'; +import 'user.dart'; +import 'utils/event_update.dart'; +import 'utils/logs.dart'; +import 'utils/markdown.dart'; +import 'utils/matrix_file.dart'; import 'utils/matrix_localizations.dart'; +import 'utils/room_update.dart'; import 'utils/states_map.dart'; -import './utils/markdown.dart'; -import './database/database.dart' show DbRoom; enum PushRuleState { notify, mentions_only, dont_notify } enum JoinRules { public, knock, invite, private } diff --git a/lib/src/timeline.dart b/lib/src/timeline.dart index 18fe0bfe..4f21dc6e 100644 --- a/lib/src/timeline.dart +++ b/lib/src/timeline.dart @@ -18,12 +18,11 @@ import 'dart:async'; -import 'package:famedlysdk/matrix_api.dart'; -import 'package:famedlysdk/src/utils/logs.dart'; - +import '../matrix_api.dart'; import 'event.dart'; import 'room.dart'; import 'utils/event_update.dart'; +import 'utils/logs.dart'; import 'utils/room_update.dart'; typedef onTimelineUpdateCallback = void Function(); diff --git a/lib/src/user.dart b/lib/src/user.dart index ea1ce421..f0d2a885 100644 --- a/lib/src/user.dart +++ b/lib/src/user.dart @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/matrix_api.dart'; -import 'package:famedlysdk/src/room.dart'; -import 'package:famedlysdk/src/event.dart'; +import '../famedlysdk.dart'; +import '../matrix_api.dart'; +import 'event.dart'; +import 'room.dart'; /// Represents a Matrix User which may be a participant in a Matrix Room. class User extends Event { diff --git a/lib/src/utils/device_keys_list.dart b/lib/src/utils/device_keys_list.dart index c8430b7d..cc8b79c4 100644 --- a/lib/src/utils/device_keys_list.dart +++ b/lib/src/utils/device_keys_list.dart @@ -1,16 +1,16 @@ import 'dart:convert'; + import 'package:canonical_json/canonical_json.dart'; import 'package:olm/olm.dart' as olm; -import 'package:famedlysdk/matrix_api.dart'; -import 'package:famedlysdk/encryption.dart'; - +import '../../encryption.dart'; +import '../../matrix_api.dart'; import '../client.dart'; -import '../user.dart'; -import '../room.dart'; import '../database/database.dart' show DbUserDeviceKey, DbUserDeviceKeysKey, DbUserCrossSigningKey; import '../event.dart'; +import '../room.dart'; +import '../user.dart'; enum UserVerifiedStatus { verified, unknown, unknownDevice } diff --git a/lib/src/utils/matrix_file.dart b/lib/src/utils/matrix_file.dart index f5561bcc..3c728f29 100644 --- a/lib/src/utils/matrix_file.dart +++ b/lib/src/utils/matrix_file.dart @@ -1,10 +1,12 @@ /// Workaround until [File] in dart:io and dart:html is unified import 'dart:typed_data'; -import 'package:famedlysdk/matrix_api/model/message_types.dart'; + import 'package:matrix_file_e2ee/matrix_file_e2ee.dart'; import 'package:mime/mime.dart'; +import '../../matrix_api/model/message_types.dart'; + class MatrixFile { Uint8List bytes; String name; diff --git a/lib/src/utils/room_update.dart b/lib/src/utils/room_update.dart index 43f5e22b..bdb918f0 100644 --- a/lib/src/utils/room_update.dart +++ b/lib/src/utils/room_update.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/matrix_api.dart'; +import '../../matrix_api.dart'; /// Represents a new room or an update for an /// already known room. diff --git a/lib/src/utils/states_map.dart b/lib/src/utils/states_map.dart index 75fbcb8c..4af43226 100644 --- a/lib/src/utils/states_map.dart +++ b/lib/src/utils/states_map.dart @@ -1,5 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; - +import '../../famedlysdk.dart'; import '../../matrix_api.dart'; /// Matrix room states are addressed by a tuple of the [type] and an diff --git a/lib/src/utils/sync_update_extension.dart b/lib/src/utils/sync_update_extension.dart index c4b9ecb5..a14150fa 100644 --- a/lib/src/utils/sync_update_extension.dart +++ b/lib/src/utils/sync_update_extension.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/matrix_api.dart'; +import '../../matrix_api.dart'; /// This extension adds easy-to-use filters for the sync update, meant to be used on the `client.onSync` stream, e.g. /// `client.onSync.stream.where((s) => s.hasRoomUpdate)`. Multiple filters can easily be diff --git a/lib/src/utils/to_device_event.dart b/lib/src/utils/to_device_event.dart index 729124ae..96ff91bc 100644 --- a/lib/src/utils/to_device_event.dart +++ b/lib/src/utils/to_device_event.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/matrix_api.dart'; +import '../../matrix_api.dart'; class ToDeviceEvent extends BasicEventWithSender { Map encryptedContent; diff --git a/lib/src/utils/uri_extension.dart b/lib/src/utils/uri_extension.dart index 804e385b..69ad82aa 100644 --- a/lib/src/utils/uri_extension.dart +++ b/lib/src/utils/uri_extension.dart @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/src/client.dart'; import 'dart:core'; +import '../client.dart'; + extension MxcUriExtension on Uri { /// Returns a download Link to this content. String getDownloadLink(Client matrix) => isScheme('mxc')