refactor: Use import sorter and ci templates

.gitlab-ci.yml

@@ -1,8 +1,7 @@
-stages:
-  - coverage
-  - builddocs
-  - deploy
-  - publish
+include:
+  - project: "famedly/company/frontend/ci-templates"
+    ref: main
+    file: "/all.yml"
 
 workflow:
   rules:
@@ -16,7 +15,7 @@ variables:
 coverage:
   tags:
     - linux
-  stage: coverage
+  stage: test
   image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter-linux/stable:${FLUTTER_IMAGE_TAG}
   dependencies: []
   script:
@@ -31,7 +30,7 @@ coverage:
 coverage_without_olm:
   tags:
     - linux
-  stage: coverage
+  stage: test
   image: dart
   dependencies: []
   script:
@@ -41,7 +40,7 @@ coverage_without_olm:
 e2ee_test:
   tags:
     - linux
-  stage: coverage
+  stage: test
   image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/flutter-linux/stable:${FLUTTER_IMAGE_TAG}
   dependencies: []
   script:
@@ -51,35 +50,8 @@ e2ee_test:
   timeout: 16m
   resource_group: e2ee_test
 
-code_analyze:
-  tags:
-    - docker
-  stage: coverage
-  image: dart
-  dependencies: []
-  script:
-    - dart pub get
-    - dart format lib/ test/ test_driver/ --set-exit-if-changed
-    - dart analyze
-
-code_quality:
-  tags:
-    - docker
-  stage: coverage
-  image: dart
-  before_script:
-    - dart pub global activate dart_code_metrics
-  script:
-    - dart pub global run dart_code_metrics:metrics analyze lib -r gitlab > code-quality-report.json
-  artifacts:
-    reports:
-      codequality: code-quality-report.json
-    # also create an actual artifact for inspection purposes
-    paths:
-      - code-quality-report.json
-
 dry-run:
-  stage: publish
+  stage: deploy
   image: dart
   script:
     - rm -rf ./docs
@@ -88,7 +60,7 @@ dry-run:
 
 
 pub-dev:
