Merge branch 'recloudstream:master' into master

This commit is contained in:
antonydp 2022-08-23 18:57:32 +02:00 committed by GitHub
commit d5f6f38ca8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -101,9 +101,11 @@ class SettingsLang : PreferenceFragmentCompat() {
val names = enumValues<TvType>().sorted().map { it.name } val names = enumValues<TvType>().sorted().map { it.name }
val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }.map { it.ordinal } val default = enumValues<TvType>().sorted().filter { it != TvType.NSFW }.map { it.ordinal }
val defaultSet = default.map { it.toString() }.toSet() val defaultSet = default.map { it.toString() }.toSet()
val currentList = settingsManager.getStringSet(getString(R.string.prefer_media_type_key), defaultSet)?.map { val currentList = try {
settingsManager.getStringSet(getString(R.string.prefer_media_type_key), defaultSet)?.map {
it.toInt() it.toInt()
} ?: default }
} catch (e: Throwable) { null } ?: default
activity?.showMultiDialog( activity?.showMultiDialog(
names, names,