diff --git a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/util/QuranAudioExtensionDecider.kt b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/util/QuranAudioExtensionDecider.kt index 4741e91f1f..6a33622f67 100644 --- a/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/util/QuranAudioExtensionDecider.kt +++ b/common/audio/src/main/java/com/quran/labs/androidquran/common/audio/util/QuranAudioExtensionDecider.kt @@ -1,5 +1,6 @@ package com.quran.labs.androidquran.common.audio.util +import android.os.Build import com.quran.data.di.AppScope import com.quran.data.model.audio.Qari import com.quran.labs.androidquran.common.audio.model.QariItem @@ -9,6 +10,10 @@ import dev.zacsweers.metro.Inject @ContributesBinding(AppScope::class) class QuranAudioExtensionDecider @Inject constructor() : AudioExtensionDecider { + /** Onyx BOOX firmware 4.2+ cannot decode opus, so force mp3 there. https://github.com/quran/quran_android/issues/4018 */ + internal fun isBooxDevice(): Boolean = + "onyx".equals(Build.MANUFACTURER, ignoreCase = true) + /** * Returns the audio file extension for a given Qari. * For today, if the Qari has an opus URL, it returns "opus", otherwise it returns "mp3". In @@ -16,7 +21,7 @@ class QuranAudioExtensionDecider @Inject constructor() : AudioExtensionDecider { * of a specific audio file type for the qari already downloaded. */ override fun audioExtensionForQari(qari: Qari): String { - return if (qari.opusUrl != null) "opus" else "mp3" + return if (qari.opusUrl != null && !isBooxDevice()) "opus" else "mp3" } /** @@ -26,7 +31,7 @@ class QuranAudioExtensionDecider @Inject constructor() : AudioExtensionDecider { * of a specific audio file type for the qari already downloaded. */ override fun audioExtensionForQari(qariItem: QariItem): String { - return if (qariItem.opusUrl != null) "opus" else "mp3" + return if (qariItem.opusUrl != null && !isBooxDevice()) "opus" else "mp3" } /** @@ -35,7 +40,7 @@ class QuranAudioExtensionDecider @Inject constructor() : AudioExtensionDecider { * for new downloads/streaming. */ override fun allowedAudioExtensions(qari: Qari): List { - return if (qari.opusUrl != null) listOf("opus", "mp3") else listOf("mp3") + return if (qari.opusUrl != null && !isBooxDevice()) listOf("opus", "mp3") else listOf("mp3") } /** @@ -44,7 +49,11 @@ class QuranAudioExtensionDecider @Inject constructor() : AudioExtensionDecider { * for new downloads/streaming. */ override fun allowedAudioExtensions(qariItem: QariItem): List { - return if (qariItem.opusUrl != null) listOf("opus", "mp3") else listOf("mp3") + return if (qariItem.opusUrl != null && !isBooxDevice()) { + listOf("opus", "mp3") + } else { + listOf("mp3") + } } }