From 6bd564823a4f96a8d10e241698e23f3a1fb35e31 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Sat, 20 Jun 2020 16:55:05 -0400 Subject: [PATCH] More comments and simple tweaks --- .../data/backup/BackupRestoreService.kt | 8 +--- .../tachiyomi/data/database/DatabaseHelper.kt | 2 +- .../tachiyomi/data/database/DbOpenCallback.kt | 2 +- .../data/library/LibraryUpdateService.kt | 2 + .../data/preference/PreferencesHelper.kt | 2 +- .../kanade/tachiyomi/network/NetworkHelper.kt | 10 ++--- .../kanade/tachiyomi/source/SourceManager.kt | 2 - .../eu/kanade/tachiyomi/source/model/Page.kt | 5 +-- .../details/ExtensionDetailsHeaderAdapter.kt | 2 + .../migration/search/SearchController.kt | 45 ++++++++----------- .../java/exh/favorites/FavoritesSyncHelper.kt | 4 +- 11 files changed, 36 insertions(+), 48 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt index 44d9f7276..76475581d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/backup/BackupRestoreService.kt @@ -293,9 +293,7 @@ class BackupRestoreService : Service() { // SY <-- private fun restoreManga(mangaJson: JsonObject) { - // SY --> - var manga = backupManager.parser.fromJson(mangaJson.get(MANGA)) - // SY <-- + /* SY --> */ var /* SY <-- */ manga = backupManager.parser.fromJson(mangaJson.get(MANGA)) val chapters = backupManager.parser.fromJson>( mangaJson.get(CHAPTERS) ?: JsonArray() @@ -451,9 +449,7 @@ class BackupRestoreService : Service() { * @return [Observable] that contains manga */ private fun chapterFetchObservable(source: Source, manga: Manga, chapters: List): Observable, List>> { - // SY --> - return backupManager.restoreChapterFetchObservable(source, manga, chapters, throttleManager) - // SY <-- + return backupManager.restoreChapterFetchObservable(source, manga, chapters /* SY --> */, throttleManager /* SY <-- */) // If there's any error, return empty update and continue. .onErrorReturn { errors.add(Date() to "${manga.title} - ${it.message}") diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt index eacc2eba4..173742acb 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DatabaseHelper.kt @@ -36,7 +36,7 @@ import io.requery.android.database.sqlite.RequerySQLiteOpenHelperFactory * This class provides operations to manage the database through its interfaces. */ open class DatabaseHelper(context: Context) : - MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries, /* EXH --> */ SearchMetadataQueries, SearchTagQueries, SearchTitleQueries /* EXH <-- */ { + MangaQueries, ChapterQueries, TrackQueries, CategoryQueries, MangaCategoryQueries, HistoryQueries /* EXH --> */, SearchMetadataQueries, SearchTagQueries, SearchTitleQueries /* EXH <-- */ { private val configuration = SupportSQLiteOpenHelper.Configuration.builder(context) .name(DbOpenCallback.DATABASE_NAME) diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt index 92c3c5ca1..6c4ef1d4a 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/DbOpenCallback.kt @@ -24,7 +24,7 @@ class DbOpenCallback : SupportSQLiteOpenHelper.Callback(DATABASE_VERSION) { /** * Version of the database. */ - const val DATABASE_VERSION = 2 // [SY] + const val DATABASE_VERSION = /* SY --> */ 2 /* SY <-- */ } override fun onCreate(db: SupportSQLiteDatabase) = with(db) { 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 88c6ab125..94b7d9d8b 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 @@ -266,10 +266,12 @@ class LibraryUpdateService( .doOnNext { notifier.showProgressNotification(it, count.andIncrement, mangaToUpdate.size) } // Update the chapters of the manga .concatMap { manga -> + // SY --> if (manga.source in LIBRARY_UPDATE_EXCLUDED_SOURCES) { // Ignore EXH manga, updating chapters for every manga will get you banned Observable.empty() } else { + // SY <-- updateManga(manga) // If there's any error, return empty update and continue. .onErrorReturn { diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt index 509e39fb2..847c2f033 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt @@ -103,7 +103,7 @@ class PreferencesHelper(val context: Context) { fun colorFilterMode() = flowPrefs.getInt(Keys.colorFilterMode, 0) - fun defaultViewer() = prefs.getInt(Keys.defaultViewer, 1) + fun defaultViewer() = prefs.getInt(Keys.defaultViewer, 2) fun imageScaleType() = flowPrefs.getInt(Keys.imageScaleType, 1) diff --git a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt index 823c0c8da..331c80c38 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/network/NetworkHelper.kt @@ -6,25 +6,23 @@ import java.util.concurrent.TimeUnit import okhttp3.Cache import okhttp3.OkHttpClient -// SY --> -open class NetworkHelper(context: Context) { +/* SY --> */ open /* SY <-- */ class NetworkHelper(context: Context) { private val cacheDir = File(context.cacheDir, "network_cache") private val cacheSize = 5L * 1024 * 1024 // 5 MiB - open val cookieManager = AndroidCookieJar() + /* SY --> */ open /* SY <-- */ val cookieManager = AndroidCookieJar() - open val client = OkHttpClient.Builder() + /* SY --> */ open /* SY <-- */ val client = OkHttpClient.Builder() .cookieJar(cookieManager) .cache(Cache(cacheDir, cacheSize)) .connectTimeout(30, TimeUnit.SECONDS) .readTimeout(30, TimeUnit.SECONDS) .build() - open val cloudflareClient = client.newBuilder() + /* SY --> */ open /* SY <-- */ val cloudflareClient = client.newBuilder() .addInterceptor(UserAgentInterceptor()) .addInterceptor(CloudflareInterceptor(context)) .build() } -// SY <-- diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt index da886fad9..c40b80ac4 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt @@ -187,5 +187,3 @@ open class SourceManager(private val context: Context) { } // SY <-- } - -class SourceNotFoundException(message: String, val id: Long) : Exception(message) diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt index 7d4c8490c..90e009c3b 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/model/Page.kt @@ -6,9 +6,8 @@ import rx.subjects.Subject open class Page( val index: Int, - // SY --> - var url: String = "", - // SY <-- + /* SY --> */ + var /* SY <-- */ url: String = "", var imageUrl: String? = null, @Transient var uri: Uri? = null // Deprecated but can't be deleted due to extensions ) : ProgressListener { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt index c3c2ff36c..15b85a90f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/ExtensionDetailsHeaderAdapter.kt @@ -58,10 +58,12 @@ class ExtensionDetailsHeaderAdapter(private val presenter: ExtensionDetailsPrese binding.extensionWarningBanner.setText(R.string.unofficial_extension_message) } + // SY --> if (extension.isRedundant) { binding.extensionWarningBanner.visible() binding.extensionWarningBanner.setText(R.string.redundant_extension_message) } + // SY <-- } } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt index dcdf13a82..216142577 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/search/SearchController.kt @@ -52,7 +52,11 @@ class SearchController( } override fun createPresenter(): GlobalSearchPresenter { - return SearchPresenter(initialQuery, manga!!, sources = sources) + return SearchPresenter( + initialQuery, + manga!!, + sources + ) } override fun onSaveInstanceState(outState: Bundle) { @@ -67,25 +71,6 @@ class SearchController( newManga = savedInstanceState.getSerializable(::newManga.name) as? Manga } - /*override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - if (totalProgress > 1) { - val menuItem = menu.add(Menu.NONE, 1, Menu.NONE, R.string.action_skip_manga) - menuItem.icon = VectorDrawableCompat.create(resources!!, R.drawable - .baseline_skip_next_white_24, null) - menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) - } - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - 1 -> { - newManga = manga - migrateManga() - } - } - return true - }*/ - fun migrateManga() { val target = targetController as? MigrationInterface ?: return val manga = manga ?: return @@ -125,7 +110,8 @@ class SearchController( return } newManga = manga - val dialog = MigrationDialog() + val dialog = + MigrationDialog() dialog.targetController = this dialog.showDialog(router) } @@ -142,16 +128,22 @@ class SearchController( override fun onCreateDialog(savedViewState: Bundle?): Dialog { val prefValue = preferences.migrateFlags().get() - val preselected = MigrationFlags.getEnabledFlagsPositions(prefValue) + val preselected = + MigrationFlags.getEnabledFlagsPositions( + prefValue + ) return MaterialDialog(activity!!) - .message(R.string.data_to_include_in_migration) + .message(R.string.migration_dialog_what_to_include) .listItemsMultiChoice( - items = MigrationFlags.titles.map - { resources?.getString(it) as CharSequence }, + items = MigrationFlags.titles.map { resources?.getString(it) as CharSequence }, initialSelection = preselected.toIntArray() ) { _, positions, _ -> - val newValue = MigrationFlags.getFlagsFromPositions(positions.toTypedArray()) + // Save current settings for the next time + val newValue = + MigrationFlags.getFlagsFromPositions( + positions.toTypedArray() + ) preferences.migrateFlags().set(newValue) } .positiveButton(R.string.migrate) { @@ -160,6 +152,7 @@ class SearchController( .negativeButton(R.string.copy) { (targetController as? SearchController)?.copyManga() } + .neutralButton(android.R.string.cancel) } } diff --git a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt index 43d210c96..30b1960f4 100644 --- a/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt +++ b/app/src/main/java/exh/favorites/FavoritesSyncHelper.kt @@ -138,7 +138,7 @@ class FavoritesSyncHelper(val context: Context) { // Apply remote categories status.onNext(FavoritesSyncStatus.Processing("Updating category names")) - applyRemoteCategories(errorList, favorites.second) + applyRemoteCategories(favorites.second) // Apply change sets applyChangeSetToLocal(errorList, remoteChanges) @@ -186,7 +186,7 @@ class FavoritesSyncHelper(val context: Context) { } } - private fun applyRemoteCategories(errorList: MutableList, categories: List) { + private fun applyRemoteCategories(categories: List) { val localCategories = db.getCategories().executeAsBlocking() val newLocalCategories = localCategories.toMutableList()