diff --git a/android/app/build.gradle b/android/app/build.gradle index 001fbd72..fba903e3 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) { } android { - compileSdkVersion 31 + compileSdkVersion 32 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/lib/pages/new_private_chat/new_private_chat.dart b/lib/pages/new_private_chat/new_private_chat.dart index 5608a59c..0a2a7be1 100644 --- a/lib/pages/new_private_chat/new_private_chat.dart +++ b/lib/pages/new_private_chat/new_private_chat.dart @@ -4,7 +4,6 @@ import 'package:flutter/services.dart'; import 'package:device_info_plus/device_info_plus.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix/matrix.dart'; -import 'package:permission_handler/permission_handler.dart'; import 'package:fluffychat/pages/new_private_chat/new_private_chat_view.dart'; import 'package:fluffychat/pages/new_private_chat/qr_scanner_modal.dart'; @@ -98,7 +97,6 @@ class NewPrivateChatController extends State { return; } } - await Permission.camera.request(); await showModalBottomSheet( context: context, useRootNavigator: false, diff --git a/pubspec.lock b/pubspec.lock index a6967c87..450a812e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1239,41 +1239,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.11.1" - permission_handler: - dependency: "direct main" - description: - name: permission_handler - url: "https://pub.dartlang.org" - source: hosted - version: "10.0.0" - permission_handler_android: - dependency: transitive - description: - name: permission_handler_android - url: "https://pub.dartlang.org" - source: hosted - version: "10.0.0" - permission_handler_apple: - dependency: transitive - description: - name: permission_handler_apple - url: "https://pub.dartlang.org" - source: hosted - version: "9.0.3" - permission_handler_platform_interface: - dependency: transitive - description: - name: permission_handler_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "3.7.0" - permission_handler_windows: - dependency: transitive - description: - name: permission_handler_windows - url: "https://pub.dartlang.org" - source: hosted - version: "0.1.0" petitparser: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 1672723d..54cbfdd7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -64,7 +64,6 @@ dependencies: git: https://gitlab.com/famedly/company/frontend/libraries/native_imaging.git package_info_plus: ^1.3.0 path_provider: ^2.0.9 - permission_handler: ^10.0.0 pin_code_text_field: ^1.8.0 provider: ^6.0.2 punycode: ^1.0.0 @@ -160,3 +159,5 @@ dependency_overrides: git: url: https://github.com/TheOneWithTheBraid/snapping_sheet.git ref: listenable + #matrix: + # path: ../famedlysdk/ diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc index 8e1f3f66..56ab0b39 100644 --- a/windows/flutter/generated_plugin_registrant.cc +++ b/windows/flutter/generated_plugin_registrant.cc @@ -11,7 +11,6 @@ #include #include #include -#include #include void RegisterPlugins(flutter::PluginRegistry* registry) { @@ -25,8 +24,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) { registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); FlutterWebRTCPluginRegisterWithRegistrar( registry->GetRegistrarForPlugin("FlutterWebRTCPlugin")); - PermissionHandlerWindowsPluginRegisterWithRegistrar( - registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin")); UrlLauncherWindowsRegisterWithRegistrar( registry->GetRegistrarForPlugin("UrlLauncherWindows")); } diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake index 355f8578..b337d49a 100644 --- a/windows/flutter/generated_plugins.cmake +++ b/windows/flutter/generated_plugins.cmake @@ -8,7 +8,6 @@ list(APPEND FLUTTER_PLUGIN_LIST desktop_lifecycle flutter_secure_storage_windows flutter_webrtc - permission_handler_windows url_launcher_windows )