diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed190149..23cf22f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ widget_test: script: [flutter test] # the basic integration test configuration testing FLOSS builds on Synapse -integration_test: +.integration_test: image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION} stage: test services: @@ -60,8 +60,8 @@ integration_test: timeout: 20m # extending the default tests to test the Google-flavored builds -integration_test_google: - extends: integration_test +.integration_test_google: + extends: .integration_test script: - git apply ./scripts/enable-android-google-services.patch - flutter pub get @@ -69,8 +69,8 @@ integration_test_google: allow_failure: true # extending the default tests to use Conduit as local homeserver -integration_test_conduit: - extends: integration_test +.integration_test_conduit: + extends: .integration_test before_script: # start AVD and keep running in background - scripts/integration-start-avd.sh & @@ -84,8 +84,8 @@ integration_test_conduit: allow_failure: true # extending the default tests to use Dendrite as local homeserver -integration_test_dendrite: - extends: integration_test +.integration_test_dendrite: + extends: .integration_test before_script: # start AVD and keep running in background - scripts/integration-start-avd.sh & @@ -98,7 +98,7 @@ integration_test_dendrite: - curl docker:8008/_matrix/static/ 2> /dev/null | grep "404 page not found" 1> /dev/null && echo "Dendrite is running!" allow_failure: true -release_mode_launches: +.release_mode_launches: image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION} stage: test script: @@ -111,8 +111,8 @@ release_mode_launches: - android timeout: 20m -release_mode_launches_google: - extends: release_mode_launches +.release_mode_launches_google: + extends: .release_mode_launches before_script: - git apply ./scripts/enable-android-google-services.patch allow_failure: true diff --git a/lib/utils/get_client_secret.dart b/lib/utils/get_client_secret.dart deleted file mode 100644 index d86cd388..00000000 --- a/lib/utils/get_client_secret.dart +++ /dev/null @@ -1,7 +0,0 @@ -import 'dart:math'; - -const _chars = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz1234567890'; -Random _rnd = Random(); - -String getClientSecret(int length) => String.fromCharCodes(Iterable.generate( - length, (_) => _chars.codeUnitAt(_rnd.nextInt(_chars.length)))); diff --git a/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart b/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart deleted file mode 100644 index e9d06794..00000000 --- a/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart +++ /dev/null @@ -1,30 +0,0 @@ -import 'package:matrix/matrix.dart'; - -extension ClientPresenceExtension on Client { - List get contactList { - final directChatsMxid = rooms - .where((r) => r.isDirectChat) - .map((r) => r.directChatMatrixID) - .toSet(); - final contactList = directChatsMxid - .map( - (mxid) => - presences[mxid] ?? - CachedPresence( - PresenceType.offline, - 0, - null, - false, - mxid ?? '', - ), - ) - .toList(); - - contactList.sort((a, b) => a.userid.compareTo(b.userid)); - contactList.sort((a, b) => ((a.lastActiveTimestamp ?? - DateTime.fromMillisecondsSinceEpoch(0)) - .compareTo( - b.lastActiveTimestamp ?? DateTime.fromMillisecondsSinceEpoch(0)))); - return contactList; - } -} diff --git a/pubspec.lock b/pubspec.lock index a82fe28a..d02ba6bf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -72,7 +72,7 @@ packages: source: hosted version: "1.1.0" async: - dependency: "direct main" + dependency: transitive description: name: async url: "https://pub.dartlang.org" @@ -648,15 +648,8 @@ packages: url: "https://gitlab.com/TheOneWithTheBraid/flutter_secure_storage_windows.git" source: git version: "1.1.2" - flutter_slidable: - dependency: "direct main" - description: - name: flutter_slidable - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.0" flutter_svg: - dependency: "direct main" + dependency: transitive description: name: flutter_svg url: "https://pub.dartlang.org" @@ -929,20 +922,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.1" - localstorage: - dependency: "direct main" - description: - name: localstorage - url: "https://pub.dartlang.org" - source: hosted - version: "4.0.0+1" - lottie: - dependency: "direct main" - description: - name: lottie - url: "https://pub.dartlang.org" - source: hosted - version: "1.2.2" macos_ui: dependency: transitive description: @@ -1789,7 +1768,7 @@ packages: source: hosted version: "0.2.0" uuid: - dependency: "direct main" + dependency: transitive description: name: uuid url: "https://pub.dartlang.org" diff --git a/pubspec.yaml b/pubspec.yaml index 30f51c33..37337d90 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -10,7 +10,6 @@ dependencies: adaptive_dialog: ^1.5.1 adaptive_theme: ^3.0.0 animations: ^2.0.2 - async: ^2.8.2 badges: ^2.0.3 blurhash_dart: ^1.1.0 callkeep: ^0.3.2 @@ -46,8 +45,6 @@ dependencies: flutter_openssl_crypto: ^0.1.0 flutter_ringtone_player: ^3.1.1 flutter_secure_storage: ^6.0.0 - flutter_slidable: ^2.0.0 - flutter_svg: ^0.22.0 flutter_typeahead: ^4.0.0 flutter_web_auth: ^0.5.0 flutter_webrtc: ^0.9.11 @@ -63,8 +60,6 @@ dependencies: just_audio: ^0.9.20 keyboard_shortcuts: ^0.1.4 latlong2: ^0.8.1 - localstorage: ^4.0.0+1 - lottie: ^1.2.2 matrix: ^0.15.2 matrix_homeserver_recommendations: ^0.3.0 matrix_link_text: ^1.0.2 @@ -89,7 +84,6 @@ dependencies: unifiedpush: ^4.0.0 universal_html: ^2.0.8 url_launcher: ^6.0.20 - uuid: ^3.0.6 vibration: ^1.7.4-nullsafety.0 video_compress: ^3.1.1 video_player: ^2.2.18