diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart index d6cd819e..89c2bcea 100644 --- a/lib/pages/chat/chat.dart +++ b/lib/pages/chat/chat.dart @@ -67,16 +67,15 @@ class ChatController extends State { void onDragExited(_) => setState(() => dragging = false); void onDragDone(DropDoneDetails details) async { setState(() => dragging = false); - for (final url in details.urls) { - final file = File.fromUri(url); - final bytes = await file.readAsBytes(); + for (final xfile in details.files) { + final bytes = await xfile.readAsBytes(); await showDialog( context: context, useRootNavigator: false, builder: (c) => SendFileDialog( file: MatrixFile( bytes: bytes, - name: file.path.split('/').last, + name: xfile.name, ).detectFileType, room: room, ), diff --git a/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart b/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart index b174a06f..3c74812e 100644 --- a/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart +++ b/lib/utils/matrix_sdk_extensions.dart/fluffybox_database.dart @@ -7,6 +7,7 @@ import 'dart:typed_data'; import 'package:flutter/foundation.dart' hide Key; import 'package:flutter/services.dart'; +import 'package:fluffybox/hive.dart' as fluffybox; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:hive_flutter/hive_flutter.dart'; import 'package:matrix/matrix.dart'; @@ -19,7 +20,7 @@ class FlutterFluffyBoxDatabase extends FluffyBoxDatabase { FlutterFluffyBoxDatabase( String name, String path, { - HiveCipher? key, + fluffybox.HiveCipher? key, }) : super( name, path, @@ -30,7 +31,7 @@ class FlutterFluffyBoxDatabase extends FluffyBoxDatabase { static Future databaseBuilder(Client client) async { Logs().d('Open FluffyBox...'); - HiveAesCipher? hiverCipher; + fluffybox.HiveAesCipher? hiverCipher; try { // Workaround for secure storage is calling Platform.operatingSystem on web if (kIsWeb) throw MissingPluginException(); @@ -50,7 +51,7 @@ class FlutterFluffyBoxDatabase extends FluffyBoxDatabase { final rawEncryptionKey = await secureStorage.read(key: _cipherStorageKey); if (rawEncryptionKey == null) throw MissingPluginException(); - hiverCipher = HiveAesCipher(base64Url.decode(rawEncryptionKey)); + hiverCipher = fluffybox.HiveAesCipher(base64Url.decode(rawEncryptionKey)); } on MissingPluginException catch (_) { Logs().i('FluffyBox encryption is not supported on this platform'); } catch (_) { diff --git a/pubspec.lock b/pubspec.lock index cb5b7cf1..fd217790 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -224,7 +224,7 @@ packages: name: dart_style url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.2.1" dbus: dependency: transitive description: @@ -238,7 +238,7 @@ packages: name: desktop_drop url: "https://pub.dartlang.org" source: hosted - version: "0.2.0" + version: "0.3.0" desktop_notifications: dependency: "direct main" description: @@ -301,7 +301,7 @@ packages: name: file_picker url: "https://pub.dartlang.org" source: hosted - version: "4.2.7" + version: "4.3.0" file_picker_cross: dependency: "direct main" description: @@ -364,7 +364,7 @@ packages: name: fluffybox url: "https://pub.dartlang.org" source: hosted - version: "0.3.5" + version: "0.4.1" flutter: dependency: "direct main" description: flutter @@ -650,7 +650,7 @@ packages: name: hive url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" hive_flutter: dependency: "direct main" description: @@ -818,7 +818,7 @@ packages: name: matrix url: "https://pub.dartlang.org" source: hosted - version: "0.7.0" + version: "0.7.1" matrix_api_lite: dependency: transitive description: @@ -895,7 +895,7 @@ packages: name: open_noti_settings url: "https://pub.dartlang.org" source: hosted - version: "0.3.0" + version: "0.4.0" package_config: dependency: transitive description: @@ -986,7 +986,7 @@ packages: name: path_provider_android url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" path_provider_ios: dependency: transitive description: @@ -1224,7 +1224,7 @@ packages: name: sentry url: "https://pub.dartlang.org" source: hosted - version: "6.2.1" + version: "6.2.2" share: dependency: "direct main" description: @@ -1607,14 +1607,14 @@ packages: name: video_player_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.2.0" + version: "5.0.0" video_player_web: dependency: transitive description: name: video_player_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.4" + version: "2.0.5" vm_service: dependency: transitive description: @@ -1698,7 +1698,7 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.3.1" + version: "2.3.3" wkt_parser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 9410ce1a..3954e781 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,7 @@ dependencies: blurhash_dart: ^1.1.0 cached_network_image: ^3.1.0 cupertino_icons: any - desktop_drop: ^0.2.0 + desktop_drop: ^0.3.0 desktop_notifications: ^0.6.1 email_validator: ^2.0.1 emoji_picker_flutter: ^1.0.7 @@ -51,7 +51,7 @@ dependencies: lottie: ^1.2.1 matrix: ^0.7.0 matrix_link_text: ^1.0.2 - open_noti_settings: ^0.3.0 + open_noti_settings: ^0.4.0 package_info_plus: ^1.2.1 path_provider: ^2.0.5 permission_handler: ^8.3.0 diff --git a/scripts/enable-android-google-services.patch b/scripts/enable-android-google-services.patch index c5680877..aefa2ecb 100644 --- a/scripts/enable-android-google-services.patch +++ b/scripts/enable-android-google-services.patch @@ -99,5 +99,5 @@ index e1670a32..7e3238b0 100644 + fcm_shared_isolate: + git: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git file_picker_cross: ^4.5.0 + flick_video_player: ^0.3.1 flutter: - sdk: flutter