diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f2df1b211..627a08bed 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -285,8 +285,8 @@ dependencies { implementation ("info.debatty:java-string-similarity:2.0.0") // Firebase (EH) - implementation("com.google.firebase:firebase-analytics-ktx:18.0.0") - implementation("com.google.firebase:firebase-crashlytics-ktx:17.3.0") + implementation("com.google.firebase:firebase-analytics-ktx:18.0.2") + implementation("com.google.firebase:firebase-crashlytics-ktx:17.3.1") // Better logging (EH) implementation("com.elvishew:xlog:1.7.1") diff --git a/app/src/main/java/eu/kanade/tachiyomi/App.kt b/app/src/main/java/eu/kanade/tachiyomi/App.kt index 32ef1fdda..dc7234462 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/App.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/App.kt @@ -38,9 +38,6 @@ import exh.log.EHLogLevel import exh.log.EnhancedFilePrinter import exh.syDebugVersion import io.realm.Realm -import io.realm.RealmConfiguration -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch import org.conscrypt.Conscrypt import timber.log.Timber import uy.kohesive.injekt.Injekt @@ -51,7 +48,6 @@ import java.security.Security import java.text.SimpleDateFormat import java.util.Locale import javax.net.ssl.SSLContext -import kotlin.concurrent.thread import kotlin.time.ExperimentalTime import kotlin.time.days @@ -78,7 +74,6 @@ open class App : Application(), LifecycleObserver { setupNotificationChannels() Realm.init(this) - GlobalScope.launch { deleteOldMetadataRealm() } // Delete old metadata DB (EH) if ((BuildConfig.DEBUG || BuildConfig.BUILD_TYPE == "releaseTest") && DebugToggles.ENABLE_DEBUG_OVERLAY.enabled) { setupDebugOverlay() } @@ -137,29 +132,6 @@ open class App : Application(), LifecycleObserver { Notifications.createChannels(this) } - // EXH - private fun deleteOldMetadataRealm() { - val config = RealmConfiguration.Builder() - .name("gallery-metadata.realm") - .schemaVersion(3) - .deleteRealmIfMigrationNeeded() - .build() - Realm.deleteRealm(config) - - // Delete old paper db files - listOf( - File(filesDir, "gallery-ex"), - File(filesDir, "gallery-perveden"), - File(filesDir, "gallery-nhentai") - ).forEach { - if (it.exists()) { - thread { - it.deleteRecursively() - } - } - } - } - // EXH private fun setupExhLogging() { EHLogLevel.init(this) @@ -217,7 +189,7 @@ open class App : Application(), LifecycleObserver { ) XLog.tag("Init").d("Application booting...") - XLog.tag("Init").disableStackTrace().d( + XLog.tag("Init").d( "App version: ${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}, ${BuildConfig.COMMIT_SHA}, ${BuildConfig.VERSION_CODE})\n" + "Preview build: $syDebugVersion\n" + "Android version: ${Build.VERSION.RELEASE} (SDK ${Build.VERSION.SDK_INT}) \n" + diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt index 97cacd1c9..5b19eda18 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/data/track/mdlist/MdList.kt @@ -101,12 +101,12 @@ class MdList(private val context: Context, id: Int) : TrackService(id) { } fun createInitialTracker(dbManga: Manga, mdManga: Manga = dbManga): Track { - val track = Track.create(TrackManager.MDLIST) - track.manga_id = dbManga.id!! - track.status = FollowStatus.UNFOLLOWED.int - track.tracking_url = MdUtil.baseUrl + mdManga.url - track.title = mdManga.title - return track + return Track.create(TrackManager.MDLIST).apply { + manga_id = dbManga.id!! + status = FollowStatus.UNFOLLOWED.int + tracking_url = MdUtil.baseUrl + mdManga.url + title = mdManga.title + } } override suspend fun search(query: String): List { diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt index 3a4c8d60e..e0f4c3e88 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt @@ -713,7 +713,7 @@ class EHentai( page++ } while (parsed.second) - return Pair(result.toList(), favNames!!) + return Pair(result.toList(), favNames.orEmpty()) } fun spPref() = if (exh) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt index 6612c1364..f188c62bb 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestController.kt @@ -2,8 +2,6 @@ package eu.kanade.tachiyomi.ui.browse.latest import android.os.Bundle import android.view.LayoutInflater -import android.view.Menu -import android.view.MenuInflater import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager @@ -33,10 +31,6 @@ open class LatestController : */ protected var adapter: LatestAdapter? = null - /*init { - setHasOptionsMenu(true) - }*/ - /** * Initiate the view with [R.layout.global_search_controller]. * @@ -82,34 +76,6 @@ open class LatestController : onMangaClick(manga) } - /** - * Adds items to the options menu. - * - * @param menu menu containing options. - * @param inflater used to load the menu xml. - */ - override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) { - // Inflate menu. - /*inflater.inflate(R.menu.global_search, menu) - - // Initialize search menu - val searchItem = menu.findItem(R.id.action_search) - val searchView = searchItem.actionView as SearchView - searchView.maxWidth = Int.MAX_VALUE - - searchItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener { - override fun onMenuItemActionExpand(item: MenuItem?): Boolean { - searchView.onActionViewExpanded() // Required to show the query in the view - searchView.setQuery(presenter.query, false) - return true - } - - override fun onMenuItemActionCollapse(item: MenuItem?): Boolean { - return true - } - })*/ - } - /** * Called when the view is created * diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt index 7d4a1b9e6..91cebc19c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/latest/LatestPresenter.kt @@ -30,7 +30,6 @@ import uy.kohesive.injekt.api.get * @param preferences manages the preference calls. */ open class LatestPresenter( - private val sourcesToUse: List? = null, val sourceManager: SourceManager = Injekt.get(), val db: DatabaseHelper = Injekt.get(), val preferences: PreferencesHelper = Injekt.get() diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt index 71bdd407a..93222fb9d 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsEhController.kt @@ -11,8 +11,6 @@ import com.afollestad.materialdialogs.actions.setActionButtonEnabled import com.afollestad.materialdialogs.customview.customView import com.afollestad.materialdialogs.input.getInputField import com.afollestad.materialdialogs.input.input -import com.bluelinelabs.conductor.RouterTransaction -import com.bluelinelabs.conductor.changehandler.FadeChangeHandler import com.tfcporciuncula.flow.Preference import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.DatabaseHelper @@ -21,6 +19,7 @@ import eu.kanade.tachiyomi.data.preference.PreferenceKeys import eu.kanade.tachiyomi.data.preference.asImmediateFlow import eu.kanade.tachiyomi.databinding.EhDialogCategoriesBinding import eu.kanade.tachiyomi.databinding.EhDialogLanguagesBinding +import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction import eu.kanade.tachiyomi.ui.webview.WebViewActivity import eu.kanade.tachiyomi.util.preference.defaultValue import eu.kanade.tachiyomi.util.preference.entriesRes @@ -111,11 +110,7 @@ class SettingsEhController : SettingsController() { preferences.enableExhentai().set(false) true } else { - router.pushController( - RouterTransaction.with(LoginController()) - .pushChangeHandler(FadeChangeHandler()) - .popChangeHandler(FadeChangeHandler()) - ) + router.pushController(LoginController().withFadeTransaction()) false } } diff --git a/app/src/main/java/exh/uconfig/ConfiguringDialogController.kt b/app/src/main/java/exh/uconfig/ConfiguringDialogController.kt index 1d7887e49..89c1d37b2 100644 --- a/app/src/main/java/exh/uconfig/ConfiguringDialogController.kt +++ b/app/src/main/java/exh/uconfig/ConfiguringDialogController.kt @@ -23,7 +23,7 @@ class ConfiguringDialogController : DialogController() { try { EHConfigurator(activity!!).configureAll() launchUI { - activity?.toast(activity?.getString(R.string.eh_settings_successfully_uploaded)) + activity?.toast(R.string.eh_settings_successfully_uploaded) } } catch (e: Exception) { launchUI { diff --git a/app/src/main/res/layout/migration_bottom_sheet.xml b/app/src/main/res/layout/migration_bottom_sheet.xml index 0e3d30971..c97aad84a 100644 --- a/app/src/main/res/layout/migration_bottom_sheet.xml +++ b/app/src/main/res/layout/migration_bottom_sheet.xml @@ -111,7 +111,7 @@ android:text="@string/use_most_chapters" /> - - -