Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

app: fix cover provider authority conflict

Browse source 
Between release and debug builds
This commit is contained in:
Alexander Capehart 2025-01-06 08:25:17 -07:00
parent 6be97943bc
commit 3e54c032fe
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/debug/res/values/donottranslate.xml
View file

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="info_app_name" translatable="false">Auxio Debug</string> <string name="info_app_name" translatable="false">Auxio Debug</string>
<string name="pkg_authority_cover">org.oxycblt.auxio.debug.image.CoverProvider</string>
</resources> </resources>

2
app/src/main/AndroidManifest.xml
View file

@ -105,7 +105,7 @@
--> -->
<provider <provider
android:name=".image.CoverProvider" android:name=".image.CoverProvider"
android:authorities="org.oxycblt.auxio.image.CoverProvider" android:authorities="@string/pkg_authority_cover"
android:exported="true" android:exported="true"
tools:ignore="ExportedContentProvider" /> tools:ignore="ExportedContentProvider" />

3
app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt
View file

@ -26,6 +26,7 @@ import android.database.Cursor
import android.net.Uri import android.net.Uri
import android.os.ParcelFileDescriptor import android.os.ParcelFileDescriptor
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import org.oxycblt.auxio.BuildConfig
import org.oxycblt.auxio.image.covers.SiloedCoverId import org.oxycblt.auxio.image.covers.SiloedCoverId
import org.oxycblt.auxio.image.covers.SiloedCovers import org.oxycblt.auxio.image.covers.SiloedCovers
import org.oxycblt.musikr.cover.ObtainResult import org.oxycblt.musikr.cover.ObtainResult
@ -72,7 +73,7 @@ class CoverProvider : ContentProvider() {
): Int = 0 ): Int = 0
companion object { companion object {
private const val AUTHORITY = "org.oxycblt.auxio.image.CoverProvider" private const val AUTHORITY = "${BuildConfig.APPLICATION_ID}.image.CoverProvider"
private const val IMAGES_PATH = "covers" private const val IMAGES_PATH = "covers"
private val uriMatcher = private val uriMatcher =
UriMatcher(UriMatcher.NO_MATCH).apply { addURI(AUTHORITY, "$IMAGES_PATH/*", 1) } UriMatcher(UriMatcher.NO_MATCH).apply { addURI(AUTHORITY, "$IMAGES_PATH/*", 1) }

3
app/src/main/res/values/donottranslate.xml
View file

@ -16,5 +16,8 @@
<string name="cdc_wav">Microsoft WAVE</string> <string name="cdc_wav">Microsoft WAVE</string>
<string name="cnt_ogg">Ogg %s</string> <string name="cnt_ogg">Ogg %s</string>
<!-- Pkg Namespace | Dynamic package names -->
<string name="pkg_authority_cover">org.oxycblt.auxio.image.CoverProvider</string>
<!-- Supporter Namespace | Sponsor usernames --> <!-- Supporter Namespace | Sponsor usernames -->
</resources> </resources>