From 3e8c74125f0e564af4fa7a2ee111964e4461a9af Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Sat, 17 Apr 2021 08:30:34 +0200
Subject: [PATCH] Skip null file in media library.

Looks like Samsung still returns 'null' here sometimes - for whatever reason.
---
 app/src/main/AndroidManifest.xml                              | 2 +-
 .../ch/blinkenlights/android/medialibrary/MediaLibrary.java   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d0e447eb..efaa4283 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@ THE SOFTWARE.
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="ch.blinkenlights.android.vanilla"
 	android:versionName="1.1.0"
-	android:versionCode="11000"
+	android:versionCode="11001"
 	android:installLocation="auto">
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
diff --git a/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibrary.java b/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibrary.java
index c442dafb..98801314 100644
--- a/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibrary.java
+++ b/app/src/main/java/ch/blinkenlights/android/medialibrary/MediaLibrary.java
@@ -171,6 +171,10 @@ public class MediaLibrary  {
 			defaultPaths.add(Environment.getExternalStorageDirectory().getAbsolutePath());
 
 			for (File file : context.getExternalMediaDirs()) {
+				// Returns 'null' on some Samsung devices?!.
+				if (file == null)
+					continue;
+
 				defaultPaths.add(file.getAbsolutePath());
 				// Check if we have access to a subdir which contains the 'Music' folder.
 				while ( (file = file.getParentFile()) != null) {