Draff
/
Tachiyomi-Extensions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to new ssl variable (#6917) 

update wording for content rating prefs
This commit is contained in:
Carlos 2021-05-08 21:00:38 -04:00 committed by GitHub
parent 050c71a011
commit 86d0c8eb12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/all/mangadex/build.gradle
View File

@ -5,7 +5,7 @@ ext {
extName = 'MangaDex' extName = 'MangaDex'
pkgNameSuffix = 'all.mangadex' pkgNameSuffix = 'all.mangadex'
extClass = '.MangaDexFactory' extClass = '.MangaDexFactory'
extVersionCode = 108 extVersionCode = 109
libVersion = '1.2' libVersion = '1.2'
containsNsfw = true containsNsfw = true
} }

1
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MDConstants.kt
View File

@ -36,7 +36,6 @@ object MDConstants {
return "${standardHttpsPortPref}_$dexLang" return "${standardHttpsPortPref}_$dexLang"
} }
const val showByDefaultPrefTitle = "Show only by default"
private const val contentRatingSafePref = "contentRatingSafe" private const val contentRatingSafePref = "contentRatingSafe"

18
src/all/mangadex/src/eu/kanade/tachiyomi/extension/all/mangadex/MangaDex.kt
View File

@ -260,7 +260,7 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
preferences.getBoolean(MDConstants.getStandardHttpsPreferenceKey(dexLang), false) preferences.getBoolean(MDConstants.getStandardHttpsPreferenceKey(dexLang), false)
val atHomeRequestUrl = if (usingStandardHTTPS) { val atHomeRequestUrl = if (usingStandardHTTPS) {
"${MDConstants.apiUrl}/at-home/server/${chapterJson["id"].string}?ssl=true" "${MDConstants.apiUrl}/at-home/server/${chapterJson["id"].string}?forcePort443=true"
} else { } else {
"${MDConstants.apiUrl}/at-home/server/${chapterJson["id"].string}" "${MDConstants.apiUrl}/at-home/server/${chapterJson["id"].string}"
} }
@ -324,8 +324,8 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val contentRatingSafePref = SwitchPreferenceCompat(screen.context).apply { val contentRatingSafePref = SwitchPreferenceCompat(screen.context).apply {
key = MDConstants.getContentRatingSafePrefKey(dexLang) key = MDConstants.getContentRatingSafePrefKey(dexLang)
title = MDConstants.showByDefaultPrefTitle title = "Safe"
summary = "Content Rating: Safe" summary = "If enabled, shows content with the rating of safe (manga without any sexual themes)"
setDefaultValue(true) setDefaultValue(true)
setOnPreferenceChangeListener { _, newValue -> setOnPreferenceChangeListener { _, newValue ->
@ -338,8 +338,8 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val contentRatingSuggestivePref = SwitchPreferenceCompat(screen.context).apply { val contentRatingSuggestivePref = SwitchPreferenceCompat(screen.context).apply {
key = MDConstants.getContentRatingSuggestivePrefKey(dexLang) key = MDConstants.getContentRatingSuggestivePrefKey(dexLang)
title = MDConstants.showByDefaultPrefTitle title = "Suggestive"
summary = "Content Rating: Suggestive" summary = "If enabled, shows content with the rating of suggestive (manga usually tagged as ecchi)"
setDefaultValue(true) setDefaultValue(true)
setOnPreferenceChangeListener { _, newValue -> setOnPreferenceChangeListener { _, newValue ->
@ -352,8 +352,8 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val contentRatingEroticaPref = SwitchPreferenceCompat(screen.context).apply { val contentRatingEroticaPref = SwitchPreferenceCompat(screen.context).apply {
key = MDConstants.getContentRatingEroticaPrefKey(dexLang) key = MDConstants.getContentRatingEroticaPrefKey(dexLang)
title = MDConstants.showByDefaultPrefTitle title = "Erotica"
summary = "Content Rating: Erotica" summary = "If enabled, shows content with the rating of erotica (manga usually tagged as smut)"
setDefaultValue(false) setDefaultValue(false)
setOnPreferenceChangeListener { _, newValue -> setOnPreferenceChangeListener { _, newValue ->
@ -366,8 +366,8 @@ abstract class MangaDex(override val lang: String, val dexLang: String) :
val contentRatingPornographicPref = SwitchPreferenceCompat(screen.context).apply { val contentRatingPornographicPref = SwitchPreferenceCompat(screen.context).apply {
key = MDConstants.getContentRatingPornographicPrefKey(dexLang) key = MDConstants.getContentRatingPornographicPrefKey(dexLang)
title = MDConstants.showByDefaultPrefTitle title = "Pornographic"
summary = "Content Rating: Pornographic" summary = "If enabled, shows content with the rating of pornographic (manga usually tagged as hentai)"
setDefaultValue(false) setDefaultValue(false)
setOnPreferenceChangeListener { _, newValue -> setOnPreferenceChangeListener { _, newValue ->