From d2f12452fcc79a950a260ae747ab123243ebb582 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Wed, 17 Apr 2024 09:54:35 +0200 Subject: [PATCH] build: Update matrix dart sdk --- lib/pages/homeserver_picker/homeserver_picker.dart | 10 +++++----- .../flutter_hive_collections_database.dart | 1 + .../flutter_matrix_dart_sdk_database/builder.dart | 14 +++++++++++--- lib/widgets/matrix.dart | 1 - pubspec.lock | 12 ++---------- pubspec.yaml | 2 +- test/utils/test_client.dart | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/pages/homeserver_picker/homeserver_picker.dart b/lib/pages/homeserver_picker/homeserver_picker.dart index 99c7b76a5..7ffe089a2 100644 --- a/lib/pages/homeserver_picker/homeserver_picker.dart +++ b/lib/pages/homeserver_picker/homeserver_picker.dart @@ -74,7 +74,7 @@ class HomeserverPickerController extends State { if (homeserverController.text == _lastCheckedUrl) return; _lastCheckedUrl = homeserverController.text; setState(() { - error = _rawLoginTypes = loginHomeserverSummary = null; + error = _rawLoginTypes = loginFlows = null; isLoading = true; }); @@ -84,7 +84,8 @@ class HomeserverPickerController extends State { homeserver = Uri.https(homeserverController.text, ''); } final client = Matrix.of(context).getLoginClient(); - loginHomeserverSummary = await client.checkHomeserver(homeserver); + final (_, _, loginFlows) = await client.checkHomeserver(homeserver); + this.loginFlows = loginFlows; if (supportsSso) { _rawLoginTypes = await client.request( RequestType.GET, @@ -100,11 +101,10 @@ class HomeserverPickerController extends State { } } - HomeserverSummary? loginHomeserverSummary; + List? loginFlows; bool _supportsFlow(String flowType) => - loginHomeserverSummary?.loginFlows.any((flow) => flow.type == flowType) ?? - false; + loginFlows?.any((flow) => flow.type == flowType) ?? false; bool get supportsSso => _supportsFlow('m.login.sso'); diff --git a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart index 044c6203a..1fb9a4e4c 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart @@ -10,6 +10,7 @@ import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:universal_html/html.dart' as html; +// ignore: deprecated_member_use class FlutterHiveCollectionsDatabase extends HiveCollectionsDatabase { FlutterHiveCollectionsDatabase( super.name, diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart index 2679ff72a..ff6d4a8c0 100644 --- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart +++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart @@ -61,11 +61,19 @@ Future _constructDatabase(Client client) async { final cipher = await getDatabaseCipher(); - final fileStoragePath = PlatformInfos.isIOS || PlatformInfos.isMacOS + final databaseDirectory = PlatformInfos.isIOS || PlatformInfos.isMacOS ? await getLibraryDirectory() : await getApplicationSupportDirectory(); + Directory? fileStorageLocation; + try { + fileStorageLocation = await getTemporaryDirectory(); + } on MissingPlatformDirectoryException catch (_) { + Logs().w( + 'No temporary directory for file cache available on this platform.', + ); + } - final path = join(fileStoragePath.path, '${client.clientName}.sqlite'); + final path = join(databaseDirectory.path, '${client.clientName}.sqlite'); // fix dlopen for old Android await applyWorkaroundToOpenSqlCipherOnOldAndroidVersions(); @@ -105,7 +113,7 @@ Future _constructDatabase(Client client) async { client.clientName, database: database, maxFileSize: 1024 * 1024 * 10, - fileStoragePath: fileStoragePath, + fileStorageLocation: fileStorageLocation?.uri, deleteFilesAfterDuration: const Duration(days: 30), ); } diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index c57ee96d2..96eaeb00a 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -67,7 +67,6 @@ class MatrixState extends State with WidgetsBindingObserver { SharedPreferences get store => widget.store; - HomeserverSummary? loginHomeserverSummary; XFile? loginAvatar; String? loginUsername; bool? loginRegistrationSupported; diff --git a/pubspec.lock b/pubspec.lock index 24d0e5a8f..377067a2a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1210,18 +1210,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: f829dd542f354e5073e3b43aaed3adc2829e762a9ec50a3f186ffd7dddc36d5e + sha256: "36c7e13d5d7420898f2597d6f5f0611a9da8114a0fde11f41b9e54cd1140b05f" url: "https://pub.dev" source: hosted - version: "0.26.1" - matrix_api_lite: - dependency: transitive - description: - name: matrix_api_lite - sha256: "62bdd1dffb956e956863ba21e52109157502342b749e4728f4105f0c6d73a254" - url: "https://pub.dev" - source: hosted - version: "1.7.2" + version: "0.27.0" meta: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1a4d125d6..310ce4d88 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,7 +65,7 @@ dependencies: keyboard_shortcuts: ^0.1.4 latlong2: ^0.9.1 linkify: ^5.0.0 - matrix: ^0.26.1 + matrix: ^0.27.0 native_imaging: ^0.1.0 package_info_plus: ^6.0.0 pasteboard: ^0.2.0 diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index 55fccd03f..7a60ec948 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -1,8 +1,8 @@ // ignore_for_file: depend_on_referenced_packages import 'package:matrix/encryption/utils/key_verification.dart'; +import 'package:matrix/fake_matrix_api.dart'; import 'package:matrix/matrix.dart'; -import 'package:matrix_api_lite/fake_matrix_api.dart'; import 'package:fluffychat/utils/matrix_sdk_extensions/flutter_hive_collections_database.dart';