Merge branch 'master' into devel

app/build.gradle

@@ -15,8 +15,8 @@ android {
 		applicationId 'org.koitharu.kotatsu'
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 546
-		versionName '5.1.2'
+		versionCode 547
+		versionName '5.1.3'
 		generatedDensities = []
 		testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -79,7 +79,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.KotatsuApp:kotatsu-parsers:ebcc6391d6') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:fa7ea5b16a') {
 		exclude group: 'org.json', module: 'json'
 	}
 
@@ -88,7 +88,7 @@ dependencies {
 
 	implementation 'androidx.appcompat:appcompat:1.6.1'
 	implementation 'androidx.core:core-ktx:1.10.1'
-	implementation 'androidx.activity:activity-ktx:1.7.1'
+	implementation 'androidx.activity:activity-ktx:1.7.2'
 	implementation 'androidx.fragment:fragment-ktx:1.5.7'
 	implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
 	implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
@@ -97,7 +97,7 @@ dependencies {
 	implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 	implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 	implementation 'androidx.recyclerview:recyclerview:1.3.0'
-	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta01'
+	implementation 'androidx.viewpager2:viewpager2:1.1.0-beta02'
 	implementation 'androidx.preference:preference-ktx:1.2.0'
 	implementation 'androidx.biometric:biometric-ktx:1.2.0-alpha05'
 	implementation 'com.google.android.material:material:1.9.0'
@@ -137,7 +137,7 @@ dependencies {
 	implementation 'ch.acra:acra-http:5.9.7'
 	implementation 'ch.acra:acra-dialog:5.9.7'
 
-	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+	debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.11'
 
 	testImplementation 'junit:junit:4.13.2'
 	testImplementation 'org.json:json:20230227'

app/src/debug/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -17,7 +17,7 @@ import java.util.EnumSet
 class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("", null)
+		get() = ConfigKey.Domain()
 
 	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)

app/src/main/kotlin/org/koitharu/kotatsu/settings/SourceSettingsExt.kt

@@ -19,10 +19,12 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 		val preference: Preference = when (key) {
 			is ConfigKey.Domain -> {
 				val presetValues = key.presetValues
-				if (presetValues.isNullOrEmpty()) {
+				if (presetValues.size <= 1) {
 					EditTextPreference(requireContext())
 				} else {
-					AutoCompleteTextViewPreference(requireContext()).apply { entries = presetValues }
+					AutoCompleteTextViewPreference(requireContext()).apply {
+						entries = presetValues.toStringArray()
+					}
 				}.apply {
 					summaryProvider = EditTextDefaultSummaryProvider(key.defaultValue)
 					setOnBindEditTextListener(
@@ -64,3 +66,7 @@ fun PreferenceFragmentCompat.addPreferencesFromRepository(repository: RemoteMang
 		screen.addPreference(preference)
 	}
 }
+
+private fun Array<out String>.toStringArray(): Array<String> {
+	return Array(size) { i -> this[i] as? String ?: "" }
+}

app/src/release/java/org/koitharu/kotatsu/core/parser/DummyParser.kt

@@ -15,7 +15,7 @@ import java.util.EnumSet
 class DummyParser(context: MangaLoaderContext) : MangaParser(context, MangaSource.DUMMY) {
 
 	override val configKeyDomain: ConfigKey.Domain
-		get() = ConfigKey.Domain("localhost", null)
+		get() = ConfigKey.Domain("localhost")
 
 	override val sortOrders: Set<SortOrder>
 		get() = EnumSet.allOf(SortOrder::class.java)