prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix captcha notification dismissing

Browse Source
This commit is contained in:
Koitharu
2025-06-28 07:02:51 +03:00
parent 4088f50120
commit fc7f5f2cf9
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/org/koitharu/kotatsu/core/exceptions/resolve/CaptchaHandler.kt
View File

@@ -77,7 +77,7 @@ class CaptchaHandler @Inject constructor(
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(context: Context?, intent: Intent?) {
val sourceName = intent?.getStringExtra(AppRouter.KEY_SOURCE) ?: return val sourceName = intent?.getStringExtra(AppRouter.KEY_SOURCE) ?: return
goAsync { goAsync {
discard(MangaSource(sourceName)) handleException(MangaSource(sourceName), exception = null, notify = false)
} }
} }
}, },
@@ -86,10 +86,10 @@ class CaptchaHandler @Inject constructor(
) )
} }
suspend fun handle(exception: CloudFlareException): Boolean = handleException(exception.source, exception) suspend fun handle(exception: CloudFlareException): Boolean = handleException(exception.source, exception, true)
suspend fun discard(source: MangaSource) { suspend fun discard(source: MangaSource) {
handleException(source, null) handleException(source, null, true)
} }
override fun onError(request: ImageRequest, result: ErrorResult) { override fun onError(request: ImageRequest, result: ErrorResult) {
@@ -98,23 +98,25 @@ class CaptchaHandler @Inject constructor(
if (e is CloudFlareException && request.extras[ignoreCaptchaKey] != true) { if (e is CloudFlareException && request.extras[ignoreCaptchaKey] != true) {
val scope = request.lifecycle?.coroutineScope ?: processLifecycleScope val scope = request.lifecycle?.coroutineScope ?: processLifecycleScope
scope.launch { scope.launch {
handleException(e.source, e) handleException(e.source, e, true)
} }
} }
} }
private suspend fun handleException( private suspend fun handleException(
source: MangaSource, source: MangaSource,
exception: CloudFlareException? exception: CloudFlareException?,
notify: Boolean
): Boolean = withContext(Dispatchers.Default) { ): Boolean = withContext(Dispatchers.Default) {
if (source == UnknownMangaSource) { if (source == UnknownMangaSource) {
return@withContext false return@withContext false
} }
mutex.withLock { mutex.withLock {
var removedException: CloudFlareProtectedException? = null
if (exception is CloudFlareProtectedException) { if (exception is CloudFlareProtectedException) {
exceptionMap[source] = exception exceptionMap[source] = exception
} else { } else {
exceptionMap.remove(source) removedException = exceptionMap.remove(source)
} }
val dao = databaseProvider.get().getSourcesDao() val dao = databaseProvider.get().getSourcesDao()
dao.setCfState(source.name, exception?.state ?: CloudFlareHelper.PROTECTION_NOT_DETECTED) dao.setCfState(source.name, exception?.state ?: CloudFlareHelper.PROTECTION_NOT_DETECTED)
@@ -126,7 +128,10 @@ class CaptchaHandler @Inject constructor(
}.mapNotNull { }.mapNotNull {
exceptionMap[it] exceptionMap[it]
} }
if (exceptions.isNotEmpty() && context.checkNotificationPermission(CHANNEL_ID)) { if (notify && context.checkNotificationPermission(CHANNEL_ID)) {
if (removedException != null) {
NotificationManagerCompat.from(context).cancel(TAG, removedException.source.hashCode())
}
notify(exceptions) notify(exceptions)
} }
} }