Checking for updates in settings

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

@@ -76,7 +76,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
 			return
 		}
 		TrackWorker.setup(applicationContext)
-		AppUpdateChecker(this).invoke()
+		AppUpdateChecker(this).launchIfNeeded()
 	}
 
 	override fun onDestroy() {

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

@@ -96,7 +96,7 @@ class MangaSuggestionsProvider : SearchRecentSuggestionsProvider() {
 						uri,
 						projection,
 						" ?",
-						arrayOf(q.toString()),
+						arrayOf(q?.toString().orEmpty()),
 						null
 					)
 				}

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

@@ -8,8 +8,8 @@ import android.net.Uri
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import org.koin.android.ext.android.inject
 import org.koitharu.kotatsu.BuildConfig
@@ -35,29 +35,38 @@ class AppUpdateChecker(private val activity: ComponentActivity) {
 	private val settings by activity.inject<AppSettings>()
 	private val repo by activity.inject<GithubRepository>()
 
-	operator fun invoke() {
+	fun launchIfNeeded(): Job? {
-		if (isUpdateSupported(activity) && settings.appUpdateAuto && settings.appUpdate + PERIOD < System.currentTimeMillis()) {
+		return if (settings.appUpdateAuto && settings.appUpdate + PERIOD < System.currentTimeMillis()) {
 			launch()
+		} else {
+			null
 		}
 	}
 
-	private fun launch() = activity.lifecycleScope.launch(Dispatchers.Main) {
+	fun launch(): Job? {
-		try {
+		return if (isUpdateSupported(activity)) {
-			val version = repo.getLatestVersion()
+			launchInternal()
-			val newVersionId = VersionId.parse(version.name)
+		} else {
-			val currentVersionId = VersionId.parse(BuildConfig.VERSION_NAME)
+			null
-			if (newVersionId > currentVersionId) {
-				showUpdateDialog(version)
-			}
-			settings.appUpdate = System.currentTimeMillis()
-		} catch (_: CancellationException) {
-		} catch (e: Throwable) {
-			if (BuildConfig.DEBUG) {
-				e.printStackTrace()
-			}
 		}
 	}
 
+	suspend fun checkNow() = runCatching {
+		val version = repo.getLatestVersion()
+		val newVersionId = VersionId.parse(version.name)
+		val currentVersionId = VersionId.parse(BuildConfig.VERSION_NAME)
+		val result = newVersionId > currentVersionId
+		if (result) {
+			showUpdateDialog(version)
+		}
+		settings.appUpdate = System.currentTimeMillis()
+		result
+	}.getOrNull()
+
+	private fun launchInternal() = activity.lifecycleScope.launch(Dispatchers.Main) {
+		checkNow()
+	}
+
 	private fun showUpdateDialog(version: AppVersion) {
 		MaterialAlertDialogBuilder(activity)
 			.setTitle(R.string.app_update_available)

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

@@ -1,7 +1,6 @@
 package org.koitharu.kotatsu.ui.settings
 
 import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
 import androidx.preference.Preference
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
@@ -16,6 +15,7 @@ import org.koitharu.kotatsu.ui.search.MangaSuggestionsProvider
 import org.koitharu.kotatsu.utils.CacheUtils
 import org.koitharu.kotatsu.utils.FileSizeUtils
 import org.koitharu.kotatsu.utils.ext.getDisplayMessage
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 
 class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cache) {
 
@@ -24,7 +24,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.pref_history)
 		findPreference<Preference>(R.string.key_pages_cache_clear)?.let { pref ->
-			lifecycleScope.launchWhenResumed {
+			viewLifecycleScope.launchWhenResumed {
 				val size = withContext(Dispatchers.IO) {
 					CacheUtils.computeCacheSize(pref.context, Cache.PAGES.dir)
 				}
@@ -32,7 +32,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 			}
 		}
 		findPreference<Preference>(R.string.key_thumbs_cache_clear)?.let { pref ->
-			lifecycleScope.launchWhenResumed {
+			viewLifecycleScope.launchWhenResumed {
 				val size = withContext(Dispatchers.IO) {
 					CacheUtils.computeCacheSize(pref.context, Cache.THUMBS.dir)
 				}
@@ -44,7 +44,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 			p.summary = p.context.resources.getQuantityString(R.plurals.items, items, items)
 		}
 		findPreference<Preference>(R.string.key_updates_feed_clear)?.let { p ->
-			lifecycleScope.launchWhenResumed {
+			viewLifecycleScope.launchWhenResumed {
 				val items = trackerRepo.count()
 				p.summary = p.context.resources.getQuantityString(R.plurals.items, items, items)
 			}
@@ -73,7 +73,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 				true
 			}
 			getString(R.string.key_updates_feed_clear) -> {
-				lifecycleScope.launch {
+				viewLifecycleScope.launch {
 					trackerRepo.clearLogs()
 					preference.summary = preference.context.resources
 						.getQuantityString(R.plurals.items, 0, 0)
@@ -91,7 +91,7 @@ class HistorySettingsFragment : BasePreferenceFragment(R.string.history_and_cach
 
 	private fun clearCache(preference: Preference, cache: Cache) {
 		val ctx = preference.context.applicationContext
-		lifecycleScope.launch {
+		viewLifecycleScope.launch {
 			try {
 				preference.isEnabled = false
 				val size = withContext(Dispatchers.IO) {

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

@@ -12,6 +12,8 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.collection.arrayMapOf
 import androidx.preference.*
 import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.launch
+import org.koitharu.kotatsu.BuildConfig
 import org.koitharu.kotatsu.R
 import org.koitharu.kotatsu.core.model.MangaSource
 import org.koitharu.kotatsu.core.prefs.ListMode
@@ -23,6 +25,7 @@ import org.koitharu.kotatsu.ui.settings.utils.MultiSummaryProvider
 import org.koitharu.kotatsu.ui.tracker.TrackWorker
 import org.koitharu.kotatsu.utils.ext.getStorageName
 import org.koitharu.kotatsu.utils.ext.md5
+import org.koitharu.kotatsu.utils.ext.viewLifecycleScope
 import java.io.File
 
 
@@ -54,6 +57,10 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 		}
 		findPreference<SwitchPreference>(R.string.key_protect_app)?.isChecked =
 			!settings.appPassword.isNullOrEmpty()
+		findPreference<Preference>(R.string.key_app_version)?.run {
+			title = getString(R.string.app_version, BuildConfig.VERSION_NAME)
+			isEnabled = AppUpdateChecker.isUpdateSupported(context)
+		}
 	}
 
 	override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
@@ -126,6 +133,10 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 				}
 				true
 			}
+			getString(R.string.key_app_version) -> {
+				checkForUpdates()
+				true
+			}
 			else -> super.onPreferenceTreeClick(preference)
 		}
 	}
@@ -184,6 +195,26 @@ class MainSettingsFragment : BasePreferenceFragment(R.string.settings),
 			.show()
 	}
 
+	private fun checkForUpdates() {
+		viewLifecycleScope.launch {
+			findPreference<Preference>(R.string.key_app_version)?.run {
+				setSummary(R.string.checking_for_updates)
+				isSelectable = false
+			}
+			val result = AppUpdateChecker(activity ?: return@launch).checkNow()
+			findPreference<Preference>(R.string.key_app_version)?.run {
+				setSummary(
+					when (result) {
+						true -> R.string.check_for_updates
+						false -> R.string.no_update_available
+						null -> R.string.update_check_failed
+					}
+				)
+				isSelectable = true
+			}
+		}
+	}
+
 	private companion object {
 
 		val LIST_MODES = arrayMapOf(

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

@@ -2,10 +2,14 @@ package org.koitharu.kotatsu.utils.ext
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import androidx.lifecycle.coroutineScope
 
 inline fun <T : Fragment> T.withArgs(size: Int, block: Bundle.() -> Unit): T {
 	val b = Bundle(size)
 	b.block()
 	this.arguments = b
 	return this
-}
+}
+
+val Fragment.viewLifecycleScope
+	get() = viewLifecycleOwner.lifecycle.coroutineScope

app/src/main/res/values-ru/strings.xml

@@ -96,7 +96,7 @@
 	<string name="external_storage">Внешнее хранилище</string>
 	<string name="domain">Домен</string>
 	<string name="_default">По умолчанию</string>
-	<string name="application_update">Обновление приложения</string>
+	<string name="application_update">Проверять обновление приложения</string>
 	<string name="app_update_available">Доступно обновление приложения</string>
 	<string name="show_notification_app_update">Показывать уведомление при наличии новой версии</string>
 	<string name="open_in_browser">Открыть в браузере</string>
@@ -153,4 +153,10 @@
 	<string name="protect_application_summary">Запрашивать пароль при запуске приложения</string>
 	<string name="repeat_password">Повторите пароль</string>
 	<string name="passwords_mismatch">Пароли не совпадают</string>
+	<string name="about">О программе</string>
+	<string name="app_version">Версия %s</string>
+	<string name="check_for_updates">Проверить обновления</string>
+	<string name="checking_for_updates">Проверка обновления…</string>
+	<string name="update_check_failed">Ошибка при проверке обновления</string>
+	<string name="no_update_available">Нет доступных обновлений</string>
 </resources>

app/src/main/res/values/constants.xml

@@ -25,6 +25,7 @@
 	<string name="key_reader_animation">reader_animation</string>
 	<string name="key_app_password">app_password</string>
 	<string name="key_protect_app">protect_app</string>
+	<string name="key_app_version">app_version</string>
 
 	<string name="key_parser_domain">domain</string>
 	<string name="key_parser_ssl">ssl</string>

app/src/main/res/values/strings.xml

@@ -97,7 +97,7 @@
 	<string name="external_storage">External storage</string>
 	<string name="domain">Domain</string>
 	<string name="_default">Default</string>
-	<string name="application_update">Application update</string>
+	<string name="application_update">Check for updates automatically</string>
 	<string name="app_update_available">Application update is available</string>
 	<string name="show_notification_app_update">Show notification if update is available</string>
 	<string name="open_in_browser">Open in browser</string>
@@ -154,4 +154,10 @@
 	<string name="protect_application_summary">Ask for password on application start</string>
 	<string name="repeat_password">Repeat password</string>
 	<string name="passwords_mismatch">Passwords do not match</string>
+	<string name="about">About</string>
+	<string name="app_version">Version %s</string>
+	<string name="check_for_updates">Check for updates</string>
+	<string name="checking_for_updates">Checking for updates…</string>
+	<string name="update_check_failed">Update check failed</string>
+	<string name="no_update_available">No updates available</string>
 </resources>

app/src/main/res/xml/pref_main.xml

@@ -71,7 +71,7 @@
 		app:iconSpaceReserved="false" />
 
 	<PreferenceCategory
-		android:title="@string/notifications"
+		android:title="@string/new_chapters"
 		app:allowDividerAbove="true"
 		app:iconSpaceReserved="false">
 
@@ -87,7 +87,7 @@
 			android:defaultValue="true"
 			android:key="@string/key_tracker_notifications"
 			android:summary="@string/show_notification_new_chapters"
-			android:title="@string/new_chapters"
+			android:title="@string/notifications"
 			app:iconSpaceReserved="false" />
 
 		<Preference
@@ -96,6 +96,12 @@
 			android:title="@string/notifications_settings"
 			app:iconSpaceReserved="false" />
 
+	</PreferenceCategory>
+
+	<PreferenceCategory
+		android:title="@string/about"
+		app:iconSpaceReserved="false">
+
 		<SwitchPreference
 			android:defaultValue="true"
 			android:key="@string/key_app_update_auto"
@@ -105,6 +111,12 @@
 			app:isPreferenceVisible="false"
 			tools:isPreferenceVisible="true" />
 
+		<Preference
+			android:key="@string/key_app_version"
+			android:persistent="false"
+			android:summary="@string/check_for_updates"
+			app:iconSpaceReserved="false" />
+
 	</PreferenceCategory>
 
 </PreferenceScreen>