diff --git a/CHANGELOG.md b/CHANGELOG.md index 995b3847..447ec8c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## [0.1.0] - 14 May 2021 +## [0.1.0] - 17 Jun 2021 First stable version \ No newline at end of file diff --git a/README.md b/README.md index c459bab2..cc8c8d60 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Famedly Matrix SDK +# Matrix SDK -Matrix SDK for the famedly talk app written in dart. +Matrix (matrix.org) SDK written in dart. ## Native libraries @@ -10,22 +10,16 @@ Additionally, OpenSSL (libcrypto) must be provided on native platforms for E2EE. For flutter apps you can easily import it with the [flutter_olm](https://pub.dev/packages/flutter_olm) and the [flutter_openssl_crypto](https://pub.dev/packages/flutter_openssl_crypto) packages. -## API - -The API is documented here: [famedly.gitlab.io/famedlysdk/](https://famedly.gitlab.io/famedlysdk/) - ## How to use this 1. Import the sdk ```yaml - famedlysdk: - git: - url: https://gitlab.com/famedly/famedlysdk.git + matrix: ``` ```dart -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; ``` 2. Create a new client: diff --git a/example/main.dart b/example/main.dart index 1757610d..120cabca 100644 --- a/example/main.dart +++ b/example/main.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; diff --git a/lib/encryption/cross_signing.dart b/lib/encryption/cross_signing.dart index 092d8819..1447f65c 100644 --- a/lib/encryption/cross_signing.dart +++ b/lib/encryption/cross_signing.dart @@ -21,7 +21,7 @@ import 'dart:typed_data'; import 'package:olm/olm.dart' as olm; -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'encryption.dart'; import 'ssss.dart'; diff --git a/lib/encryption/encryption.dart b/lib/encryption/encryption.dart index c2a5a566..48d82dc5 100644 --- a/lib/encryption/encryption.dart +++ b/lib/encryption/encryption.dart @@ -22,7 +22,7 @@ import 'dart:async'; import 'package:pedantic/pedantic.dart'; import 'package:olm/olm.dart' as olm; -import '../famedlysdk.dart'; +import '../matrix.dart'; import '../src/utils/run_in_root.dart'; import 'cross_signing.dart'; import 'key_manager.dart'; diff --git a/lib/encryption/key_manager.dart b/lib/encryption/key_manager.dart index b40649ce..ce39c2a0 100644 --- a/lib/encryption/key_manager.dart +++ b/lib/encryption/key_manager.dart @@ -18,13 +18,13 @@ import 'dart:convert'; -import 'package:famedlysdk/encryption/utils/stored_inbound_group_session.dart'; +import 'package:matrix/encryption/utils/stored_inbound_group_session.dart'; import 'package:olm/olm.dart' as olm; import './encryption.dart'; import './utils/outbound_group_session.dart'; import './utils/session_key.dart'; -import '../famedlysdk.dart'; +import '../matrix.dart'; import '../src/utils/run_in_background.dart'; import '../src/utils/run_in_root.dart'; diff --git a/lib/encryption/key_verification_manager.dart b/lib/encryption/key_verification_manager.dart index 4d1df085..e956ac16 100644 --- a/lib/encryption/key_verification_manager.dart +++ b/lib/encryption/key_verification_manager.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'encryption.dart'; import 'utils/key_verification.dart'; diff --git a/lib/encryption/olm_manager.dart b/lib/encryption/olm_manager.dart index cd44266a..93dc3ad4 100644 --- a/lib/encryption/olm_manager.dart +++ b/lib/encryption/olm_manager.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:canonical_json/canonical_json.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:olm/olm.dart' as olm; import 'package:pedantic/pedantic.dart'; diff --git a/lib/encryption/ssss.dart b/lib/encryption/ssss.dart index 8d05c191..7d33b866 100644 --- a/lib/encryption/ssss.dart +++ b/lib/encryption/ssss.dart @@ -24,7 +24,7 @@ import 'dart:async'; import 'package:base58check/base58.dart'; import 'package:crypto/crypto.dart'; -import '../famedlysdk.dart'; +import '../matrix.dart'; import '../src/utils/crypto/crypto.dart' as uc; import '../src/utils/run_in_background.dart'; import '../src/utils/run_in_root.dart'; diff --git a/lib/encryption/utils/bootstrap.dart b/lib/encryption/utils/bootstrap.dart index 7244033f..2ffa4b6c 100644 --- a/lib/encryption/utils/bootstrap.dart +++ b/lib/encryption/utils/bootstrap.dart @@ -25,7 +25,7 @@ import 'package:olm/olm.dart' as olm; import '../encryption.dart'; import '../ssss.dart'; import '../key_manager.dart'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; enum BootstrapState { /// Is loading. diff --git a/lib/encryption/utils/json_signature_check_extension.dart b/lib/encryption/utils/json_signature_check_extension.dart index b5cafae3..7c89bca8 100644 --- a/lib/encryption/utils/json_signature_check_extension.dart +++ b/lib/encryption/utils/json_signature_check_extension.dart @@ -19,7 +19,7 @@ import 'package:canonical_json/canonical_json.dart'; import 'package:olm/olm.dart' as olm; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; extension JsonSignatureCheckExtension on Map { /// Checks the signature of a signed json object. diff --git a/lib/encryption/utils/key_verification.dart b/lib/encryption/utils/key_verification.dart index 2d0df30e..ecdbc5a6 100644 --- a/lib/encryption/utils/key_verification.dart +++ b/lib/encryption/utils/key_verification.dart @@ -23,7 +23,7 @@ import 'package:canonical_json/canonical_json.dart'; import 'package:olm/olm.dart' as olm; import 'package:pedantic/pedantic.dart'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; import '../encryption.dart'; /* diff --git a/lib/encryption/utils/olm_session.dart b/lib/encryption/utils/olm_session.dart index 1af9113c..99592b9c 100644 --- a/lib/encryption/utils/olm_session.dart +++ b/lib/encryption/utils/olm_session.dart @@ -18,7 +18,7 @@ import 'package:olm/olm.dart' as olm; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; class OlmSession { String identityKey; diff --git a/lib/encryption/utils/outbound_group_session.dart b/lib/encryption/utils/outbound_group_session.dart index 3861bfba..90baef54 100644 --- a/lib/encryption/utils/outbound_group_session.dart +++ b/lib/encryption/utils/outbound_group_session.dart @@ -20,7 +20,7 @@ import 'dart:convert'; import 'package:olm/olm.dart' as olm; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; class OutboundGroupSession { /// The devices is a map from user id to device id to if the device is blocked. diff --git a/lib/encryption/utils/session_key.dart b/lib/encryption/utils/session_key.dart index 29d0af16..cf031ef0 100644 --- a/lib/encryption/utils/session_key.dart +++ b/lib/encryption/utils/session_key.dart @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/encryption/utils/stored_inbound_group_session.dart'; +import 'package:matrix/encryption/utils/stored_inbound_group_session.dart'; import 'package:olm/olm.dart' as olm; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; class SessionKey { /// The raw json content of the key diff --git a/lib/famedlysdk.dart b/lib/matrix.dart similarity index 98% rename from lib/famedlysdk.dart rename to lib/matrix.dart index c19deeea..520c74e6 100644 --- a/lib/famedlysdk.dart +++ b/lib/matrix.dart @@ -17,7 +17,7 @@ */ /// Matrix SDK written in pure Dart. -library famedlysdk; +library matrix; export 'package:matrix_api_lite/matrix_api_lite.dart'; export 'src/utils/room_update.dart'; diff --git a/lib/src/client.dart b/lib/src/client.dart index f52f6865..ea49968e 100644 --- a/lib/src/client.dart +++ b/lib/src/client.dart @@ -21,13 +21,13 @@ import 'dart:convert'; import 'dart:core'; import 'dart:typed_data'; -import 'package:famedlysdk/src/utils/run_in_root.dart'; +import 'package:matrix/src/utils/run_in_root.dart'; import 'package:http/http.dart' as http; import 'package:olm/olm.dart' as olm; import 'package:pedantic/pedantic.dart'; import '../encryption.dart'; -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'database/database_api.dart'; import 'event.dart'; import 'room.dart'; diff --git a/lib/src/database/database.dart b/lib/src/database/database.dart index bfe85755..452e10e4 100644 --- a/lib/src/database/database.dart +++ b/lib/src/database/database.dart @@ -19,14 +19,14 @@ import 'dart:async'; import 'dart:convert'; -import 'package:famedlysdk/encryption/utils/olm_session.dart'; -import 'package:famedlysdk/encryption/utils/outbound_group_session.dart'; -import 'package:famedlysdk/encryption/utils/ssss_cache.dart'; -import 'package:famedlysdk/encryption/utils/stored_inbound_group_session.dart'; -import 'package:famedlysdk/src/utils/QueuedToDeviceEvent.dart'; +import 'package:matrix/encryption/utils/olm_session.dart'; +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/src/utils/QueuedToDeviceEvent.dart'; import 'package:moor/moor.dart'; -import '../../famedlysdk.dart' as sdk; +import '../../matrix.dart' as sdk; import 'package:matrix_api_lite/matrix_api_lite.dart' as api; import '../client.dart'; import '../room.dart'; diff --git a/lib/src/database/database_api.dart b/lib/src/database/database_api.dart index 3fff321c..1be538ef 100644 --- a/lib/src/database/database_api.dart +++ b/lib/src/database/database_api.dart @@ -18,13 +18,13 @@ import 'dart:typed_data'; -import 'package:famedlysdk/encryption/utils/olm_session.dart'; -import 'package:famedlysdk/encryption/utils/outbound_group_session.dart'; -import 'package:famedlysdk/encryption/utils/ssss_cache.dart'; -import 'package:famedlysdk/encryption/utils/stored_inbound_group_session.dart'; -import 'package:famedlysdk/src/utils/QueuedToDeviceEvent.dart'; +import 'package:matrix/encryption/utils/olm_session.dart'; +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/src/utils/QueuedToDeviceEvent.dart'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; abstract class DatabaseApi { int get maxFileSize => 1 * 1024 * 1024; diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart index 6ba48c81..ee396aa5 100644 --- a/lib/src/database/hive_database.dart +++ b/lib/src/database/hive_database.dart @@ -2,14 +2,14 @@ import 'dart:async'; import 'dart:convert'; import 'dart:math'; -import 'package:famedlysdk/encryption/utils/stored_inbound_group_session.dart'; -import 'package:famedlysdk/encryption/utils/ssss_cache.dart'; -import 'package:famedlysdk/encryption/utils/outbound_group_session.dart'; -import 'package:famedlysdk/encryption/utils/olm_session.dart'; +import 'package:matrix/encryption/utils/stored_inbound_group_session.dart'; +import 'package:matrix/encryption/utils/ssss_cache.dart'; +import 'package:matrix/encryption/utils/outbound_group_session.dart'; +import 'package:matrix/encryption/utils/olm_session.dart'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/utils/QueuedToDeviceEvent.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/utils/QueuedToDeviceEvent.dart'; import 'package:hive/hive.dart'; /// This is a basic database for the Matrix SDK using the hive store. You need diff --git a/lib/src/event.dart b/lib/src/event.dart index e2530250..dd71135d 100644 --- a/lib/src/event.dart +++ b/lib/src/event.dart @@ -21,7 +21,7 @@ import 'dart:typed_data'; import 'package:http/http.dart' as http; -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'room.dart'; import 'utils/matrix_localizations.dart'; import 'utils/receipt.dart'; diff --git a/lib/src/room.dart b/lib/src/room.dart index 1740b8f4..68c73bb2 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -19,10 +19,10 @@ import 'dart:async'; import 'dart:convert'; -import 'package:famedlysdk/src/utils/space_child.dart'; +import 'package:matrix/src/utils/space_child.dart'; import 'package:html_unescape/html_unescape.dart'; -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'client.dart'; import 'event.dart'; import 'timeline.dart'; diff --git a/lib/src/timeline.dart b/lib/src/timeline.dart index 0424fa73..e314b603 100644 --- a/lib/src/timeline.dart +++ b/lib/src/timeline.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'event.dart'; import 'room.dart'; import 'utils/event_update.dart'; diff --git a/lib/src/user.dart b/lib/src/user.dart index 597a7cc0..36b6204f 100644 --- a/lib/src/user.dart +++ b/lib/src/user.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import '../famedlysdk.dart'; +import '../matrix.dart'; import 'event.dart'; import 'room.dart'; diff --git a/lib/src/utils/commands_extension.dart b/lib/src/utils/commands_extension.dart index 828af639..2babaf83 100644 --- a/lib/src/utils/commands_extension.dart +++ b/lib/src/utils/commands_extension.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; extension CommandsClientExtension on Client { /// Add a command to the command handler. `command` is its name, and `callback` is the diff --git a/lib/src/utils/device_keys_list.dart b/lib/src/utils/device_keys_list.dart index 1b5dd19a..4e6d6a5f 100644 --- a/lib/src/utils/device_keys_list.dart +++ b/lib/src/utils/device_keys_list.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:canonical_json/canonical_json.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:olm/olm.dart' as olm; import '../../encryption.dart'; diff --git a/lib/src/utils/event_localizations.dart b/lib/src/utils/event_localizations.dart index f7654f29..a6e0eeed 100644 --- a/lib/src/utils/event_localizations.dart +++ b/lib/src/utils/event_localizations.dart @@ -17,7 +17,7 @@ */ import '../../encryption.dart'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; import '../event.dart'; import '../room.dart'; import 'matrix_localizations.dart'; diff --git a/lib/src/utils/event_update.dart b/lib/src/utils/event_update.dart index 9d9a7091..0667b35e 100644 --- a/lib/src/utils/event_update.dart +++ b/lib/src/utils/event_update.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import '../../famedlysdk.dart'; +import '../../matrix.dart'; enum EventUpdateType { timeline, diff --git a/lib/src/utils/matrix_file.dart b/lib/src/utils/matrix_file.dart index fb88ad07..f2b8b314 100644 --- a/lib/src/utils/matrix_file.dart +++ b/lib/src/utils/matrix_file.dart @@ -23,7 +23,7 @@ import 'dart:typed_data'; import 'crypto/encrypted_file.dart'; import 'package:mime/mime.dart'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; class MatrixFile { Uint8List bytes; diff --git a/lib/src/utils/room_update.dart b/lib/src/utils/room_update.dart index 532fbee8..47d8e0d1 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 '../../famedlysdk.dart'; +import '../../matrix.dart'; /// Represents a new room or an update for an /// already known room. diff --git a/lib/src/utils/run_in_background.dart b/lib/src/utils/run_in_background.dart index a985312f..adc298bc 100644 --- a/lib/src/utils/run_in_background.dart +++ b/lib/src/utils/run_in_background.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:isolate/isolate.dart'; import 'dart:async'; diff --git a/lib/src/utils/run_in_root.dart b/lib/src/utils/run_in_root.dart index 51e1837e..1fe8dacc 100644 --- a/lib/src/utils/run_in_root.dart +++ b/lib/src/utils/run_in_root.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import '../../famedlysdk.dart'; +import '../../matrix.dart'; Future runInRoot(FutureOr Function() fn) async { return await Zone.root.run(() async { diff --git a/lib/src/utils/sync_update_extension.dart b/lib/src/utils/sync_update_extension.dart index 2a025334..64ecfac8 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 '../../famedlysdk.dart'; +import '../../matrix.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 82aa58d5..0580374b 100644 --- a/lib/src/utils/to_device_event.dart +++ b/lib/src/utils/to_device_event.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import '../../famedlysdk.dart'; +import '../../matrix.dart'; class ToDeviceEvent extends BasicEventWithSender { Map encryptedContent; diff --git a/lib/src/utils/uia_request.dart b/lib/src/utils/uia_request.dart index 569759bd..2c40d698 100644 --- a/lib/src/utils/uia_request.dart +++ b/lib/src/utils/uia_request.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import '../../famedlysdk.dart'; +import '../../matrix.dart'; enum UiaRequestState { /// The request is done diff --git a/pubspec.yaml b/pubspec.yaml index 1c861fcd..a4bb82df 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,6 @@ -name: famedlysdk +name: matrix description: Matrix Dart SDK version: 0.1.0 -author: Famedly GmbH homepage: https://famedly.com environment: @@ -21,12 +20,14 @@ dependencies: isolate: ^2.0.3 matrix_api_lite: ^0.3.3 hive: ^2.0.4 + pedantic: ^1.11.0 + ffi: ^1.0.0 + js: ^0.6.3 dev_dependencies: test: ^1.15.7 coverage: ">=0.15.0 <2.0.0" moor_generator: ^4.0.0 build_runner: ^1.11.1 - pedantic: ^1.11.0 file: ^6.1.1 #flutter_test: {sdk: flutter} diff --git a/scripts/publish.sh b/scripts/publish.sh new file mode 100755 index 00000000..944718ba --- /dev/null +++ b/scripts/publish.sh @@ -0,0 +1,5 @@ +#!/bin/sh -e +mv docs .docs +flutter pub publish --dry-run +flutter pub publish +mv .docs docs \ No newline at end of file diff --git a/scripts/test_driver.sh b/scripts/test_driver.sh index 30f01508..50a1e9bb 100644 --- a/scripts/test_driver.sh +++ b/scripts/test_driver.sh @@ -1,2 +1,2 @@ #!/bin/sh -e -pub run test_driver/famedlysdk_test.dart -p vm \ No newline at end of file +pub run test_driver/matrixsdk_test.dart -p vm \ No newline at end of file diff --git a/test/canonical_json_test.dart b/test/canonical_json_test.dart index ca652f53..8787dce0 100644 --- a/test/canonical_json_test.dart +++ b/test/canonical_json_test.dart @@ -17,7 +17,7 @@ */ import 'package:canonical_json/canonical_json.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/client_test.dart b/test/client_test.dart index 14b3f35d..b218bd0c 100644 --- a/test/client_test.dart +++ b/test/client_test.dart @@ -20,12 +20,12 @@ import 'dart:async'; import 'dart:convert'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; -import 'package:famedlysdk/src/client.dart'; -import 'package:famedlysdk/src/utils/event_update.dart'; -import 'package:famedlysdk/src/utils/matrix_file.dart'; -import 'package:famedlysdk/src/utils/room_update.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:matrix/src/utils/room_update.dart'; import 'package:olm/olm.dart' as olm; import 'package:test/test.dart'; import 'package:canonical_json/canonical_json.dart'; diff --git a/test/commands_test.dart b/test/commands_test.dart index d2b98d76..a5997a29 100644 --- a/test/commands_test.dart +++ b/test/commands_test.dart @@ -19,7 +19,7 @@ import 'dart:convert'; import 'package:test/test.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'fake_client.dart'; import 'fake_matrix_api.dart'; diff --git a/test/database_api_test.dart b/test/database_api_test.dart index 1657144b..fccabd24 100644 --- a/test/database_api_test.dart +++ b/test/database_api_test.dart @@ -17,7 +17,7 @@ */ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:moor/moor.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/device_keys_list_test.dart b/test/device_keys_list_test.dart index c9cd41c7..d6583bf3 100644 --- a/test/device_keys_list_test.dart +++ b/test/device_keys_list_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/bootstrap_test.dart b/test/encryption/bootstrap_test.dart index 21c3311a..b62f64fc 100644 --- a/test/encryption/bootstrap_test.dart +++ b/test/encryption/bootstrap_test.dart @@ -19,8 +19,8 @@ import 'dart:async'; import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/encryption.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/cross_signing_test.dart b/test/encryption/cross_signing_test.dart index cb51cf2b..e6ec4f80 100644 --- a/test/encryption/cross_signing_test.dart +++ b/test/encryption/cross_signing_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/encrypt_decrypt_room_message_test.dart b/test/encryption/encrypt_decrypt_room_message_test.dart index b4042ea7..357a0352 100644 --- a/test/encryption/encrypt_decrypt_room_message_test.dart +++ b/test/encryption/encrypt_decrypt_room_message_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/encrypt_decrypt_to_device_test.dart b/test/encryption/encrypt_decrypt_to_device_test.dart index 65f6e142..9555440f 100644 --- a/test/encryption/encrypt_decrypt_to_device_test.dart +++ b/test/encryption/encrypt_decrypt_to_device_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_manager_test.dart b/test/encryption/key_manager_test.dart index b12c5008..73a26c56 100644 --- a/test/encryption/key_manager_test.dart +++ b/test/encryption/key_manager_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_request_test.dart b/test/encryption/key_request_test.dart index fd111742..b2a5e575 100644 --- a/test/encryption/key_request_test.dart +++ b/test/encryption/key_request_test.dart @@ -17,7 +17,7 @@ */ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/key_verification_test.dart b/test/encryption/key_verification_test.dart index 1f0ad196..4b57ba62 100644 --- a/test/encryption/key_verification_test.dart +++ b/test/encryption/key_verification_test.dart @@ -18,8 +18,8 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/encryption.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/olm_manager_test.dart b/test/encryption/olm_manager_test.dart index 1349ea72..36ace7f2 100644 --- a/test/encryption/olm_manager_test.dart +++ b/test/encryption/olm_manager_test.dart @@ -17,11 +17,11 @@ */ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; -import 'package:famedlysdk/encryption/utils/json_signature_check_extension.dart'; +import 'package:matrix/encryption/utils/json_signature_check_extension.dart'; import '../fake_client.dart'; import '../fake_matrix_api.dart'; diff --git a/test/encryption/online_key_backup_test.dart b/test/encryption/online_key_backup_test.dart index 3b53c7e1..1210ea12 100644 --- a/test/encryption/online_key_backup_test.dart +++ b/test/encryption/online_key_backup_test.dart @@ -18,7 +18,7 @@ import 'dart:convert'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/encryption/ssss_test.dart b/test/encryption/ssss_test.dart index d16728e7..7586329d 100644 --- a/test/encryption/ssss_test.dart +++ b/test/encryption/ssss_test.dart @@ -20,8 +20,8 @@ import 'dart:typed_data'; import 'dart:convert'; import 'dart:math'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/encryption.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/event_test.dart b/test/event_test.dart index e9ee7fa8..657c6104 100644 --- a/test/event_test.dart +++ b/test/event_test.dart @@ -19,9 +19,9 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; -import 'package:famedlysdk/src/event.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/encryption.dart'; +import 'package:matrix/src/event.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/fake_client.dart b/test/fake_client.dart index 9aadb898..0a13c708 100644 --- a/test/fake_client.dart +++ b/test/fake_client.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'fake_matrix_api.dart'; import 'fake_database.dart'; diff --git a/test/fake_database_native.dart b/test/fake_database_native.dart index 0bfc07e2..564b8065 100644 --- a/test/fake_database_native.dart +++ b/test/fake_database_native.dart @@ -19,8 +19,8 @@ import 'dart:io'; import 'dart:math'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/database/hive_database.dart'; +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:moor/moor.dart'; diff --git a/test/fake_database_web.dart b/test/fake_database_web.dart index d26aed5d..ed3d610f 100644 --- a/test/fake_database_web.dart +++ b/test/fake_database_web.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:moor/moor.dart'; import 'package:moor/moor_web.dart' as moor; diff --git a/test/fake_matrix_api.dart b/test/fake_matrix_api.dart index da340f24..f3fb3cdf 100644 --- a/test/fake_matrix_api.dart +++ b/test/fake_matrix_api.dart @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart' as sdk; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart' as sdk; +import 'package:matrix/matrix.dart'; import 'dart:convert'; import 'dart:core'; diff --git a/test/fake_matrix_localizations.dart b/test/fake_matrix_localizations.dart index 5f8324a9..cbc2c157 100644 --- a/test/fake_matrix_localizations.dart +++ b/test/fake_matrix_localizations.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; class FakeMatrixLocalizations extends MatrixLocalizations { @override diff --git a/test/markdown_test.dart b/test/markdown_test.dart index 265ae0c1..5ff73a96 100644 --- a/test/markdown_test.dart +++ b/test/markdown_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/src/utils/markdown.dart'; +import 'package:matrix/src/utils/markdown.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/matrix_api/map_copy_extension_test.dart b/test/matrix_api/map_copy_extension_test.dart index 1e8edcdb..e7027952 100644 --- a/test/matrix_api/map_copy_extension_test.dart +++ b/test/matrix_api/map_copy_extension_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/src/utils/map_copy_extension.dart'; +import 'package:matrix/src/utils/map_copy_extension.dart'; import 'package:test/test.dart'; void main() { diff --git a/test/matrix_database_test.dart b/test/matrix_database_test.dart index fa7150c2..f812b61a 100644 --- a/test/matrix_database_test.dart +++ b/test/matrix_database_test.dart @@ -17,7 +17,7 @@ * */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'fake_database.dart'; diff --git a/test/matrix_default_localizations.dart b/test/matrix_default_localizations.dart index e7319e1c..3ab973ff 100644 --- a/test/matrix_default_localizations.dart +++ b/test/matrix_default_localizations.dart @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; class MatrixDefaultLocalizations extends MatrixLocalizations { const MatrixDefaultLocalizations(); diff --git a/test/matrix_exception_test.dart b/test/matrix_exception_test.dart index 06300be6..79134e7a 100644 --- a/test/matrix_exception_test.dart +++ b/test/matrix_exception_test.dart @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:http/http.dart'; import 'package:test/test.dart'; diff --git a/test/matrix_file_test.dart b/test/matrix_file_test.dart index f58edf6c..6b509461 100644 --- a/test/matrix_file_test.dart +++ b/test/matrix_file_test.dart @@ -18,7 +18,7 @@ import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'package:olm/olm.dart' as olm; diff --git a/test/matrix_id_string_extension_test.dart b/test/matrix_id_string_extension_test.dart index 69575ba1..05f93b57 100644 --- a/test/matrix_id_string_extension_test.dart +++ b/test/matrix_id_string_extension_test.dart @@ -17,7 +17,7 @@ */ import 'package:test/test.dart'; -import 'package:famedlysdk/src/utils/matrix_id_string_extension.dart'; +import 'package:matrix/src/utils/matrix_id_string_extension.dart'; void main() { /// All Tests related to the ChatTime diff --git a/test/matrix_localizations_test.dart b/test/matrix_localizations_test.dart index fd80113a..6f92b372 100644 --- a/test/matrix_localizations_test.dart +++ b/test/matrix_localizations_test.dart @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; import 'matrix_default_localizations.dart'; diff --git a/test/mxc_uri_extension_test.dart b/test/mxc_uri_extension_test.dart index 9ad00537..253cc59c 100644 --- a/test/mxc_uri_extension_test.dart +++ b/test/mxc_uri_extension_test.dart @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; -import 'package:famedlysdk/src/client.dart'; -import 'package:famedlysdk/src/utils/uri_extension.dart'; +import 'package:matrix/src/client.dart'; +import 'package:matrix/src/utils/uri_extension.dart'; import 'fake_matrix_api.dart'; diff --git a/test/room_test.dart b/test/room_test.dart index a946fa54..68ec4238 100644 --- a/test/room_test.dart +++ b/test/room_test.dart @@ -19,14 +19,14 @@ import 'dart:convert'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/client.dart'; -import 'package:famedlysdk/src/database/database.dart' +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/client.dart'; +import 'package:matrix/src/database/database.dart' show DbRoom, DbRoomAccountData, DbRoomState, getRoomFromTableRow; -import 'package:famedlysdk/src/event.dart'; -import 'package:famedlysdk/src/room.dart'; -import 'package:famedlysdk/src/user.dart'; -import 'package:famedlysdk/src/utils/matrix_file.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'; diff --git a/test/sync_filter_test.dart b/test/sync_filter_test.dart index 377cf245..e1a8f92e 100644 --- a/test/sync_filter_test.dart +++ b/test/sync_filter_test.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; diff --git a/test/timeline_test.dart b/test/timeline_test.dart index bc7c09f0..ab94d0e4 100644 --- a/test/timeline_test.dart +++ b/test/timeline_test.dart @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; -import 'package:famedlysdk/src/client.dart'; -import 'package:famedlysdk/src/room.dart'; -import 'package:famedlysdk/src/timeline.dart'; -import 'package:famedlysdk/src/utils/event_update.dart'; -import 'package:famedlysdk/src/utils/room_update.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:matrix/src/utils/room_update.dart'; import 'package:olm/olm.dart' as olm; import 'fake_client.dart'; diff --git a/test/uia_test.dart b/test/uia_test.dart index 5584cccc..11140ff9 100644 --- a/test/uia_test.dart +++ b/test/uia_test.dart @@ -18,7 +18,7 @@ import 'dart:async'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:test/test.dart'; diff --git a/test/user_test.dart b/test/user_test.dart index 165ecf65..f64f89dc 100644 --- a/test/user_test.dart +++ b/test/user_test.dart @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/src/event.dart'; -import 'package:famedlysdk/src/user.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/src/event.dart'; +import 'package:matrix/src/user.dart'; import 'package:test/test.dart'; diff --git a/test_driver/famedlysdk_test.dart b/test_driver/matrixsdk_test.dart similarity index 99% rename from test_driver/famedlysdk_test.dart rename to test_driver/matrixsdk_test.dart index 41740ece..3ceb8a5b 100644 --- a/test_driver/famedlysdk_test.dart +++ b/test_driver/matrixsdk_test.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import '../test/fake_database.dart'; import 'test_config.dart'; import 'package:olm/olm.dart' as olm;