1.0.5

Author: nt4f04uNd

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.5
+
+- Fixed crash when album art couldn't be loaded on Android 10+
+- Fixed that new playlist action in playlists tab could be tapped in selection
+
 ## 1.0.4
 
 - Added playlists and artists

android/app/src/main/java/com/nt4f04und/sweyer/channels/ContentChannel.java

@@ -88,6 +88,7 @@ public void onMethodCall(MethodCall call, @NotNull MethodChannel.Result result)
                   loadingSignals.put(id, signal);
                   Executors.newSingleThreadExecutor().execute(() -> {
                      byte[] bytes = null;
+                     boolean reported = false;
                      try {
                         Bitmap bitmap = contentResolver.loadThumbnail(
                                 Uri.parse(call.argument("uri")),
@@ -100,13 +101,18 @@ public void onMethodCall(MethodCall call, @NotNull MethodChannel.Result result)
                      } catch (OperationCanceledException ex) {
                         // do nothing
                      } catch (IOException e) {
-                        result.error(IO_ERROR, "loadThumbnail failed", Log.getStackTraceString(e));
-                     } finally {
-                        byte[] finalBytes = bytes;
+                        reported = true;
                         handler.post(() -> {
-                           loadingSignals.remove(id);
-                           result.success(finalBytes);
+                           result.error(IO_ERROR, "loadThumbnail failed", Log.getStackTraceString(e));
                         });
+                     } finally {
+                        if (!reported) {
+                           byte[] finalBytes = bytes;
+                           handler.post(() -> {
+                              loadingSignals.remove(id);
+                              result.success(finalBytes);
+                           });
+                        }
                      }
                   });
                } else {
@@ -277,7 +283,6 @@ public void onMethodCall(MethodCall call, @NotNull MethodChannel.Result result)
                      handler.post(() -> {
                         result.error(UNEXPECTED_ERROR, e.getMessage(), Log.getStackTraceString(e));
                      });
-
                   }
                });
                break;

lib/routes/home_route/tabs_route.dart

@@ -527,7 +527,7 @@ class _ContentTabState extends State<_ContentTab> with AutomaticKeepAliveClientM
                 ),
               ),
             if (contentType == Playlist && !selectionRoute)
-              const CreatePlaylistInListAction(),
+              CreatePlaylistInListAction(enabled: selectionController.notInSelection),
           ],
         ),
       )

lib/widgets/content_art.dart

@@ -423,12 +423,23 @@ class _SongScopedStorageArtSourceLoader extends _ArtSourceLoader {
       if (!state.mounted)
         return;
       _signal = CancellationSignal();
-      _bytes = await ContentChannel.loadAlbumArt(
-        uri: uri,
-        size: Size.square(size) * MediaQuery.of(state.context).devicePixelRatio,
-        signal: _signal!,
-      );
-      setLoading(_SourceLoading.loaded);
+      try {
+        _bytes = await ContentChannel.loadAlbumArt(
+          uri: uri,
+          size: Size.square(size) * MediaQuery.of(state.context).devicePixelRatio,
+          signal: _signal!,
+        );
+      } on ContentChannelException catch (ex, stack) {
+        if (ex != ContentChannelException.io) {
+          FirebaseCrashlytics.instance.recordError(
+            ex,
+            stack,
+            reason: 'in _SongScopedStorageArtSourceLoader.load',
+          );
+        }
+      } finally {
+        setLoading(_SourceLoading.loaded);
+      }
     });
   }
 
@@ -578,7 +589,11 @@ class _ArtistGeniusArtSourceLoader extends _ArtSourceLoader {
         final info = await artist.fetchInfo();
         _url = info.imageUrl;
       } catch (ex, stack) {
-        FirebaseCrashlytics.instance.recordError(ex, stack);
+        FirebaseCrashlytics.instance.recordError(
+          ex,
+          stack,
+          reason: 'in _ArtistGeniusArtSourceLoader.load',
+        );
       } finally {
         setLoading(_SourceLoading.loaded);
       }
@@ -598,7 +613,11 @@ class _ArtistGeniusArtSourceLoader extends _ArtSourceLoader {
       height: size,
       fit: BoxFit.cover,
       errorBuilder: (context, error, stacktrace) {
-        FirebaseCrashlytics.instance.recordError(error, stacktrace);
+        FirebaseCrashlytics.instance.recordError(
+          error,
+          stacktrace,
+          reason: 'in _ArtistGeniusArtSourceLoader.getImage',
+        );
         return state._buildDefault();
       },
       frameBuilder: state.frameBuilder,

lib/widgets/content_list_view/in_list_action.dart

@@ -149,7 +149,12 @@ class _InListContentActionState extends State<InListContentAction> with SingleTi
 }
 
 class CreatePlaylistInListAction extends StatefulWidget {
-  const CreatePlaylistInListAction({Key? key}) : super(key: key);
+  const CreatePlaylistInListAction({
+    Key? key ,
+    this.enabled = true,
+  }) : super(key: key);
+
+  final bool enabled;
 
   @override
   State<CreatePlaylistInListAction> createState() => _CreatePlaylistInListActionState();
@@ -164,7 +169,7 @@ class _CreatePlaylistInListActionState extends State<CreatePlaylistInListAction>
   Widget build(BuildContext context) {
     final l10n = getl10n(context);
     return InListContentAction.persistentQueue(
-      onTap: _handleTap,
+      onTap: widget.enabled ? _handleTap : null,
       icon: Icons.add_rounded,
       text: l10n.newPlaylist,
     );

pubspec.lock

@@ -97,14 +97,28 @@ packages:
       name: boxy
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.3"
   cached_network_image:
     dependency: "direct main"
     description:
       name: cached_network_image
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.0"
+    version: "3.1.0"
+  cached_network_image_platform_interface:
+    dependency: transitive
+    description:
+      name: cached_network_image_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
+  cached_network_image_web:
+    dependency: transitive
+    description:
+      name: cached_network_image_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.0"
   characters:
     dependency: transitive
     description:
@@ -146,14 +160,14 @@ packages:
       name: cloud_functions_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.7"
+    version: "5.0.8"
   cloud_functions_web:
     dependency: transitive
     description:
       name: cloud_functions_web
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "4.0.9"
+    version: "4.0.10"
   collection:
     dependency: transitive
     description:
@@ -181,7 +195,7 @@ packages:
       name: dart_style
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.1"
+    version: "2.0.2"
   device_info:
     dependency: "direct main"
     description:
@@ -251,7 +265,7 @@ packages:
       name: firebase_analytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "8.1.2"
+    version: "8.2.0"
   firebase_analytics_platform_interface:
     dependency: transitive
     description:
@@ -272,7 +286,7 @@ packages:
       name: firebase_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -293,14 +307,14 @@ packages:
       name: firebase_crashlytics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.7"
+    version: "2.1.1"
   firebase_crashlytics_platform_interface:
     dependency: transitive
     description:
       name: firebase_crashlytics_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.0.6"
+    version: "3.1.0"
   flare_dart:
     dependency: transitive
     description:
@@ -564,7 +578,7 @@ packages:
       name: permission_handler_platform_interface
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "3.6.0"
+    version: "3.6.1"
   petitparser:
     dependency: transitive
     description:
@@ -723,7 +737,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.1"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -4,7 +4,7 @@ homepage: https://github.com/nt4f04uNd/sweyer
 repository: https://github.com/nt4f04uNd/sweyer
 issue_tracker: https://github.com/nt4f04uNd/sweyer/issues
 publish_to: none
-version: 1.0.4+6
+version: 1.0.5+7
 
 environment:
   sdk: '>=2.13.0 <3.0.0'