Merge branch 'master' into devel
This commit is contained in:
@@ -15,8 +15,8 @@ android {
|
||||
applicationId 'org.koitharu.kotatsu'
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 33
|
||||
versionCode 513
|
||||
versionName '4.3.2'
|
||||
versionCode 514
|
||||
versionName '4.3.3'
|
||||
generatedDensities = []
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ class ScrobblingInfoBottomSheet :
|
||||
binding.spinnerStatus.setSelection(scrobbling.status?.ordinal ?: -1)
|
||||
binding.imageViewLogo.contentDescription = getString(scrobbling.scrobbler.titleResId)
|
||||
binding.imageViewLogo.setImageResource(scrobbling.scrobbler.iconResId)
|
||||
binding.imageViewCover.newImageRequest(scrobbling.coverUrl, null)?.apply {
|
||||
binding.imageViewCover.newImageRequest(scrobbling.coverUrl)?.apply {
|
||||
lifecycle(viewLifecycleOwner)
|
||||
placeholder(R.drawable.ic_placeholder)
|
||||
fallback(R.drawable.ic_placeholder)
|
||||
|
||||
@@ -105,6 +105,7 @@ class SourceSettingsFragment : BasePreferenceFragment(0) {
|
||||
}
|
||||
|
||||
private fun resolveError(error: Throwable) {
|
||||
view ?: return
|
||||
viewLifecycleScope.launch {
|
||||
if (exceptionResolver.resolve(error)) {
|
||||
val pref = findPreference<Preference>(KEY_AUTH) ?: return@launch
|
||||
|
||||
Reference in New Issue
Block a user