More crash fixes

(cherry picked from commit 4880741)
jobobby04 · Dec 21, 2020 · 024c2d4 · 024c2d4
1 parent 17731f3
commit 024c2d4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewer.kt
@@ -185,7 +185,7 @@ abstract class PagerViewer(val activity: ReaderActivity) : BaseViewer {
      * activity of the change and requests the preload of the next chapter if this is the last page.
      */
     private fun onReaderPageSelected(page: ReaderPage, allowPreload: Boolean) {
-        val pages = page.chapter.pages!! // Won't be null because it's the loaded chapter
+        val pages = page.chapter.pages ?: return
         Timber.d("onReaderPageSelected: ${page.number}/${pages.size}")
         activity.onPageSelected(page)
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonViewer.kt
@@ -191,7 +191,7 @@ class WebtoonViewer(val activity: ReaderActivity, val isContinuous: Boolean = tr
      * activity of the change and requests the preload of the next chapter if this is the last page.
      */
     private fun onPageSelected(page: ReaderPage, allowPreload: Boolean) {
-        val pages = page.chapter.pages!! // Won't be null because it's the loaded chapter
+        val pages = page.chapter.pages ?: return
         Timber.d("onPageSelected: ${page.number}/${pages.size}")
         activity.onPageSelected(page)
 

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
@@ -119,7 +119,7 @@ object SettingsSearchHelper {
             (pref.title != null) -> {
                 // Is an actual preference
                 val title = pref.title.toString()
-                val summary = if (pref.summary != null) pref.summary.toString() else ""
+                val summary = pref.summary?.toString() ?: ""
                 val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}")
 
                 prefSearchResultList.add(

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/webview/BaseWebViewActivity.kt
@@ -31,6 +31,7 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
         if (!WebViewUtil.supportsWebView(this)) {
             toast(R.string.information_webview_required, Toast.LENGTH_LONG)
             finish()
+            return
         }
 
         try {
@@ -40,6 +41,7 @@ open class BaseWebViewActivity : BaseActivity<WebviewActivityBinding>() {
             // Potentially throws errors like "Error inflating class android.webkit.WebView"
             toast(R.string.information_webview_required, Toast.LENGTH_LONG)
             finish()
+            return
         }
 
         title = intent.extras?.getString(TITLE_KEY)