Address some build warnings

(cherry picked from commit fb7a458747e8a9fe2abe73d8ef6982f3bc0298e2)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
This commit is contained in:
arkon 2021-06-02 23:17:41 -04:00 committed by Jobobby04
parent e0945e4409
commit 84330af417
3 changed files with 10 additions and 3 deletions

View File

@ -32,6 +32,12 @@ open class BasePresenter<V> : RxPresenter<V>() {
presenterScope.cancel() presenterScope.cancel()
} }
// We're trying to avoid using Rx, so we "undeprecate" this
@Suppress("DEPRECATION")
override fun getView(): V? {
return super.getView()
}
/** /**
* Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle * Subscribes an observable with [deliverFirst] and adds it to the presenter's lifecycle
* subscription list. * subscription list.

View File

@ -165,9 +165,8 @@ class AboutController : SettingsController(), NoToolbarElevationController {
) )
outputDf.timeZone = TimeZone.getDefault() outputDf.timeZone = TimeZone.getDefault()
@Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") buildTime!!.toDateTimestampString(dateFormat)
buildTime.toDateTimestampString(dateFormat) } catch (e: Exception) {
} catch (e: ParseException) {
BuildConfig.BUILD_TIME BuildConfig.BUILD_TIME
} }
} }

View File

@ -30,6 +30,7 @@ import kotlinx.coroutines.flow.filter
import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onEach
import reactivecircus.flowbinding.appcompat.queryTextChanges import reactivecircus.flowbinding.appcompat.queryTextChanges
import timber.log.Timber
import uy.kohesive.injekt.injectLazy import uy.kohesive.injekt.injectLazy
/** /**
@ -117,6 +118,7 @@ class HistoryController :
fun onAddPageError(error: Throwable) { fun onAddPageError(error: Throwable) {
adapter?.onLoadMoreComplete(null) adapter?.onLoadMoreComplete(null)
adapter?.endlessTargetCount = 1 adapter?.endlessTargetCount = 1
Timber.e(error)
} }
override fun onUpdateEmptyView(size: Int) { override fun onUpdateEmptyView(size: Int) {