Fix external plugin communication

(cherry picked from commit 2214c20742)
master
Koitharu 2 years ago
parent d739e30c84
commit af209d7048
Signed by: Koitharu
GPG Key ID: 676DEE768C17A9D7

@ -141,7 +141,7 @@ class ExternalPluginContentSource(
@Blocking @Blocking
@WorkerThread @WorkerThread
fun getPageUrl(url: String): String { fun getPageUrl(url: String): String {
val uri = "content://${source.authority}/pages/0".toUri().buildUpon() val uri = "content://${source.authority}/manga/pages/0".toUri().buildUpon()
.appendQueryParameter("url", url) .appendQueryParameter("url", url)
.build() .build()
return contentResolver.query(uri, null, null, null, null) return contentResolver.query(uri, null, null, null, null)

@ -10,12 +10,11 @@ import android.provider.OpenableColumns
import androidx.core.database.getStringOrNull import androidx.core.database.getStringOrNull
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runInterruptible import kotlinx.coroutines.runInterruptible
import okhttp3.internal.closeQuietly
import org.jetbrains.annotations.Blocking import org.jetbrains.annotations.Blocking
import org.koitharu.kotatsu.R import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.core.fs.FileSequence import org.koitharu.kotatsu.core.fs.FileSequence
import java.io.BufferedReader
import java.io.File import java.io.File
import java.io.InputStream
import java.nio.file.attribute.BasicFileAttributes import java.nio.file.attribute.BasicFileAttributes
import java.util.zip.ZipEntry import java.util.zip.ZipEntry
import java.util.zip.ZipFile import java.util.zip.ZipFile
@ -35,8 +34,8 @@ fun File.takeIfWriteable() = takeIf { it.exists() && it.canWrite() }
fun File.isNotEmpty() = length() != 0L fun File.isNotEmpty() = length() != 0L
@Blocking @Blocking
fun ZipFile.readText(entry: ZipEntry) = getInputStream(entry).bufferedReader().use { fun ZipFile.readText(entry: ZipEntry) = getInputStream(entry).use { output ->
it.readText() output.bufferedReader().use(BufferedReader::readText)
} }
fun File.getStorageName(context: Context): String = runCatching { fun File.getStorageName(context: Context): String = runCatching {

Loading…
Cancel
Save