From 07a0d01a060f2f13d66548ba935e48b2ca86f885 Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Sat, 4 Jan 2025 12:54:24 -0700 Subject: [PATCH] image: fix bad coverprovider conventions --- app/src/main/AndroidManifest.xml | 2 +- .../org/oxycblt/auxio/image/CoverProvider.kt | 20 +++++++++++-------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0a060858b..afba82e8f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -105,7 +105,7 @@ --> 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 aededbd43..5a34bfc45 100644 --- a/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt +++ b/app/src/main/java/org/oxycblt/auxio/image/CoverProvider.kt @@ -15,10 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - + package org.oxycblt.auxio.image import android.content.ContentProvider +import android.content.ContentResolver import android.content.ContentValues import android.content.UriMatcher import android.database.Cursor @@ -59,25 +60,28 @@ class CoverProvider : ContentProvider() { sortOrder: String? ): Cursor = throw UnsupportedOperationException() - override fun insert(uri: Uri, values: ContentValues?): Uri = - throw UnsupportedOperationException() + override fun insert(uri: Uri, values: ContentValues?): Uri? = null - override fun delete(uri: Uri, selection: String?, selectionArgs: Array?): Int = - throw UnsupportedOperationException() + override fun delete(uri: Uri, selection: String?, selectionArgs: Array?): Int = 0 override fun update( uri: Uri, values: ContentValues?, selection: String?, selectionArgs: Array? - ): Int = throw UnsupportedOperationException() + ): Int = 0 companion object { - private const val AUTHORITY = "org.oxycblt.auxio.image" + private const val AUTHORITY = "org.oxycblt.auxio.image.CoverProvider" private const val IMAGES_PATH = "covers" private val uriMatcher = UriMatcher(UriMatcher.NO_MATCH).apply { addURI(AUTHORITY, "$IMAGES_PATH/*", 1) } - val CONTENT_URI: Uri = Uri.parse("content://$AUTHORITY/$IMAGES_PATH") + val CONTENT_URI: Uri = + Uri.Builder() + .scheme(ContentResolver.SCHEME_CONTENT) + .authority(AUTHORITY) + .appendPath(IMAGES_PATH) + .build() } }