From d5f6f94c4b65de829e863efa16471040853e540f Mon Sep 17 00:00:00 2001 From: Tim Schneeberger Date: Tue, 23 May 2023 18:53:41 +0200 Subject: [PATCH] fix: Fixed crash when externalFilesDir is not mounted --- .../rootlessjamesdsp/preference/FileLibraryPreference.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/preference/FileLibraryPreference.kt b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/preference/FileLibraryPreference.kt index b31c2d21b..326c9dfc0 100644 --- a/app/src/main/java/me/timschneeberger/rootlessjamesdsp/preference/FileLibraryPreference.kt +++ b/app/src/main/java/me/timschneeberger/rootlessjamesdsp/preference/FileLibraryPreference.kt @@ -8,6 +8,7 @@ import androidx.preference.Preference.SummaryProvider import me.timschneeberger.rootlessjamesdsp.R import me.timschneeberger.rootlessjamesdsp.model.preset.Preset import me.timschneeberger.rootlessjamesdsp.utils.extensions.ContextExtensions.toast +import timber.log.Timber import java.io.File import java.io.InputStream @@ -147,8 +148,11 @@ class FileLibraryPreference(context: Context, attrs: AttributeSet?) : fun createFullPathCompat(context: Context, path: String): String { return if(path.startsWith("/")) path - else - context.getExternalFilesDir(null)!!.absolutePath + "/" + path + else { + val externalDir = context.getExternalFilesDir(null) + externalDir ?: Timber.e("getExternalFilesDir returned null") + externalDir?.let { it.absolutePath + "/" + path } ?: "" + } } fun createFullPathNullCompat(context: Context, path: String?): String? { path ?: return null