Fix source preferences summaries

README.md

@@ -21,9 +21,6 @@ Legacy build (Android 4.1+): [available here](https://github.com/nv95/Kotatsu/re
 * Reading third-party comics from CBZ
 * Standard and Webtoon-optimized reader
 * Notifications about new chapters
-
-### Coming Features
-
 * Updates feed
 * Global search
 
@@ -44,4 +41,4 @@ published by the Free Software Foundation, either version 3 of the License, or
 
 ### Disclaimer
 
-The developers of this application does not have any affiliation with the content providers available.
+The developers of this application does not have any affiliation with the content providers available.

app/build.gradle

@@ -16,7 +16,7 @@ android {
 		minSdkVersion 21
 		targetSdkVersion 29
 		versionCode gitCommits
-		versionName '0.5-b2'
+		versionName '0.5'
 
 		kapt {
 			arguments {
@@ -58,20 +58,22 @@ androidExtensions {
 dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.6'
-	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.6'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+	implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
 
 	implementation 'androidx.core:core-ktx:1.5.0-alpha01'
 	implementation 'androidx.activity:activity-ktx:1.2.0-alpha06'
 	implementation 'androidx.fragment:fragment-ktx:1.3.0-alpha06'
 	implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0-alpha05'
-	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+	implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.2.0-alpha04'
 	implementation 'androidx.viewpager2:viewpager2:1.1.0-alpha01'
 	implementation 'androidx.preference:preference-ktx:1.1.1'
 	implementation 'androidx.work:work-runtime-ktx:2.4.0-rc01'
 	implementation 'com.google.android.material:material:1.3.0-alpha01'
+	//noinspection LifecycleAnnotationProcessorWithJava8
+	kapt 'androidx.lifecycle:lifecycle-compiler:2.3.0-alpha05'
 
 	implementation 'androidx.room:room-runtime:2.2.5'
 	implementation 'androidx.room:room-ktx:2.2.5'
@@ -83,8 +85,8 @@ dependencies {
 	implementation 'com.github.moxy-community:moxy-ktx:2.1.2'
 	kapt 'com.github.moxy-community:moxy-compiler:2.1.2'
 
-	implementation 'com.squareup.okhttp3:okhttp:4.7.2'
-	implementation 'com.squareup.okio:okio:2.6.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.8.0'
+	implementation 'com.squareup.okio:okio:2.7.0'
 	implementation 'org.jsoup:jsoup:1.13.1'
 
 	implementation 'org.koin:koin-android:2.1.5'

app/src/main/java/org/koitharu/kotatsu/KotatsuApp.kt

@@ -1,10 +1,9 @@
 package org.koitharu.kotatsu
 
 import android.app.Application
+import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
 import coil.Coil
 import coil.ComponentRegistry
 import coil.ImageLoaderBuilder
@@ -24,6 +23,7 @@ import org.koitharu.kotatsu.core.local.PagesCache
 import org.koitharu.kotatsu.core.local.cookies.PersistentCookieJar
 import org.koitharu.kotatsu.core.local.cookies.cache.SetCookieCache
 import org.koitharu.kotatsu.core.local.cookies.persistence.SharedPrefsCookiePersistor
+import org.koitharu.kotatsu.core.parser.LocalMangaRepository
 import org.koitharu.kotatsu.core.parser.UserAgentInterceptor
 import org.koitharu.kotatsu.core.prefs.AppSettings
 import org.koitharu.kotatsu.domain.MangaLoaderContext
@@ -46,6 +46,19 @@ class KotatsuApp : Application() {
 
 	override fun onCreate() {
 		super.onCreate()
+		if (BuildConfig.DEBUG) {
+			StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder()
+				.detectAll()
+				.penaltyLog()
+				.build())
+			StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder()
+				.detectAll()
+				.setClassInstanceLimit(LocalMangaRepository::class.java, 1)
+				.setClassInstanceLimit(PagesCache::class.java, 1)
+				.setClassInstanceLimit(MangaLoaderContext::class.java, 1)
+				.penaltyLog()
+				.build())
+		}
 		initKoin()
 		initCoil()
 		Thread.setDefaultUncaughtExceptionHandler(AppCrashHandler(applicationContext))
@@ -75,7 +88,7 @@ class KotatsuApp : Application() {
 					single {
 						MangaLoaderContext()
 					}
-					factory {
+					single {
 						AppSettings(applicationContext)
 					}
 					single {

app/src/main/java/org/koitharu/kotatsu/core/parser/LocalMangaRepository.kt

@@ -3,6 +3,8 @@ package org.koitharu.kotatsu.core.parser
 import android.annotation.SuppressLint
 import android.content.Context
 import android.net.Uri
+import android.webkit.MimeTypeMap
+import androidx.collection.ArraySet
 import androidx.core.net.toFile
 import androidx.core.net.toUri
 import org.koin.core.KoinComponent
@@ -78,8 +80,7 @@ class LocalMangaRepository : MangaRepository, KoinComponent {
 	}
 
 	@SuppressLint("DefaultLocale")
-	fun getFromFile(file: File): Manga {
-		val zip = ZipFile(file)
+	fun getFromFile(file: File): Manga = ZipFile(file).use { zip ->
 		val fileUri = file.toUri().toString()
 		val entry = zip.getEntry(MangaZip.INDEX_ENTRY)
 		val index = entry?.let(zip::readText)?.let(::MangaIndex)
@@ -91,26 +92,26 @@ class LocalMangaRepository : MangaRepository, KoinComponent {
 				coverUrl = zipUri(
 					file,
 					entryName = index.getCoverEntry()
-						?: findFirstEntry(zip.entries())?.name.orEmpty()
+						?: findFirstEntry(zip.entries(), isImage = true)?.name.orEmpty()
 				),
 				chapters = info.chapters?.map { c -> c.copy(url = fileUri) }
 			)
 		}
 		// fallback
 		val title = file.nameWithoutExtension.replace("_", " ").capitalize()
-		val chapters = HashSet<String>()
+		val chapters = ArraySet<String>()
 		for (x in zip.entries()) {
 			if (!x.isDirectory) {
 				chapters += x.name.substringBeforeLast(File.separatorChar, "")
 			}
 		}
 		val uriBuilder = file.toUri().buildUpon()
-		return Manga(
+		Manga(
 			id = file.absolutePath.longHashCode(),
 			title = title,
 			url = fileUri,
 			source = MangaSource.LOCAL,
-			coverUrl = zipUri(file, findFirstEntry(zip.entries())?.name.orEmpty()),
+			coverUrl = zipUri(file, findFirstEntry(zip.entries(), isImage = true)?.name.orEmpty()),
 			chapters = chapters.sortedWith(AlphanumComparator()).mapIndexed { i, s ->
 				MangaChapter(
 					id = "$i$s".longHashCode(),
@@ -136,11 +137,19 @@ class LocalMangaRepository : MangaRepository, KoinComponent {
 	private fun zipUri(file: File, entryName: String) =
 		Uri.fromParts("cbz", file.path, entryName).toString()
 
-	private fun findFirstEntry(entries: Enumeration<out ZipEntry>): ZipEntry? {
+	private fun findFirstEntry(entries: Enumeration<out ZipEntry>, isImage: Boolean): ZipEntry? {
 		val list = entries.toList()
 			.filterNot { it.isDirectory }
 			.sortedWith(compareBy(AlphanumComparator()) { x -> x.name })
-		return list.firstOrNull()
+		return if (isImage) {
+			val map = MimeTypeMap.getSingleton()
+			list.firstOrNull {
+				map.getMimeTypeFromExtension(it.name.substringAfterLast('.'))
+					?.startsWith("image/") == true
+			}
+		} else {
+			list.firstOrNull()
+		}
 	}
 
 	override val sortOrders = emptySet<SortOrder>()

app/src/main/java/org/koitharu/kotatsu/core/parser/site/ChanRepository.kt

@@ -23,7 +23,12 @@ abstract class ChanRepository(loaderContext: MangaLoaderContext) : RemoteMangaRe
 	): List<Manga> {
 		val domain = conf.getDomain(defaultDomain)
 		val url = when {
-			query != null -> "https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
+			!query.isNullOrEmpty() -> {
+				if (offset != 0) {
+					return emptyList()
+				}
+				"https://$domain/?do=search&subaction=search&story=${query.urlEncoded()}"
+			}
 			tag != null -> "https://$domain/tags/${tag.key}&n=${getSortKey2(sortOrder)}?offset=$offset"
 			else -> "https://$domain/${getSortKey(sortOrder)}?offset=$offset"
 		}

app/src/main/java/org/koitharu/kotatsu/core/parser/site/GroupleRepository.kt

@@ -28,7 +28,7 @@ abstract class GroupleRepository(loaderContext: MangaLoaderContext) :
 		val doc = when {
 			!query.isNullOrEmpty() -> loaderContext.httpPost(
 				"https://$domain/search",
-				mapOf("q" to query, "offset" to offset.toString())
+				mapOf("q" to query.urlEncoded(), "offset" to offset.toString())
 			)
 			tag == null -> loaderContext.httpGet(
 				"https://$domain/list?sortType=${getSortKey(

app/src/main/java/org/koitharu/kotatsu/core/parser/site/HenChanRepository.kt

@@ -12,7 +12,7 @@ import org.koitharu.kotatsu.utils.ext.withDomain
 
 class HenChanRepository(loaderContext: MangaLoaderContext) : ChanRepository(loaderContext) {
 
-	override val defaultDomain = "h-chan.me"
+	override val defaultDomain = "henchan.pro"
 	override val source = MangaSource.HENCHAN
 
 	override suspend fun getDetails(manga: Manga): Manga {

app/src/main/java/org/koitharu/kotatsu/core/parser/site/MangaTownRepository.kt

@@ -37,7 +37,12 @@ class MangaTownRepository(loaderContext: MangaLoaderContext) : RemoteMangaReposi
 		}
 		val page = (offset / 30) + 1
 		val url = when {
-			!query.isNullOrEmpty() -> "$scheme://$domain/search?name=${query.urlEncoded()}"
+			!query.isNullOrEmpty() -> {
+				if (offset != 0) {
+					return emptyList()
+				}
+				"$scheme://$domain/search?name=${query.urlEncoded()}"
+			}
 			tag != null -> "$scheme://$domain/directory/${tag.key}/$page.htm$sortKey"
 			else -> "$scheme://$domain/directory/$page.htm$sortKey"
 		}

app/src/main/java/org/koitharu/kotatsu/core/parser/site/ReadmangaRepository.kt

@@ -5,6 +5,6 @@ import org.koitharu.kotatsu.domain.MangaLoaderContext
 
 class ReadmangaRepository(loaderContext: MangaLoaderContext) : GroupleRepository(loaderContext) {
 
-	override val defaultDomain = "readmanga.me"
+	override val defaultDomain = "readmanga.live"
 	override val source = MangaSource.READMANGA_RU
 }

app/src/main/java/org/koitharu/kotatsu/domain/MangaSearchRepository.kt

@@ -18,7 +18,12 @@ class MangaSearchRepository : KoinComponent {
 			var isEmitted = false
 			for (source in sources) {
 				val list = lists.getOrPut(source) {
-					MangaProviderFactory.create(source).getList(0, query, SortOrder.POPULARITY)
+					try {
+						MangaProviderFactory.create(source).getList(0, query, SortOrder.POPULARITY)
+					} catch (e: Throwable) {
+						e.printStackTrace()
+						emptyList<Manga>()
+					}
 				}
 				if (i < list.size) {
 					emit(list.subList(i, (i + batchSize).coerceAtMost(list.lastIndex)))

app/src/main/java/org/koitharu/kotatsu/domain/favourites/FavouritesRepository.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.domain.favourites
 
+import androidx.collection.ArraySet
 import androidx.room.withTransaction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -12,7 +13,6 @@ import org.koitharu.kotatsu.core.db.entity.MangaEntity
 import org.koitharu.kotatsu.core.db.entity.TagEntity
 import org.koitharu.kotatsu.core.model.FavouriteCategory
 import org.koitharu.kotatsu.core.model.Manga
-import java.util.*
 
 class FavouritesRepository : KoinComponent {
 
@@ -98,7 +98,7 @@ class FavouritesRepository : KoinComponent {
 
 	companion object {
 
-		private val listeners = HashSet<OnFavouritesChangeListener>()
+		private val listeners = ArraySet<OnFavouritesChangeListener>()
 
 		fun subscribe(listener: OnFavouritesChangeListener) {
 			listeners += listener

app/src/main/java/org/koitharu/kotatsu/domain/history/HistoryRepository.kt

@@ -1,5 +1,6 @@
 package org.koitharu.kotatsu.domain.history
 
+import androidx.collection.ArraySet
 import androidx.room.withTransaction
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -71,7 +72,7 @@ class HistoryRepository : KoinComponent {
 
 	companion object {
 
-		private val listeners = HashSet<OnHistoryChangeListener>()
+		private val listeners = ArraySet<OnHistoryChangeListener>()
 
 		fun subscribe(listener: OnHistoryChangeListener) {
 			listeners += listener

app/src/main/java/org/koitharu/kotatsu/domain/tracking/TrackingRepository.kt

@@ -6,10 +6,8 @@ import org.koin.core.inject
 import org.koitharu.kotatsu.core.db.MangaDatabase
 import org.koitharu.kotatsu.core.db.entity.TrackEntity
 import org.koitharu.kotatsu.core.db.entity.TrackLogEntity
-import org.koitharu.kotatsu.core.model.Manga
-import org.koitharu.kotatsu.core.model.MangaChapter
-import org.koitharu.kotatsu.core.model.MangaTracking
-import org.koitharu.kotatsu.core.model.TrackingLogItem
+import org.koitharu.kotatsu.core.model.*
+import org.koitharu.kotatsu.domain.MangaProviderFactory
 import java.util.*
 
 class TrackingRepository : KoinComponent {
@@ -24,12 +22,16 @@ class TrackingRepository : KoinComponent {
 	suspend fun getAllTracks(): List<MangaTracking> {
 		val favourites = db.favouritesDao.findAllManga()
 		val history = db.historyDao.findAllManga()
-		val manga = (favourites + history).distinctBy { it.id }
+		val mangas = (favourites + history).distinctBy { it.id }
 		val tracks = db.tracksDao.findAll().groupBy { it.mangaId }
-		return manga.map { m ->
-			val track = tracks[m.id]?.singleOrNull()
+		return mangas.mapNotNull { me ->
+			var manga = me.toManga()
+			if (manga.source == MangaSource.LOCAL) {
+				manga = MangaProviderFactory.createLocal().getRemoteManga(manga) ?: return@mapNotNull null
+			}
+			val track = tracks[manga.id]?.singleOrNull()
 			MangaTracking(
-				manga = m.toManga(),
+				manga = manga,
 				knownChaptersCount = track?.totalChapters ?: -1,
 				lastChapterId = track?.lastChapterId ?: 0L,
 				lastNotifiedChapterId = track?.lastNotifiedChapterId ?: 0L,

app/src/main/java/org/koitharu/kotatsu/ui/details/ChapterHolder.kt

@@ -28,7 +28,7 @@ class ChapterHolder(parent: ViewGroup) :
 			}
 			ChapterExtra.CURRENT -> {
 				textView_number.setBackgroundResource(R.drawable.bg_badge_outline_accent)
-				textView_number.setTextColor(context.getThemeColor(R.attr.colorAccent))
+				textView_number.setTextColor(context.getThemeColor(androidx.appcompat.R.attr.colorAccent))
 			}
 			ChapterExtra.NEW -> {
 				textView_number.setBackgroundResource(R.drawable.bg_badge_accent)

app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsActivity.kt

@@ -206,7 +206,7 @@ class MangaDetailsActivity : BaseActivity(), MangaDetailsView,
 	override fun onSupportActionModeFinished(mode: ActionMode) {
 		super.onSupportActionModeFinished(mode)
 		pager.isUserInputEnabled = true
-		window?.statusBarColor = getThemeColor(R.attr.colorPrimaryDark)
+		window?.statusBarColor = getThemeColor(androidx.appcompat.R.attr.colorPrimaryDark)
 	}
 
 	companion object {

app/src/main/java/org/koitharu/kotatsu/ui/details/MangaDetailsFragment.kt

@@ -5,9 +5,13 @@ import android.view.View
 import androidx.core.net.toUri
 import androidx.core.text.parseAsHtml
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import coil.api.load
 import com.google.android.material.chip.Chip
 import kotlinx.android.synthetic.main.fragment_details.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import moxy.ktx.moxyPresenter
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.FavouriteCategory
@@ -73,13 +77,18 @@ class MangaDetailsFragment : BaseFragment(R.layout.fragment_details), MangaDetai
 			)
 		}
 		manga.url.toUri().toFileOrNull()?.let { f ->
-			chips_tags.addChips(listOf(f)) {
-				create(
-					text = FileSizeUtils.formatBytes(context, it.length()),
-					iconRes = R.drawable.ic_chip_storage,
-					tag = it,
-					onClickListener = this@MangaDetailsFragment
-				)
+			lifecycleScope.launch {
+				val size = withContext(Dispatchers.IO) {
+					f.length()
+				}
+				chips_tags.addChips(listOf(f)) {
+					create(
+						text = FileSizeUtils.formatBytes(context, size),
+						iconRes = R.drawable.ic_chip_storage,
+						tag = it,
+						onClickListener = this@MangaDetailsFragment
+					)
+				}
 			}
 		}
 		imageView_favourite.setOnClickListener(this)

app/src/main/java/org/koitharu/kotatsu/ui/download/DownloadService.kt

@@ -77,9 +77,9 @@ class DownloadService : BaseService() {
 		return launch(Dispatchers.IO) {
 			mutex.lock()
 			wakeLock.acquire(TimeUnit.HOURS.toMillis(1))
+			notification.fillFrom(manga)
+			notification.setCancelId(startId)
 			withContext(Dispatchers.Main) {
-				notification.fillFrom(manga)
-				notification.setCancelId(startId)
 				startForeground(DownloadNotification.NOTIFICATION_ID, notification())
 			}
 			val destination = settings.getStorageDir(this@DownloadService)
@@ -94,10 +94,8 @@ class DownloadService : BaseService() {
 							.build()
 					).drawable
 				}
-				withContext(Dispatchers.Main) {
-					notification.setLargeIcon(cover)
-					notification.update()
-				}
+				notification.setLargeIcon(cover)
+				notification.update()
 				val data = if (manga.chapters == null) repo.getDetails(manga) else manga
 				output = MangaZip.findInDir(destination, data)
 				output.prepare(data)
@@ -141,31 +139,25 @@ class DownloadService : BaseService() {
 						}
 					}
 				}
-				withContext(Dispatchers.Main) {
-					notification.setCancelId(0)
-					notification.setPostProcessing()
-					notification.update()
-				}
+				notification.setCancelId(0)
+				notification.setPostProcessing()
+				notification.update()
 				output.compress()
 				val result = MangaProviderFactory.createLocal().getFromFile(output.file)
-				withContext(Dispatchers.Main) {
-					notification.setDone(result)
-					notification.dismiss()
-					notification.update(manga.id.toInt().absoluteValue)
-				}
+				notification.setDone(result)
+				notification.dismiss()
+				notification.update(manga.id.toInt().absoluteValue)
 			} catch (_: CancellationException) {
-				withContext(Dispatchers.Main + NonCancellable) {
+				withContext(NonCancellable) {
 					notification.setCancelling()
 					notification.setCancelId(0)
 					notification.update()
 				}
 			} catch (e: Throwable) {
-				withContext(Dispatchers.Main) {
-					notification.setError(e)
-					notification.setCancelId(0)
-					notification.dismiss()
-					notification.update(manga.id.toInt().absoluteValue)
-				}
+				notification.setError(e)
+				notification.setCancelId(0)
+				notification.dismiss()
+				notification.update(manga.id.toInt().absoluteValue)
 			} finally {
 				withContext(NonCancellable) {
 					jobs.remove(startId)

app/src/main/java/org/koitharu/kotatsu/ui/list/MainActivity.kt

@@ -37,6 +37,7 @@ import org.koitharu.kotatsu.ui.settings.SettingsActivity
 import org.koitharu.kotatsu.ui.tracker.TrackWorker
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
 import org.koitharu.kotatsu.utils.ext.resolveDp
+import java.io.Closeable
 
 class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener,
 	SharedPreferences.OnSharedPreferenceChangeListener, MainView {
@@ -45,6 +46,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 
 	private val settings by inject<AppSettings>()
 	private lateinit var drawerToggle: ActionBarDrawerToggle
+	private var closeable: Closeable? = null
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
@@ -74,6 +76,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 	}
 
 	override fun onDestroy() {
+		closeable?.close()
 		settings.unsubscribe(this)
 		super.onDestroy()
 	}
@@ -92,7 +95,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.opt_main, menu)
 		menu.findItem(R.id.action_search)?.let { menuItem ->
-			SearchHelper.setupSearchView(menuItem)
+			closeable = SearchHelper.setupSearchView(menuItem)
 		}
 		return super.onCreateOptionsMenu(menu)
 	}

app/src/main/java/org/koitharu/kotatsu/ui/list/MangaListFragment.kt

@@ -126,6 +126,7 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list),
 	}
 
 	final override fun onRefresh() {
+		swipeRefreshLayout.isRefreshing = true
 		onRequestMoreItems(0)
 	}
 
@@ -188,10 +189,11 @@ abstract class MangaListFragment<E> : BaseFragment(R.layout.fragment_list),
 	override fun onLoadingStateChanged(isLoading: Boolean) {
 		val hasItems = recyclerView.hasItems
 		progressBar.isVisible = isLoading && !hasItems
-		swipeRefreshLayout.isRefreshing = isLoading && hasItems
 		swipeRefreshLayout.isEnabled = isSwipeRefreshEnabled && !progressBar.isVisible
 		if (isLoading) {
 			layout_holder.isVisible = false
+		} else {
+			swipeRefreshLayout.isRefreshing = false
 		}
 	}
 

app/src/main/java/org/koitharu/kotatsu/ui/reader/PageLoader.kt

@@ -1,6 +1,7 @@
 package org.koitharu.kotatsu.ui.reader
 
 import android.net.Uri
+import android.util.ArrayMap
 import kotlinx.coroutines.*
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -16,7 +17,7 @@ import kotlin.coroutines.CoroutineContext
 class PageLoader : KoinComponent, CoroutineScope, DisposableHandle {
 
 	private val job = SupervisorJob()
-	private val tasks = HashMap<String, Deferred<File>>()
+	private val tasks = ArrayMap<String, Deferred<File>>()
 	private val okHttp by inject<OkHttpClient>()
 	private val cache by inject<PagesCache>()
 
@@ -30,7 +31,7 @@ class PageLoader : KoinComponent, CoroutineScope, DisposableHandle {
 				return it
 			}
 		}
-		val task = tasks[url]?.takeUnless { it.isCancelled }
+		val task = tasks[url]?.takeUnless { it.isCancelled || (force && it.isCompleted) }
 		return (task ?: loadAsync(url).also { tasks[url] = it }).await()
 	}
 
@@ -48,10 +49,14 @@ class PageLoader : KoinComponent, CoroutineScope, DisposableHandle {
 			val request = Request.Builder()
 				.url(url)
 				.get()
+				.header("Accept", "image/webp,image/png;q=0.9,image/jpeg,*/*;q=0.8")
 				.cacheControl(CacheUtils.CONTROL_DISABLED)
 				.build()
 			okHttp.newCall(request).await().use { response ->
 				val body = response.body
+				check(response.isSuccessful) {
+					"Invalid response: ${response.code} ${response.message}"
+				}
 				checkNotNull(body) {
 					"Null response"
 				}

app/src/main/java/org/koitharu/kotatsu/ui/search/MangaSuggestionsProvider.kt

@@ -79,7 +79,7 @@ class MangaSuggestionsProvider : SearchRecentSuggestionsProvider() {
 		}
 
 		@JvmStatic
-		fun getItemsCount(context: Context) = getCursor(context)?.count ?: 0
+		fun getItemsCount(context: Context) = getCursor(context)?.use { it.count } ?: 0
 
 		@JvmStatic
 		private fun getCursor(context: Context): Cursor? {

app/src/main/java/org/koitharu/kotatsu/ui/search/SearchActivity.kt

@@ -37,6 +37,11 @@ class SearchActivity : BaseActivity(), SearchView.OnQueryTextListener {
 		}
 	}
 
+	override fun onDestroy() {
+		searchView.suggestionsAdapter?.changeCursor(null) //close cursor
+		super.onDestroy()
+	}
+
 	override fun onQueryTextSubmit(query: String?): Boolean {
 		return if (!query.isNullOrBlank()) {
 			title = query

app/src/main/java/org/koitharu/kotatsu/ui/search/SearchHelper.kt

@@ -8,17 +8,20 @@ import androidx.appcompat.widget.SearchView
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.ui.search.global.GlobalSearchActivity
 import org.koitharu.kotatsu.utils.ext.safe
+import java.io.Closeable
 
 object SearchHelper {
 
 	@JvmStatic
-	fun setupSearchView(menuItem: MenuItem) {
-		val view = menuItem.actionView as? SearchView ?: return
+	fun setupSearchView(menuItem: MenuItem): Closeable? {
+		val view = menuItem.actionView as? SearchView ?: return null
 		val context = view.context
+		val adapter = MangaSuggestionsProvider.getSuggestionAdapter(context)
 		view.queryHint = context.getString(R.string.search_manga)
-		view.suggestionsAdapter = MangaSuggestionsProvider.getSuggestionAdapter(context)
+		view.suggestionsAdapter = adapter
 		view.setOnQueryTextListener(QueryListener(context))
 		view.setOnSuggestionListener(SuggestionListener(view))
+		return adapter?.cursor
 	}
 
 	private class QueryListener(private val context: Context) :

app/src/main/java/org/koitharu/kotatsu/ui/settings/SourceSettingsFragment.kt

@@ -17,17 +17,13 @@ class SourceSettingsFragment : PreferenceFragmentCompat(), KoinComponent {
 		requireArguments().getParcelable<MangaSource>(EXTRA_SOURCE)!!
 	}
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		preferenceManager.sharedPreferencesName = source.name
-	}
-
 	override fun onResume() {
 		super.onResume()
 		activity?.title = source.title
 	}
 
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+		preferenceManager.sharedPreferencesName = source.name
 		val repo = MangaProviderFactory.create(source) as? RemoteMangaRepository ?: return
 		val keys = repo.onCreatePreferences().map(::getString)
 		addPreferencesFromResource(R.xml.pref_source)

app/src/main/java/org/koitharu/kotatsu/utils/ext/CommonExt.kt

@@ -7,7 +7,7 @@ import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.exceptions.EmptyHistoryException
 import org.koitharu.kotatsu.core.exceptions.UnsupportedFileException
-import java.io.IOException
+import java.net.SocketTimeoutException
 
 inline fun <T, R> T.safe(action: T.() -> R?) = try {
 	this.action()
@@ -38,12 +38,8 @@ fun Throwable.getDisplayMessage(resources: Resources) = when (this) {
 	is UnsupportedOperationException -> resources.getString(R.string.operation_not_supported)
 	is UnsupportedFileException -> resources.getString(R.string.text_file_not_supported)
 	is EmptyHistoryException -> resources.getString(R.string.history_is_empty)
-	is IOException -> resources.getString(R.string.network_error)
-	else -> if (BuildConfig.DEBUG) {
-		message ?: resources.getString(R.string.error_occurred)
-	} else {
-		resources.getString(R.string.error_occurred)
-	}
+	is SocketTimeoutException -> resources.getString(R.string.network_error)
+	else -> message ?: resources.getString(R.string.error_occurred)
 }
 
 inline fun <T> measured(tag: String, block: () -> T): T {

app/src/main/java/org/koitharu/kotatsu/utils/ext/ParseExt.kt

@@ -10,13 +10,14 @@ import org.jsoup.select.Elements
 
 fun Response.parseHtml(): Document {
 	try {
-		val stream = body?.byteStream() ?: throw NullPointerException("Response body is null")
-		val charset = body!!.contentType()?.charset()?.name()
-		return Jsoup.parse(
-			stream,
-			charset,
-			request.url.toString()
-		)
+		(body?.byteStream() ?: throw NullPointerException("Response body is null")).use { stream ->
+			val charset = body!!.contentType()?.charset()?.name()
+			return Jsoup.parse(
+				stream,
+				charset,
+				request.url.toString()
+			)
+		}
 	} finally {
 		closeQuietly()
 	}

app/src/main/res/drawable/ic_download.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:width="24dp"
-	android:height="24dp"
-	android:tint="?attr/colorControlNormal"
-	android:viewportWidth="24"
-	android:viewportHeight="24">
-	<path
-		android:fillColor="#000"
-		android:pathData="M13,5V11H14.17L12,13.17L9.83,11H11V5H13M15,3H9V9H5L12,16L19,9H15V3M19,18H5V20H19V18Z" />
-</vector>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:4.2.0-alpha02'
+		classpath 'com.android.tools.build:gradle:4.2.0-alpha04'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
 		// NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Jun 20 11:05:53 EEST 2020
+#Wed Jul 01 18:26:34 EEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip