From 5247de044ea169e3beea20e82df3b2402aaf39cc Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Sun, 27 Mar 2022 10:12:07 +0000 Subject: [PATCH] chore: Remove broken voice messages for Linux and Windows --- .gitlab-ci.yml | 2 +- lib/pages/chat/events/message_content.dart | 2 +- linux/flutter/generated_plugin_registrant.cc | 4 ---- linux/flutter/generated_plugins.cmake | 1 - pubspec.lock | 14 -------------- pubspec.yaml | 1 - windows/flutter/generated_plugin_registrant.cc | 3 --- windows/flutter/generated_plugins.cmake | 1 - 8 files changed, 2 insertions(+), 26 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a814e0d..d889cde5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,7 +155,7 @@ build_linux_x86: stage: coverage before_script: [ - sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 libwebkit2gtk-4.0-dev -y, + sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libjsoncpp1 libsecret-1-dev libsecret-1-0 librhash0 -y, ] script: [./scripts/build-linux.sh] artifacts: diff --git a/lib/pages/chat/events/message_content.dart b/lib/pages/chat/events/message_content.dart index 7e451786..2c6597ba 100644 --- a/lib/pages/chat/events/message_content.dart +++ b/lib/pages/chat/events/message_content.dart @@ -80,7 +80,7 @@ class MessageContent extends StatelessWidget { case MessageTypes.Sticker: return Sticker(event); case MessageTypes.Audio: - if (PlatformInfos.isMobile || PlatformInfos.isDesktop) { + if (PlatformInfos.isMobile || PlatformInfos.isMacOS) { return AudioPlayerWidget( event, color: textColor, diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index 66cc97c2..9d220695 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -10,7 +10,6 @@ #include #include #include -#include #include void fl_register_plugins(FlPluginRegistry* registry) { @@ -26,9 +25,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); - g_autoptr(FlPluginRegistrar) libwinmedia_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "LibwinmediaPlugin"); - libwinmedia_plugin_register_with_registrar(libwinmedia_registrar); g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 6fa3e89d..818fa7f6 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -7,7 +7,6 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_lifecycle file_selector_linux flutter_secure_storage_linux - libwinmedia url_launcher_linux ) diff --git a/pubspec.lock b/pubspec.lock index 5d691605..f248706f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -884,13 +884,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.9.20" - just_audio_libwinmedia: - dependency: "direct main" - description: - name: just_audio_libwinmedia - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.4" just_audio_platform_interface: dependency: transitive description: @@ -921,13 +914,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.8.1" - libwinmedia: - dependency: transitive - description: - name: libwinmedia - url: "https://pub.dartlang.org" - source: hosted - version: "0.0.7" lints: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7720408c..983e47ae 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,6 @@ dependencies: image_picker: ^0.8.4+8 intl: any just_audio: ^0.9.20 - just_audio_libwinmedia: any keyboard_shortcuts: ^0.1.4 localstorage: ^4.0.0+1 lottie: ^1.2.2 diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 39918a5e..cde91e3e 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -29,8 +28,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); FlutterWebRTCPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterWebRTCPlugin")); - LibwinmediaPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("LibwinmediaPlugin")); PermissionHandlerWindowsPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index ea7b4e51..eb0112c0 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -9,7 +9,6 @@ list(APPEND FLUTTER_PLUGIN_LIST file_selector_windows flutter_secure_storage_windows flutter_webrtc - libwinmedia permission_handler_windows url_launcher_windows )