-  stage: publish
+  stage: deploy
   image: dart
   dependencies: [
     dry-run

lib/encryption/cross_signing.dart

@@ -18,9 +18,9 @@
 
 import 'dart:typed_data';
 
-import 'package:matrix/encryption/utils/base64_unpadded.dart';
 import 'package:olm/olm.dart' as olm;
 
+import 'package:matrix/encryption/utils/base64_unpadded.dart';
 import '../matrix.dart';
 import 'encryption.dart';
 import 'ssss.dart';

lib/encryption/encryption.dart

@@ -16,8 +16,8 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'dart:convert';
 import 'dart:async';
+import 'dart:convert';
 
 import 'package:olm/olm.dart' as olm;
 

lib/encryption/key_manager.dart

@@ -19,16 +19,16 @@
 import 'dart:async';
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
+import 'package:olm/olm.dart' as olm;
+
 import 'package:matrix/encryption/utils/base64_unpadded.dart';
 import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
-import 'package:olm/olm.dart' as olm;
-import 'package:collection/collection.dart';
-
+import '../matrix.dart';
+import '../src/utils/run_in_root.dart';
 import './encryption.dart';
 import './utils/outbound_group_session.dart';
 import './utils/session_key.dart';
-import '../matrix.dart';
-import '../src/utils/run_in_root.dart';
 
 const megolmKey = EventTypes.MegolmBackup;
 

lib/encryption/olm_manager.dart

@@ -21,9 +21,9 @@ import 'dart:convert';
 import 'package:async/async.dart';
 import 'package:canonical_json/canonical_json.dart';
 import 'package:collection/collection.dart';
-import 'package:matrix/matrix.dart';
 import 'package:olm/olm.dart' as olm;
 
+import 'package:matrix/matrix.dart';
 import '../encryption/utils/json_signature_check_extension.dart';
 import '../src/utils/run_in_root.dart';
 import 'encryption.dart';

lib/encryption/ssss.dart

@@ -22,10 +22,10 @@ import 'dart:core';
 import 'dart:typed_data';
 
 import 'package:base58check/base58.dart';
-import 'package:crypto/crypto.dart';
 import 'package:collection/collection.dart';
-import 'package:matrix/encryption/utils/base64_unpadded.dart';
+import 'package:crypto/crypto.dart';
 
+import 'package:matrix/encryption/utils/base64_unpadded.dart';
 import '../matrix.dart';
 import '../src/utils/crypto/crypto.dart' as uc;
 import '../src/utils/run_in_root.dart';

lib/encryption/utils/bootstrap.dart

@@ -22,10 +22,10 @@ import 'dart:typed_data';
 import 'package:canonical_json/canonical_json.dart';
 import 'package:olm/olm.dart' as olm;
 
-import '../encryption.dart';
-import '../ssss.dart';
-import '../key_manager.dart';
 import '../../matrix.dart';
+import '../encryption.dart';
+import '../key_manager.dart';
+import '../ssss.dart';
 import 'base64_unpadded.dart';
 
 enum BootstrapState {

lib/encryption/utils/session_key.dart

@@ -16,10 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
 import 'package:matrix_api_lite/src/utils/filter_map_extension.dart';
 import 'package:olm/olm.dart' as olm;
 
+import 'package:matrix/encryption/utils/stored_inbound_group_session.dart';
 import '../../matrix.dart';
 
 class SessionKey {

lib/msc_extensions/msc_2835_uia_login/msc_2835_uia_login.dart

@@ -3,6 +3,7 @@ library msc_2835_uia_login;
 import 'dart:convert';
 
 import 'package:http/http.dart' hide Client;
+
 import 'package:matrix/matrix.dart';
 
 extension UiaLogin on Client {

lib/src/client.dart

@@ -21,19 +21,19 @@ import 'dart:convert';
 import 'dart:core';
 import 'dart:typed_data';
 
+import 'package:collection/collection.dart' show IterableExtension;
 import 'package:http/http.dart' as http;
+import 'package:mime/mime.dart';
+import 'package:olm/olm.dart' as olm;
+import 'package:random_string/random_string.dart';
+
 import 'package:matrix/src/utils/cached_stream_controller.dart';
 import 'package:matrix/src/utils/run_in_root.dart';
 import 'package:matrix/src/utils/sync_update_item_count.dart';
-import 'package:mime/mime.dart';
-import 'package:olm/olm.dart' as olm;
-import 'package:collection/collection.dart' show IterableExtension;
-import 'package:random_string/random_string.dart';
-
 import '../encryption.dart';
 import '../matrix.dart';
-import 'utils/run_benchmarked.dart';
 import 'utils/multilock.dart';
+import 'utils/run_benchmarked.dart';
 
 typedef RoomSorter = int Function(Room a, Room b);
 

lib/src/database/database_api.dart

@@ -23,7 +23,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/src/utils/queued_to_device_event.dart';
-
 import '../../matrix.dart';
 
 abstract class DatabaseApi {

lib/src/database/fluffybox_database.dart

@@ -23,6 +23,7 @@ import 'dart:typed_data';
 
 import 'package:fluffybox/fluffybox.dart';
 import 'package:fluffybox/hive.dart' show HiveCipher;
+
 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';

lib/src/database/hive_collections_database.dart

@@ -22,6 +22,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:hive/hive.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';

lib/src/database/hive_database.dart

@@ -22,6 +22,7 @@ import 'dart:math';
 import 'dart:typed_data';
 
 import 'package:hive/hive.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';

lib/src/event.dart

@@ -22,8 +22,8 @@ import 'dart:typed_data';
 import 'package:collection/collection.dart';
 import 'package:html/parser.dart';
 import 'package:http/http.dart' as http;
-import 'package:matrix/src/utils/file_send_request_credentials.dart';
 
+import 'package:matrix/src/utils/file_send_request_credentials.dart';
 import '../matrix.dart';
 import 'utils/event_localizations.dart';
 import 'utils/html_to_text.dart';

lib/src/room.dart

@@ -22,12 +22,12 @@ import 'dart:typed_data';
 
 import 'package:collection/collection.dart';
 import 'package:html_unescape/html_unescape.dart';
+
 import 'package:matrix/src/models/timeline_chunk.dart';
+import 'package:matrix/src/utils/cached_stream_controller.dart';
 import 'package:matrix/src/utils/crypto/crypto.dart';
 import 'package:matrix/src/utils/file_send_request_credentials.dart';
-import 'package:matrix/src/utils/cached_stream_controller.dart';
 import 'package:matrix/src/utils/space_child.dart';
-
 import '../matrix.dart';
 import 'utils/markdown.dart';
 import 'utils/marked_unread.dart';

lib/src/utils/crypto/crypto.dart

@@ -18,8 +18,8 @@
 
 export 'native.dart' if (dart.library.js) 'js.dart';
 
-import 'dart:typed_data';
 import 'dart:math';
+import 'dart:typed_data';
 
 Uint8List secureRandomBytes(int len) {
   final rng = Random.secure();

lib/src/utils/crypto/encrypted_file.dart

@@ -15,11 +15,11 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import 'dart:typed_data';
+
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:matrix/encryption/utils/base64_unpadded.dart';
-
 import 'crypto.dart';
 
 class EncryptedFile {

lib/src/utils/crypto/ffi.dart

@@ -15,6 +15,7 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import 'dart:ffi';
 import 'dart:io';
 

lib/src/utils/crypto/js.dart

@@ -3,8 +3,8 @@
 
 import 'dart:typed_data';
 
-import 'subtle.dart';
 import 'subtle.dart' as subtle;
+import 'subtle.dart';
 
 abstract class Hash {
   Hash._(this.name);

lib/src/utils/crypto/native.dart

@@ -1,6 +1,7 @@
 import 'dart:async';
-import 'dart:typed_data';
 import 'dart:ffi';
+import 'dart:typed_data';
+
 import 'package:ffi/ffi.dart';
 
 import 'ffi.dart';

lib/src/utils/crypto/subtle.dart

@@ -4,11 +4,12 @@
 @JS()
 library subtle;
 
-import 'package:js/js.dart';
 import 'dart:async';
 import 'dart:js_util';
 import 'dart:typed_data';
 
+import 'package:js/js.dart';
+
 @JS()
 @anonymous
 class Pbkdf2Params {

lib/src/utils/device_keys_list.dart

@@ -20,9 +20,9 @@ import 'dart:convert';
 
 import 'package:canonical_json/canonical_json.dart';
 import 'package:collection/collection.dart' show IterableExtension;
-import 'package:matrix/matrix.dart';
 import 'package:olm/olm.dart' as olm;
 
+import 'package:matrix/matrix.dart';
 import '../../encryption.dart';
 
 enum UserVerifiedStatus { verified, unknown, unknownDevice }

lib/src/utils/html_to_text.dart

@@ -17,9 +17,8 @@
  */
 
 import 'package:collection/collection.dart';
-
-import 'package:html/parser.dart';
 import 'package:html/dom.dart';
+import 'package:html/parser.dart';
 import 'package:html_unescape/html_unescape.dart';
 
 class HtmlToText {

lib/src/utils/image_pack_extension.dart

@@ -16,8 +16,8 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:slugify/slugify.dart';
 import 'package:matrix_api_lite/matrix_api_lite.dart';
+import 'package:slugify/slugify.dart';
 
 import '../room.dart';
 

lib/src/utils/markdown.dart

@@ -16,9 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:markdown/markdown.dart';
 import 'dart:convert';
 
+import 'package:markdown/markdown.dart';
+
 const htmlAttrEscape = HtmlEscape(HtmlEscapeMode.attribute);
 
 class LinebreakSyntax extends InlineSyntax {

lib/src/utils/matrix_default_localizations.dart

@@ -15,6 +15,7 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import 'package:matrix/matrix.dart';
 
 class MatrixDefaultLocalizations extends MatrixLocalizations {

lib/src/utils/multilock.dart

@@ -15,6 +15,7 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import 'dart:async';
 
 /// Lock management class. It allows to lock and unlock multiple keys at once. The keys have

lib/src/utils/queued_to_device_event.dart

@@ -15,6 +15,7 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import 'dart:convert';
 
 class QueuedToDeviceEvent {

lib/src/voip/call.dart

@@ -19,9 +19,9 @@
 import 'dart:async';
 import 'dart:core';
 
-import 'package:matrix/src/utils/cached_stream_controller.dart';
 import 'package:webrtc_interface/webrtc_interface.dart';
 
+import 'package:matrix/src/utils/cached_stream_controller.dart';
 import '../../matrix.dart';
 
 /// https://github.com/matrix-org/matrix-doc/pull/2746

lib/src/voip/group_call.dart

@@ -19,9 +19,10 @@
 import 'dart:async';
 import 'dart:core';
 
+import 'package:webrtc_interface/webrtc_interface.dart';
+
 import 'package:matrix/matrix.dart';
 import 'package:matrix/src/utils/cached_stream_controller.dart';
-import 'package:webrtc_interface/webrtc_interface.dart';
 
 /// TODO(@duan): Need to add voice activity detection mechanism
 /// const int SPEAKING_THRESHOLD = -60; // dB

lib/src/voip/voip.dart

@@ -1,9 +1,9 @@
 import 'dart:core';
 
-import 'package:matrix/src/utils/cached_stream_controller.dart';
-import 'package:webrtc_interface/webrtc_interface.dart';
 import 'package:sdp_transform/sdp_transform.dart' as sdp_transform;
+import 'package:webrtc_interface/webrtc_interface.dart';
 
+import 'package:matrix/src/utils/cached_stream_controller.dart';
 import '../../matrix.dart';
 
 /// Delegate WebRTC basic functionality.

pubspec.yaml

@@ -32,6 +32,7 @@ dependencies:
   fluffybox: ^0.4.3
 
 dev_dependencies:
+  import_sorter: ^4.6.0
   dart_code_metrics: ^4.10.1
   pedantic: ^1.11.0
   test: ^1.15.7

test/canonical_json_test.dart

@@ -17,9 +17,10 @@
  */
 
 import 'package:canonical_json/canonical_json.dart';
-import 'package:matrix/matrix.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 void main() {
   /// All Tests related to the ChatTime
   group('Canonical Json', () {

test/client_test.dart

@@ -20,12 +20,11 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:matrix/matrix.dart';
-
+import 'package:canonical_json/canonical_json.dart';
 import 'package:olm/olm.dart' as olm;
 import 'package:test/test.dart';
-import 'package:canonical_json/canonical_json.dart';
 
+import 'package:matrix/matrix.dart';
 import 'fake_client.dart';
 import 'fake_database.dart';
 import 'fake_matrix_api.dart';

test/commands_test.dart

@@ -18,8 +18,9 @@
 
 import 'dart:convert';
 
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
+
 import 'package:matrix/matrix.dart';
 import 'fake_client.dart';
 import 'fake_matrix_api.dart';

test/database_api_test.dart

@@ -15,14 +15,15 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
+import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
-import 'dart:async';
+
+import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
 import 'package:matrix/matrix.dart';
-import 'package:test/test.dart';
-import 'package:olm/olm.dart' as olm;
-
 import 'fake_database.dart';
 
 void main() {

test/device_keys_list_test.dart

@@ -18,11 +18,10 @@
 
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import './fake_client.dart';
 import './fake_matrix_api.dart';
 

test/encryption/bootstrap_test.dart

@@ -19,12 +19,11 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-import 'package:matrix/encryption.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/encryption.dart';
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 
 void main() {

test/encryption/cross_signing_test.dart

@@ -18,11 +18,10 @@
 
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 

test/encryption/encrypt_decrypt_room_message_test.dart

@@ -16,11 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 
 void main() {

test/encryption/encrypt_decrypt_to_device_test.dart

@@ -16,11 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_database.dart';
 import '../fake_matrix_api.dart';

test/encryption/key_manager_test.dart

@@ -18,11 +18,10 @@
 
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 

test/encryption/key_request_test.dart

@@ -17,11 +17,11 @@
  */
 
 import 'dart:convert';
-import 'package:matrix/matrix.dart';
 
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 

test/encryption/key_verification_test.dart

@@ -19,12 +19,11 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-import 'package:matrix/encryption.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/encryption.dart';
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_database.dart';
 import '../fake_matrix_api.dart';

test/encryption/olm_manager_test.dart

@@ -17,12 +17,12 @@
  */
 
 import 'dart:convert';
-import 'package:matrix/matrix.dart';
 
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
-import 'package:matrix/encryption/utils/json_signature_check_extension.dart';
+import 'package:test/test.dart';
 
+import 'package:matrix/encryption/utils/json_signature_check_extension.dart';
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 
@@ -92,7 +92,7 @@ void main() {
       if (!olmEnabled) return;
 
       FakeMatrixApi.calledEndpoints.clear();
-      client.encryption!.olmManager
+      await client.encryption!.olmManager
           .handleDeviceOneTimeKeysCount({'signed_curve25519': 20}, null);
       await FakeMatrixApi.firstWhereValue('/client/v3/keys/upload');
       expect(
@@ -100,7 +100,7 @@ void main() {
           true);
 
       FakeMatrixApi.calledEndpoints.clear();
-      client.encryption!.olmManager
+      await client.encryption!.olmManager
           .handleDeviceOneTimeKeysCount({'signed_curve25519': 70}, null);
       await FakeMatrixApi.firstWhereValue('/client/v3/keys/upload')
           .timeout(Duration(milliseconds: 50), onTimeout: () => '');
@@ -109,7 +109,8 @@ void main() {
           false);
 
       FakeMatrixApi.calledEndpoints.clear();
-      client.encryption!.olmManager.handleDeviceOneTimeKeysCount(null, []);
+      await client.encryption!.olmManager
+          .handleDeviceOneTimeKeysCount(null, []);
       await FakeMatrixApi.firstWhereValue('/client/v3/keys/upload');
       expect(
           FakeMatrixApi.calledEndpoints.containsKey('/client/v3/keys/upload'),
@@ -117,7 +118,7 @@ void main() {
 
       // this will upload keys because we assume the key count is 0, if the server doesn't send one
       FakeMatrixApi.calledEndpoints.clear();
-      client.encryption!.olmManager
+      await client.encryption!.olmManager
           .handleDeviceOneTimeKeysCount(null, ['signed_curve25519']);
       await FakeMatrixApi.firstWhereValue('/client/v3/keys/upload');
       expect(

test/encryption/online_key_backup_test.dart

@@ -18,11 +18,10 @@
 
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 

test/encryption/ssss_test.dart

@@ -16,16 +16,15 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'dart:typed_data';
 import 'dart:convert';
 import 'dart:math';
+import 'dart:typed_data';
 
-import 'package:matrix/matrix.dart';
-import 'package:matrix/encryption.dart';
-
-import 'package:test/test.dart';
 import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
 
+import 'package:matrix/encryption.dart';
+import 'package:matrix/matrix.dart';
 import '../fake_client.dart';
 import '../fake_matrix_api.dart';
 

test/encryption/utils_test.dart

@@ -18,9 +18,10 @@
 
 import 'dart:convert';
 
+import 'package:test/test.dart';
+
 import 'package:matrix/encryption/utils/base64_unpadded.dart';
 import 'package:matrix/matrix.dart';
-import 'package:test/test.dart';
 
 void main() {
   group('Utils', () {

test/event_test.dart

@@ -19,12 +19,12 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:matrix/encryption.dart';
-import 'package:matrix/matrix.dart';
-import 'package:matrix/src/models/timeline_chunk.dart';
 import 'package:olm/olm.dart' as olm;
 import 'package:test/test.dart';
 
+import 'package:matrix/encryption.dart';
+import 'package:matrix/matrix.dart';
+import 'package:matrix/src/models/timeline_chunk.dart';
 import 'fake_client.dart';
 import 'fake_matrix_api.dart';
 

test/fake_client.dart

@@ -17,9 +17,8 @@
  */
 
 import 'package:matrix/matrix.dart';
-
-import 'fake_matrix_api.dart';
 import 'fake_database.dart';
+import 'fake_matrix_api.dart';
 
 const ssssPassphrase = 'nae7ahDiequ7ohniufah3ieS2je1thohX4xeeka7aixohsho9O';
 const ssssKey = 'EsT9 RzbW VhPW yqNp cC7j ViiW 5TZB LuY4 ryyv 9guN Ysmr WDPH';

test/fake_database.dart

@@ -19,10 +19,11 @@
 import 'dart:io';
 import 'dart:math';
 
-import 'package:matrix/matrix.dart';
 import 'package:file/memory.dart';
 import 'package:hive/hive.dart';
 
+import 'package:matrix/matrix.dart';
+
 Future<DatabaseApi> getDatabase(Client? _) => getHiveCollectionsDatabase(_);
 
 bool hiveInitialized = false;

test/fake_matrix_api.dart

@@ -22,6 +22,7 @@ import 'dart:core';
 import 'dart:math';
 
 import 'package:http/http.dart';
+
 import 'package:matrix/matrix.dart' as sdk;
 import 'package:matrix/matrix.dart';
 

test/html_to_text_test.dart

@@ -16,9 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/src/utils/html_to_text.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/src/utils/html_to_text.dart';
+
 void main() {
   group('htmlToText', () {
     final testMap = <String, String>{

test/image_pack_test.dart

@@ -17,6 +17,7 @@
  */
 
 import 'package:test/test.dart';
+
 import 'package:matrix/matrix.dart';
 import 'fake_client.dart';
 

test/markdown_test.dart

@@ -16,9 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/src/utils/markdown.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/src/utils/markdown.dart';
+
 void main() {
   group('markdown', () {
     final emotePacks = {

test/matrix_api/map_copy_extension_test.dart

@@ -16,9 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/src/utils/map_copy_extension.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/src/utils/map_copy_extension.dart';
+
 void main() {
   group('Map-copy-extension', () {
     test('it should work', () {

test/matrix_database_test.dart

@@ -17,9 +17,9 @@
  *
  */
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
+
+import 'package:matrix/matrix.dart';
 import 'fake_database.dart';
 
 void main() {

test/matrix_exception_test.dart

@@ -15,11 +15,12 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import 'package:matrix/matrix.dart';
-import 'package:http/http.dart';
 
+import 'package:http/http.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 void main() {
   /// All Tests related to device keys
   group('Matrix Exception', () {

test/matrix_file_test.dart

@@ -18,11 +18,11 @@
 
 import 'dart:typed_data';
 
-import 'package:matrix/matrix.dart';
-
-import 'package:test/test.dart';
-import 'package:olm/olm.dart' as olm;
 import 'package:http/http.dart' as http;
+import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
+
+import 'package:matrix/matrix.dart';
 
 void main() {
   /// All Tests related to device keys

test/matrix_id_string_extension_test.dart

@@ -17,6 +17,7 @@
  */
 
 import 'package:test/test.dart';
+
 import 'package:matrix/src/utils/matrix_id_string_extension.dart';
 
 void main() {

test/matrix_localizations_test.dart

@@ -15,9 +15,11 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-import 'package:matrix/matrix.dart';
+
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 void main() {
   /// All Tests related to device keys
   group('Matrix Localizations', () {

test/multilock_test.dart

@@ -16,9 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/src/utils/multilock.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/src/utils/multilock.dart';
+
 void main() {
   group('lock', () {
     final lock = MultiLock<String>();

test/mxc_uri_extension_test.dart

@@ -16,10 +16,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import 'fake_matrix_api.dart';
 
 void main() {

test/push_notification.dart

@@ -1,8 +1,9 @@
 import 'dart:convert';
 
-import 'package:matrix/matrix.dart';
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 void main() {
   group('Push Notification', () {
     Logs().level = Level.error;

test/room_test.dart

@@ -19,10 +19,9 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import 'fake_client.dart';
 import 'fake_matrix_api.dart';
 

test/sync_filter_test.dart

@@ -16,10 +16,10 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 const updates = {
   'empty': {
     'next_batch': 'blah',

test/timeline_context_test.dart

@@ -18,11 +18,11 @@
 
 import 'dart:async';
 
+import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
+
 import 'package:matrix/matrix.dart';
 import 'package:matrix/src/models/timeline_chunk.dart';
-
-import 'package:test/test.dart';
-import 'package:olm/olm.dart' as olm;
 import 'fake_client.dart';
 import 'fake_matrix_api.dart';
 

test/timeline_test.dart

@@ -19,13 +19,12 @@
 import 'dart:async';
 import 'dart:math';
 
+import 'package:olm/olm.dart' as olm;
+import 'package:test/test.dart';
+
 import 'package:matrix/matrix.dart';
 import 'package:matrix/src/models/timeline_chunk.dart';
-
-import 'package:test/test.dart';
-import 'package:olm/olm.dart' as olm;
 import 'fake_client.dart';
-import 'fake_matrix_api.dart';
 
 void main() {
   group('Timeline', () {

test/uia_test.dart

@@ -18,10 +18,10 @@
 
 import 'dart:async';
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
+
 void main() {
   group('UIA', () {
     Logs().level = Level.error;

test/user_test.dart

@@ -16,10 +16,9 @@
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import 'package:matrix/matrix.dart';
-
 import 'package:test/test.dart';
 
+import 'package:matrix/matrix.dart';
 import 'fake_matrix_api.dart';
 
 void main() {

test_driver/matrixsdk_test.dart

@@ -15,11 +15,13 @@
  *   You should have received a copy of the GNU Affero General Public License
  *   along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
+
 import 'package:hive/hive.dart';
+import 'package:olm/olm.dart' as olm;
+
 import 'package:matrix/matrix.dart';
 import '../test/fake_database.dart';
 import 'test_config.dart';
-import 'package:olm/olm.dart' as olm;
 
 void main() => test();
 const String testMessage = 'Hello world';