diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart index 2f7ea5107..56a599744 100644 --- a/lib/utils/localized_exception_extension.dart +++ b/lib/utils/localized_exception_extension.dart @@ -1,14 +1,13 @@ import 'dart:io'; import 'dart:math'; +import 'package:fluffychat/utils/other_party_can_receive.dart'; import 'package:flutter/material.dart'; - import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:http/http.dart'; import 'package:matrix/encryption.dart'; import 'package:matrix/matrix.dart'; -import 'package:fluffychat/utils/other_party_can_receive.dart'; import 'uia_request_manager.dart'; extension LocalizedExceptionExtension on Object { @@ -57,24 +56,6 @@ extension LocalizedExceptionExtension on Object { if (this is InvalidPassphraseException) { return L10n.of(context).wrongRecoveryKey; } - if (this is BadServerVersionsException) { - final serverVersions = (this as BadServerVersionsException) - .serverVersions - .toString() - .replaceAll('{', '"') - .replaceAll('}', '"'); - final supportedVersions = (this as BadServerVersionsException) - .supportedVersions - .toString() - .replaceAll('{', '"') - .replaceAll('}', '"'); - return L10n.of(context).badServerVersionsException( - serverVersions, - supportedVersions, - serverVersions, - supportedVersions, - ); - } if (this is BadServerLoginTypesException) { final serverVersions = (this as BadServerLoginTypesException) .serverLoginTypes diff --git a/pubspec.lock b/pubspec.lock index a373863fe..91c1d32c6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -556,26 +556,34 @@ packages: dependency: "direct main" description: name: flutter_local_notifications - sha256: "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71" + sha256: d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd url: "https://pub.dev" source: hosted - version: "17.2.3" + version: "19.0.0" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - sha256: c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af + sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5 url: "https://pub.dev" source: hosted - version: "4.0.1" + version: "6.0.0" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - sha256: "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66" + sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c" + url: "https://pub.dev" + source: hosted + version: "9.0.0" + flutter_local_notifications_windows: + dependency: transitive + description: + name: flutter_local_notifications_windows + sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "1.0.0" flutter_localizations: dependency: "direct main" description: flutter @@ -617,10 +625,10 @@ packages: dependency: "direct main" description: name: flutter_openssl_crypto - sha256: "6dcecf6f7c1804ae6f5d73ee05df8af72ea8133bf2447d25979d739503186c96" + sha256: "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1" url: "https://pub.dev" source: hosted - version: "0.3.0" + version: "0.5.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -810,10 +818,10 @@ packages: dependency: "direct main" description: name: go_router - sha256: "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc" + sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3 url: "https://pub.dev" source: hosted - version: "14.3.0" + version: "14.8.1" gtk: dependency: transitive description: @@ -1151,10 +1159,10 @@ packages: dependency: "direct main" description: name: matrix - sha256: d0da69e5ee8dfc1692c02e4b460a1bc136120f0dcf5e02cf604b23cd39d76903 + sha256: "23e87bb625c53f06568ae3a68badf31e95fbfd0f97f8a6781b9685dd207c9add" url: "https://pub.dev" source: hosted - version: "0.38.0" + version: "0.38.1" meta: dependency: transitive description: @@ -1932,10 +1940,10 @@ packages: dependency: transitive description: name: timezone - sha256: "2236ec079a174ce07434e89fcd3fcda430025eb7692244139a9cf54fdcf1fc7d" + sha256: ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d url: "https://pub.dev" source: hosted - version: "0.9.4" + version: "0.10.0" tint: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 8411d5fb7..c07651219 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -33,13 +33,13 @@ dependencies: flutter_foreground_task: ^6.1.3 flutter_highlighter: ^0.1.1 flutter_linkify: ^6.0.0 - flutter_local_notifications: ^17.2.3 + flutter_local_notifications: ^19.0.0 flutter_localizations: sdk: flutter flutter_map: ^6.1.0 flutter_new_badger: ^1.1.1 flutter_olm: 2.0.0 - flutter_openssl_crypto: ^0.3.0 + flutter_openssl_crypto: ^0.5.0 flutter_secure_storage: ^9.2.2 flutter_shortcuts_new: ^2.0.0 flutter_typeahead: ## Custom fork from flutter_typeahead since the package is not maintain well. @@ -49,7 +49,7 @@ dependencies: flutter_web_auth_2: ^3.1.1 # Version 4 blocked by https://github.com/MixinNetwork/flutter-plugins/issues/379 flutter_webrtc: ^0.12.9 geolocator: ^13.0.1 - go_router: ^14.3.0 + go_router: ^14.8.1 handy_window: ^0.4.0 hive: ^2.2.3 hive_flutter: ^1.1.0 @@ -61,7 +61,7 @@ dependencies: just_audio: ^0.9.39 latlong2: ^0.9.1 linkify: ^5.0.0 - matrix: ^0.38.0 + matrix: ^0.38.1 mime: ^1.0.6 native_imaging: ^0.2.0 opus_caf_converter_dart: ^1.0.1 diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index aefa9bf6e..d2a3efb85 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -3,36 +3,37 @@ # list(APPEND FLUTTER_PLUGIN_LIST - app_links - desktop_drop - dynamic_color - emoji_picker_flutter - file_selector_windows - flutter_secure_storage_windows - flutter_webrtc - geolocator_windows - pasteboard - permission_handler_windows - record_windows - share_plus - sqlcipher_flutter_libs - url_launcher_windows - window_to_front + app_links + desktop_drop + dynamic_color + emoji_picker_flutter + file_selector_windows + flutter_secure_storage_windows + flutter_webrtc + geolocator_windows + pasteboard + permission_handler_windows + record_windows + share_plus + sqlcipher_flutter_libs + url_launcher_windows + window_to_front ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + flutter_local_notifications_windows ) set(PLUGIN_BUNDLED_LIBRARIES) -foreach(plugin ${FLUTTER_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) - target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) -endforeach(plugin) +foreach (plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach (plugin) -foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) - add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) -endforeach(ffi_plugin) +foreach (ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach (ffi_plugin)