From 3e54c032fe0279b976125c2d5a0d199dc55880e5 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Mon, 6 Jan 2025 08:25:17 -0700
Subject: [PATCH] app: fix cover provider authority conflict

Between release and debug builds
---
 app/src/debug/res/values/donottranslate.xml                | 1 +
 app/src/main/AndroidManifest.xml                           | 2 +-
 app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt | 3 ++-
 app/src/main/res/values/donottranslate.xml                 | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/debug/res/values/donottranslate.xml b/app/src/debug/res/values/donottranslate.xml
index dd28633f5..caaf4f429 100644
--- a/app/src/debug/res/values/donottranslate.xml
+++ b/app/src/debug/res/values/donottranslate.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="info_app_name" translatable="false">Auxio Debug</string>
+    <string name="pkg_authority_cover">org.oxycblt.auxio.debug.image.CoverProvider</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index afba82e8f..2d0499edd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -105,7 +105,7 @@
         -->
         <provider
             android:name=".image.CoverProvider"
-            android:authorities="org.oxycblt.auxio.image.CoverProvider"
+            android:authorities="@string/pkg_authority_cover"
             android:exported="true"
             tools:ignore="ExportedContentProvider" />
 
diff --git a/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt b/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt
index 871069ae5..653c4f393 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt
@@ -26,6 +26,7 @@ import android.database.Cursor
 import android.net.Uri
 import android.os.ParcelFileDescriptor
 import kotlinx.coroutines.runBlocking
+import org.oxycblt.auxio.BuildConfig
 import org.oxycblt.auxio.image.covers.SiloedCoverId
 import org.oxycblt.auxio.image.covers.SiloedCovers
 import org.oxycblt.musikr.cover.ObtainResult
@@ -72,7 +73,7 @@ class CoverProvider : ContentProvider() {
     ): Int = 0
 
     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 val uriMatcher =
             UriMatcher(UriMatcher.NO_MATCH).apply { addURI(AUTHORITY, "$IMAGES_PATH/*", 1) }
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 5031e41d2..a1cd46ef0 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -16,5 +16,8 @@
     <string name="cdc_wav">Microsoft WAVE</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  -->
 </resources>
\ No newline at end of file