From 6f712c7f17e8796645512cae33ee17722baef274 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 12 Dec 2020 12:36:29 -0500 Subject: [PATCH] Lint --- .../kanade/tachiyomi/data/backup/legacy/models/Backup.kt | 1 + .../tachiyomi/data/database/tables/CategoryTable.kt | 1 + .../kanade/tachiyomi/data/library/LibraryUpdateService.kt | 6 +++--- .../kanade/tachiyomi/data/preference/PreferenceValues.kt | 2 ++ .../main/java/eu/kanade/tachiyomi/source/LocalSource.kt | 1 - .../main/java/eu/kanade/tachiyomi/source/model/SManga.kt | 1 + .../kanade/tachiyomi/source/online/english/HentaiCafe.kt | 1 + .../eu/kanade/tachiyomi/source/online/english/Pururin.kt | 1 + .../eu/kanade/tachiyomi/ui/browse/BrowseController.kt | 1 + .../eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt | 1 + .../eu/kanade/tachiyomi/ui/library/LibraryController.kt | 2 ++ .../java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt | 1 + .../kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt | 6 ++++++ .../java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt | 1 + .../java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 2 ++ .../tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt | 1 + .../tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt | 1 + .../ui/reader/viewer/webtoon/WebtoonRecyclerView.kt | 1 + app/src/main/java/exh/debug/DebugToggles.kt | 4 ++++ app/src/main/java/exh/eh/EHentaiUpdateWorker.kt | 2 ++ app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt | 1 + app/src/main/java/exh/md/handlers/ApiMangaParser.kt | 2 ++ app/src/main/java/exh/md/handlers/FollowsHandler.kt | 8 ++++---- .../java/exh/metadata/metadata/EHentaiSearchMetadata.kt | 1 + app/src/main/java/exh/source/DelegatedHttpSource.kt | 2 ++ app/src/main/java/exh/source/EnhancedHttpSource.kt | 2 ++ app/src/main/java/exh/uconfig/EHConfigurator.kt | 1 + app/src/main/java/exh/util/FakeMutables.kt | 3 +++ 28 files changed, 49 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt index e95f3d997..40447f978 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/legacy/models/Backup.kt @@ -17,6 +17,7 @@ object Backup { const val EXTENSIONS = "extensions" const val HISTORY = "history" const val VERSION = "version" + // SY --> const val SAVEDSEARCHES = "savedsearches" const val MERGEDMANGAREFERENCES = "mergedmangareferences" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt index 7e47ade67..5ca03b56e 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/tables/CategoryTable.kt @@ -25,6 +25,7 @@ object CategoryTable { $COL_FLAGS INTEGER NOT NULL, $COL_MANGA_ORDER TEXT NOT NULL )""" + // SY --> val addMangaOrder: String get() = "ALTER TABLE $TABLE ADD COLUMN $COL_MANGA_ORDER TEXT" diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt index 90825dd03..f2547abad 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt @@ -91,12 +91,12 @@ class LibraryUpdateService( CHAPTERS, // Manga chapters COVERS, // Manga covers - + TRACKING, // Tracking metadata - + // SY --> SYNC_FOLLOWS, // MangaDex specific, pull mangadex manga in reading, rereading - + PUSH_FAVORITES // MangaDex specific, push mangadex manga to mangadex // SY <-- } diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt index 28e48707f..d84e83042 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferenceValues.kt @@ -29,8 +29,10 @@ object PreferenceValues { enum class DisplayMode { COMPACT_GRID, COMFORTABLE_GRID, + // SY --> NO_TITLE_GRID, + // SY <-- LIST, } diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt index 5ad4a0629..13ea42fdd 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/LocalSource.kt @@ -16,7 +16,6 @@ import eu.kanade.tachiyomi.util.lang.compareToCaseInsensitiveNaturalOrder import eu.kanade.tachiyomi.util.storage.DiskUtil import eu.kanade.tachiyomi.util.storage.EpubFile import eu.kanade.tachiyomi.util.system.ImageUtil -import junrar.rarfile.FileHeader import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString import kotlinx.serialization.json.Json diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt index dad4eb61e..22d0ab4ba 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/SManga.kt @@ -76,6 +76,7 @@ interface SManga : Serializable { const val ONGOING = 1 const val COMPLETED = 2 const val LICENSED = 3 + // SY --> Mangadex specific statuses const val PUBLICATION_COMPLETE = 61 const val CANCELLED = 62 diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HentaiCafe.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HentaiCafe.kt index efdc1c0fb..f18cb7145 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HentaiCafe.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HentaiCafe.kt @@ -30,6 +30,7 @@ class HentaiCafe(delegate: HttpSource, val context: Context) : * An ISO 639-1 compliant language code (two letters in lower case). */ override val lang = "en" + /** * The class of the metadata used by this source */ diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt index e3ca119f3..db8411195 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/Pururin.kt @@ -33,6 +33,7 @@ class Pururin(delegate: HttpSource, val context: Context) : * An ISO 639-1 compliant language code (two letters in lower case). */ override val lang = "en" + /** * The class of the metadata used by this source */ diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt index db966a429..409f685c5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/BrowseController.kt @@ -162,6 +162,7 @@ class BrowseController : const val TO_EXTENSIONS_EXTRA = "to_extensions" const val SOURCES_CONTROLLER = 0 + // SY --> const val LATEST_CONTROLLER = 1 const val EXTENSIONS_CONTROLLER = 2 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt index 545f0fd8a..98cfcdadf 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryCategoryView.kt @@ -373,6 +373,7 @@ class LibraryCategoryView @JvmOverloads constructor(context: Context, attrs: Att } lastClickPosition = position } + // SY --> private fun getGroupExtra() = when (controller.presenter.groupType) { LibraryGroup.BY_DEFAULT -> null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 6896a4a9b..72daacf02 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -144,8 +144,10 @@ class LibraryController( // --> EH // Sync dialog private var favSyncDialog: MaterialDialog? = null + // Old sync status private var oldSyncStatus: FavoritesSyncStatus? = null + // Favorites private var favoritesSyncJob: Job? = null val loaderManager = LoaderManager() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt index d1eeac00a..d92bf4be7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryItem.kt @@ -33,6 +33,7 @@ class LibraryItem(val manga: LibraryManga, private val libraryDisplayMode: Prefe AbstractFlexibleItem>(), IFilterable> { private val sourceManager: SourceManager = Injekt.get() + // SY --> private val trackManager: TrackManager = Injekt.get() private val db: DatabaseHelper = Injekt.get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt index dd18f98a5..dbae9957c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySettingsSheet.kt @@ -87,6 +87,7 @@ class LibrarySettingsSheet( private val lewd = Item.TriStateGroup(R.string.lewd, this) override val header = null + // SY --> override val items = ( if (Injekt.get().hasLoggedServices()) { @@ -95,6 +96,7 @@ class LibrarySettingsSheet( listOf(downloaded, unread, completed, started, lewd) } ) + // SY <-- override val footer = null @@ -166,12 +168,14 @@ class LibrarySettingsSheet( private val unread = Item.MultiSort(R.string.action_filter_unread, this) private val latestChapter = Item.MultiSort(R.string.action_sort_latest_chapter, this) private val dateAdded = Item.MultiSort(R.string.action_sort_date_added, this) + // SY --> private val dragAndDrop = Item.MultiSort(R.string.action_sort_drag_and_drop, this) private val tagList = Item.MultiSort(R.string.tag_sorting, this) // SY <-- override val header = null + override val items = listOf(alphabetically, lastRead, lastChecked, unread, total, latestChapter, dateAdded /* SY --> */, dragAndDrop) + if (preferences.sortTagsForLibrary().get().isNotEmpty()) listOf(tagList) else emptyList() /* SY <-- */ override val footer = null @@ -266,8 +270,10 @@ class LibrarySettingsSheet( private val compactGrid = Item.Radio(R.string.action_display_grid, this) private val comfortableGrid = Item.Radio(R.string.action_display_comfortable_grid, this) + // SY --> private val noTitleGrid = Item.Radio(R.string.action_display_no_title_grid, this) + // SY <-- private val list = Item.Radio(R.string.action_display_list, this) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt index f4cfe06ec..e99a8d651 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibrarySort.kt @@ -9,6 +9,7 @@ object LibrarySort { const val TOTAL = 4 const val LATEST_CHAPTER = 6 const val DATE_ADDED = 8 + // SY --> const val DRAG_AND_DROP = 7 const val TAG_LIST = 9 diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 0de76bec4..e5b80027b 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -182,10 +182,12 @@ class MangaController : private val toolbarTextColor by lazy { view!!.context.getResourceColor(R.attr.colorOnPrimary) } private var mangaInfoAdapter: MangaInfoHeaderAdapter? = null + // SY >-- private var mangaInfoItemAdapter: MangaInfoItemAdapter? = null private var mangaInfoButtonsAdapter: MangaInfoButtonsAdapter? = null private var mangaMetaInfoAdapter: RecyclerView.Adapter<*>? = null + // SY <-- private var chaptersHeaderAdapter: MangaChaptersHeaderAdapter? = null private var chaptersAdapter: ChaptersAdapter? = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt index ae12afa98..82c3cc651 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoHeaderAdapter.kt @@ -41,6 +41,7 @@ class MangaInfoHeaderAdapter( RecyclerView.Adapter() { private val trackManager: TrackManager by injectLazy() + // SY --> private val db: DatabaseHelper by injectLazy() private val sourceManager: SourceManager by injectLazy() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt index e828d5812..e26972cd8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt @@ -20,6 +20,7 @@ class WebtoonConfig(preferences: PreferencesHelper = Injekt.get()) : ViewerConfi var enableZoomOut = false private set var zoomPropertyChangedListener: ((Boolean) -> Unit)? = null + // SY <-- init { preferences.cropBordersWebtoon() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt index 46e0e1066..3c537fc8f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonRecyclerView.kt @@ -33,6 +33,7 @@ open class WebtoonRecyclerView @JvmOverloads constructor( private var firstVisibleItemPosition = 0 private var lastVisibleItemPosition = 0 private var currentScale = DEFAULT_RATE + // SY --> var canZoomOut = false set(value) { diff --git a/app/src/main/java/exh/debug/DebugToggles.kt b/app/src/main/java/exh/debug/DebugToggles.kt index 2032f01bc..b78e85188 100644 --- a/app/src/main/java/exh/debug/DebugToggles.kt +++ b/app/src/main/java/exh/debug/DebugToggles.kt @@ -7,12 +7,16 @@ import java.util.Locale enum class DebugToggles(val default: Boolean) { // Redirect to master version of gallery when encountering a gallery that has a parent/child that is already in the library ENABLE_EXH_ROOT_REDIRECT(true), + // Enable debug overlay (only available in debug builds) ENABLE_DEBUG_OVERLAY(true), + // Convert non-root galleries into root galleries when loading them PULL_TO_ROOT_WHEN_LOADING_EXH_MANGA_DETAILS(true), + // Do not update the same gallery too often RESTRICT_EXH_GALLERY_UPDATE_CHECK_FREQUENCY(true), + // Pretend that all galleries only have a single version INCLUDE_ONLY_ROOT_WHEN_LOADING_EXH_VERSIONS(false); diff --git a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt index cb172c403..f069226c4 100644 --- a/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt +++ b/app/src/main/java/exh/eh/EHentaiUpdateWorker.kt @@ -266,6 +266,7 @@ class EHentaiUpdateWorker : JobService(), CoroutineScope { db.insertManga(manga).await() val newChapters = source.fetchChapterList(manga).awaitSingle() + val (new, _) = syncChaptersWithSource(db, newChapters, manga, source) // Not suspending, but does block, maybe fix this? return new to db.getChapters(manga).await() } catch (t: Throwable) { @@ -386,6 +387,7 @@ data class UpdateEntry(val manga: Manga, val meta: EHentaiSearchMetadata, val ro object EHentaiUpdateWorkerConstants { const val UPDATES_PER_ITERATION = 50 + @OptIn(ExperimentalTime::class) val GALLERY_AGE_TIME = 365.days.toLongMilliseconds() } diff --git a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt index aeb8d3c5e..8af515599 100644 --- a/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt +++ b/app/src/main/java/exh/eh/MemAutoFlushingLookupTable.kt @@ -52,6 +52,7 @@ class MemAutoFlushingLookupTable( // Used to debounce @Volatile private var writeCounter = Long.MIN_VALUE + @Volatile private var flushed = true diff --git a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt index b29f2b119..ab27f69ad 100644 --- a/app/src/main/java/exh/md/handlers/ApiMangaParser.kt +++ b/app/src/main/java/exh/md/handlers/ApiMangaParser.kt @@ -31,6 +31,7 @@ class ApiMangaParser(private val langs: List) { val db: DatabaseHelper get() = Injekt.get() val metaClass = MangaDexSearchMetadata::class + /** * Use reflection to create a new instance of metadata */ @@ -38,6 +39,7 @@ class ApiMangaParser(private val langs: List) { it.parameters.isEmpty() }?.call() ?: error("Could not find no-args constructor for meta class: ${metaClass.qualifiedName}!") + /** * Parses metadata from the input and then copies it into the manga * diff --git a/app/src/main/java/exh/md/handlers/FollowsHandler.kt b/app/src/main/java/exh/md/handlers/FollowsHandler.kt index 9bb49ec42..bb5ac761c 100644 --- a/app/src/main/java/exh/md/handlers/FollowsHandler.kt +++ b/app/src/main/java/exh/md/handlers/FollowsHandler.kt @@ -71,8 +71,8 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere return MetadataMangasPage(result.map { it.first }, false, result.map { it.second }) } - /**fetch follow status used when fetching status for 1 manga - * + /** + * fetch follow status used when fetching status for 1 manga */ private fun followStatusParse(response: Response): Track { @@ -99,8 +99,8 @@ class FollowsHandler(val client: OkHttpClient, val headers: Headers, val prefere return track } - /**build Request for follows page - * + /** + * build Request for follows page */ private fun followsListRequest(): Request { return GET("${MdUtil.baseUrl}${MdUtil.followsAllApi}", headers, CacheControl.FORCE_NETWORK) diff --git a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt index 428e412f2..23b29ef86 100644 --- a/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt +++ b/app/src/main/java/exh/metadata/metadata/EHentaiSearchMetadata.kt @@ -29,6 +29,7 @@ class EHentaiSearchMetadata : RaisedSearchMetadata() { var datePosted: Long? = null var parent: String? = null + var visible: String? = null // Not a boolean var language: String? = null var translated: Boolean? = null diff --git a/app/src/main/java/exh/source/DelegatedHttpSource.kt b/app/src/main/java/exh/source/DelegatedHttpSource.kt index 2829ca421..3cefcffc1 100644 --- a/app/src/main/java/exh/source/DelegatedHttpSource.kt +++ b/app/src/main/java/exh/source/DelegatedHttpSource.kt @@ -108,6 +108,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() { * Whether the source has support for latest updates. */ override val supportsLatest get() = delegate.supportsLatest + /** * Name of the source. */ @@ -121,6 +122,7 @@ abstract class DelegatedHttpSource(val delegate: HttpSource) : HttpSource() { * Note the generated id sets the sign bit to 0. */ override val id get() = delegate.id + /** * Default network client for doing requests. */ diff --git a/app/src/main/java/exh/source/EnhancedHttpSource.kt b/app/src/main/java/exh/source/EnhancedHttpSource.kt index 2e3e0533a..7b566c594 100644 --- a/app/src/main/java/exh/source/EnhancedHttpSource.kt +++ b/app/src/main/java/exh/source/EnhancedHttpSource.kt @@ -113,6 +113,7 @@ class EnhancedHttpSource( * Whether the source has support for latest updates. */ override val supportsLatest get() = source().supportsLatest + /** * Name of the source. */ @@ -131,6 +132,7 @@ class EnhancedHttpSource( * Note the generated id sets the sign bit to 0. */ override val id get() = source().id + /** * Default network client for doing requests. */ diff --git a/app/src/main/java/exh/uconfig/EHConfigurator.kt b/app/src/main/java/exh/uconfig/EHConfigurator.kt index 959242714..0bfe2f985 100644 --- a/app/src/main/java/exh/uconfig/EHConfigurator.kt +++ b/app/src/main/java/exh/uconfig/EHConfigurator.kt @@ -158,6 +158,7 @@ class EHConfigurator(val context: Context) { companion object { private const val PROFILE_NAME = "TachiyomiEH App" private const val UCONFIG_URL = "/uconfig.php" + // Always use E-H here as EXH does not have a perks page private const val HATH_PERKS_URL = "https://e-hentai.org/hathperks.php" private const val PROFILE_SELECTOR = "[name=profile_set] > option" diff --git a/app/src/main/java/exh/util/FakeMutables.kt b/app/src/main/java/exh/util/FakeMutables.kt index e8d2d268c..a5c1677cc 100644 --- a/app/src/main/java/exh/util/FakeMutables.kt +++ b/app/src/main/java/exh/util/FakeMutables.kt @@ -131,6 +131,7 @@ private inline class EntryShim(private val entry: Map.Entry) : FakeM */ override val key: K get() = entry.key + /** * Returns the value of this key/value pair. */ @@ -143,6 +144,7 @@ private inline class PairShim(private val pair: Pair) : FakeMutableE * Returns the key of this key/value pair. */ override val key: K get() = pair.first + /** * Returns the value of this key/value pair. */ @@ -164,6 +166,7 @@ interface FakeMutableEntry : MutableMap.MutableEntry { * Returns the key of this key/value pair. */ override val key: K = key + /** * Returns the value of this key/value pair. */