fix(android ): file_selector getDirectoryPath returns unusable conten…

…t urls #720
KRTirtho · Sep 26, 2023 · b3cf639 · b3cf639
1 parent a7e102f
commit b3cf639
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/extensions/track.dart b/lib/extensions/track.dart
@@ -7,7 +7,7 @@ extension TrackJson on Track {
     return {
       "album": album?.toJson(),
       "artists": artists?.map((artist) => artist.toJson()).toList(),
-      "availableMarkets": availableMarkets,
+      "availableMarkets": availableMarkets?.map((e) => e.name).toList(),
       "discNumber": discNumber,
       "duration": duration.toString(),
       "durationMs": durationMs,

diff --git a/lib/pages/settings/settings.dart b/lib/pages/settings/settings.dart
@@ -47,10 +47,15 @@ class SettingsPage extends HookConsumerWidget {
     }, []);
 
     final pickDownloadLocation = useCallback(() async {
-      final dirStr = await getDirectoryPath(
+      await openFile();
+      String? dirStr = await getDirectoryPath(
         initialDirectory: preferences.downloadLocation,
       );
       if (dirStr == null) return;
+      if (DesktopTools.platform.isAndroid && dirStr.startsWith("content://")) {
+        dirStr =
+            "/storage/emulated/0/${Uri.decodeFull(dirStr).split("primary:").last}";
+      }
       preferences.setDownloadLocation(dirStr);
     }, [preferences.downloadLocation]);
 

diff --git a/lib/services/queries/playlist.dart b/lib/services/queries/playlist.dart
@@ -119,8 +119,9 @@ class PlaylistQueries {
     return useSpotifyQuery<bool, dynamic>(
       "playlist-is-followed/$playlistId/$userId",
       (spotify) async {
-        final result = await spotify.playlists.followedBy(playlistId, [userId]);
-        return result.first;
+        final result =
+            await spotify.playlists.followedByUsers(playlistId, [userId]);
+        return result[userId] ?? false;
       },
       ref: ref,
     );