From f49ea4946ab6c348a6d199c04ccbf2b2bd14d971 Mon Sep 17 00:00:00 2001 From: Moritz Weber Date: Tue, 2 May 2023 18:13:29 +0200 Subject: [PATCH] fix #77 --- CHANGELOG.md | 1 + .../datasources/local_music_fetcher_impl.dart | 5 + src/pubspec.lock | 110 ++++++++++++++---- src/pubspec.yaml | 4 +- 4 files changed, 96 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 777c463..5047159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - New Icons for linked songs - Added German translation (#51) - Fixed track number parsing for three digits (#76) +- Fixed library loading for Android 13 (#77) ## 1.2.0 diff --git a/src/lib/system/datasources/local_music_fetcher_impl.dart b/src/lib/system/datasources/local_music_fetcher_impl.dart index 757ff5d..ad0ab15 100644 --- a/src/lib/system/datasources/local_music_fetcher_impl.dart +++ b/src/lib/system/datasources/local_music_fetcher_impl.dart @@ -37,6 +37,11 @@ class LocalMusicFetcherImpl implements LocalMusicFetcher { final List aqSongs = []; + final permissions = await _onAudioQuery.permissionsStatus(); + if (!permissions) { + await _onAudioQuery.permissionsRequest(); + } + for (final libDir in libDirs) { await _onAudioQuery.scanMedia(libDir.path); aqSongs.addAll(await _onAudioQuery.querySongs(path: libDir.path)); diff --git a/src/pubspec.lock b/src/pubspec.lock index f9e27ba..0710fa8 100644 --- a/src/pubspec.lock +++ b/src/pubspec.lock @@ -209,6 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + coverage: + dependency: transitive + description: + name: coverage + sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + url: "https://pub.dev" + source: hosted + version: "1.6.3" crypto: dependency: transitive description: @@ -549,46 +557,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" + node_preamble: + dependency: transitive + description: + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" on_audio_query: dependency: "direct main" description: name: on_audio_query - sha256: "403a0bc23881c3c4aa5f228a9592adb3baa7f007133ea48a5ab50fc8751f34f4" + sha256: "151c7d636f48e7cbb5080748114c7a10aea8fdb8c3e1d7f48819146b346e0e38" url: "https://pub.dev" source: hosted - version: "2.8.0" - on_audio_query_android: - dependency: transitive - description: - name: on_audio_query_android - sha256: "9a7080925deb87f682a178aaf422ebb6f083a25e7ea5db85e8e690fb0195de64" - url: "https://pub.dev" - source: hosted - version: "1.0.0" - on_audio_query_ios: - dependency: transitive - description: - name: on_audio_query_ios - sha256: "5660c623037e9a0a6dd41a2aed8e5eaf7030d630763d6de196af71097b0e1874" - url: "https://pub.dev" - source: hosted - version: "1.0.0" + version: "2.6.1" on_audio_query_platform_interface: - dependency: transitive + dependency: "direct main" description: name: on_audio_query_platform_interface - sha256: cec9485cb1b6abad913ad88b01628e550fc8385d7cbcbc66252e53b71aeaddc4 + sha256: "3d4a3d6a4c4ceb4d64b715b21f0f887bf10718c0cf51d2965bdf9bf9371ca7b4" url: "https://pub.dev" source: hosted - version: "1.6.0" + version: "1.4.0" on_audio_query_web: dependency: transitive description: name: on_audio_query_web - sha256: "324669c640570c91653b8ff6a59e1df93b2b942373e385c7d05144cd6d4c73e4" + sha256: "4e7028187354530b1d88441fd1e18ecd63539dd5306cea5adc3dc6bf92382aed" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.3.2+2" package_config: dependency: transitive description: @@ -797,6 +797,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306 + url: "https://pub.dev" + source: hosted + version: "3.0.1" + shelf_static: + dependency: transitive + description: + name: shelf_static + sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + url: "https://pub.dev" + source: hosted + version: "1.1.1" shelf_web_socket: dependency: transitive description: @@ -818,6 +834,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.7" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + source_maps: + dependency: transitive + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" source_span: dependency: transitive description: @@ -922,6 +954,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.1" + test: + dependency: "direct dev" + description: + name: test + sha256: a5fcd2d25eeadbb6589e80198a47d6a464ba3e2049da473943b8af9797900c2d + url: "https://pub.dev" + source: hosted + version: "1.22.0" test_api: dependency: transitive description: @@ -930,6 +970,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.4.16" + test_core: + dependency: transitive + description: + name: test_core + sha256: "0ef9755ec6d746951ba0aabe62f874b707690b5ede0fecc818b138fcc9b14888" + url: "https://pub.dev" + source: hosted + version: "0.4.20" text_scroll: dependency: "direct main" description: @@ -970,6 +1018,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: e7fb6c2282f7631712b69c19d1bff82f3767eea33a2321c14fa59ad67ea391c7 + url: "https://pub.dev" + source: hosted + version: "9.4.0" watcher: dependency: transitive description: @@ -986,6 +1042,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + url: "https://pub.dev" + source: hosted + version: "1.2.0" win32: dependency: transitive description: diff --git a/src/pubspec.yaml b/src/pubspec.yaml index 28b2292..8312100 100644 --- a/src/pubspec.yaml +++ b/src/pubspec.yaml @@ -28,7 +28,8 @@ dependencies: intl: any just_audio: ^0.9.18 # MIT mobx: 2.1.3 # MIT - on_audio_query: ^2.6.1 # BSD 3 + on_audio_query: 2.6.1 # BSD 3 + on_audio_query_platform_interface: 1.4.0 palette_generator: ^0.3.3+2 # BSD 3 path: ^1.8.0 # BSD 3 path_provider: ^2.0.2 # BSD 3 @@ -45,6 +46,7 @@ dev_dependencies: flutter_test: sdk: flutter mobx_codegen: ^2.0.1+3 # MIT + test: ^1.22.0 # For information on the generic Dart part of this file, see the