Fix Glide exceptions

This commit is contained in:
inorichi 2019-03-14 21:44:20 +01:00
parent 10e1106760
commit cf293642fb
2 changed files with 18 additions and 7 deletions

View File

@ -57,13 +57,17 @@ open class App : Application() {
} }
protected open fun setupJobManager() { protected open fun setupJobManager() {
JobManager.create(this).addJobCreator { tag -> try {
when (tag) { JobManager.create(this).addJobCreator { tag ->
LibraryUpdateJob.TAG -> LibraryUpdateJob() when (tag) {
UpdaterJob.TAG -> UpdaterJob() LibraryUpdateJob.TAG -> LibraryUpdateJob()
BackupCreatorJob.TAG -> BackupCreatorJob() UpdaterJob.TAG -> UpdaterJob()
else -> null BackupCreatorJob.TAG -> BackupCreatorJob()
else -> null
}
} }
} catch (e: Exception) {
Timber.w("Can't initialize job manager")
} }
} }

View File

@ -2,6 +2,7 @@ package eu.kanade.tachiyomi.network
import com.squareup.duktape.Duktape import com.squareup.duktape.Duktape
import okhttp3.* import okhttp3.*
import java.io.IOException
class CloudflareInterceptor : Interceptor { class CloudflareInterceptor : Interceptor {
@ -19,7 +20,13 @@ class CloudflareInterceptor : Interceptor {
// Check if Cloudflare anti-bot is on // Check if Cloudflare anti-bot is on
if (response.code() == 503 && response.header("Server") in serverCheck) { if (response.code() == 503 && response.header("Server") in serverCheck) {
return chain.proceed(resolveChallenge(response)) return try {
chain.proceed(resolveChallenge(response))
} catch (e: Exception) {
// Because OkHttp's enqueue only handles IOExceptions, wrap the exception so that
// we don't crash the entire app
throw IOException(e)
}
} }
return response return response