fix: previewer crash when cast to CardTemplatePreviewer

BrayanDSO · Dec 10, 2023 · 349e42c · 349e42c
1 parent 1747ac9
commit 349e42c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.kt
@@ -1591,10 +1591,6 @@ open class Reviewer :
         }
     }
 
-    override fun javaScriptFunction(): AnkiDroidJsAPI {
-        return AnkiDroidJsAPI(this)
-    }
-
     override fun getCardDataForJsApi(): AnkiDroidJsAPI.CardDataForJsApi {
         val cardDataForJsAPI = AnkiDroidJsAPI.CardDataForJsApi().apply {
             newCardCount = mNewCount.toString()

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ReviewerServer.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ReviewerServer.kt
@@ -16,21 +16,16 @@
 
 package com.ichi2.anki
 
-import androidx.fragment.app.FragmentActivity
 import anki.frontend.SetSchedulingStatesRequest
 import com.ichi2.anki.pages.AnkiServer
 import com.ichi2.utils.AssetHelper
 import timber.log.Timber
 import java.io.File
 import java.io.FileInputStream
 
-class ReviewerServer(activity: FragmentActivity, val mediaDir: String) : AnkiServer(activity) {
+class ReviewerServer(activity: AbstractFlashcardViewer, private val mediaDir: String) : AnkiServer(activity) {
     var reviewerHtml: String = ""
-    private val jsApi = if (activity is Reviewer) {
-        reviewer().javaScriptFunction()
-    } else {
-        cardTemplatePreviewer().javaScriptFunction()
-    }
+    private val jsApi = activity.javaScriptFunction()
 
     override fun start() {
         super.start()
@@ -102,10 +97,6 @@ class ReviewerServer(activity: FragmentActivity, val mediaDir: String) : AnkiSer
         return (activity as Reviewer)
     }
 
-    private fun cardTemplatePreviewer(): CardTemplatePreviewer {
-        return (activity as CardTemplatePreviewer)
-    }
-
     private fun getSchedulingStatesWithContext(): ByteArray {
         val state = reviewer().queueState ?: return ByteArray(0)
         return state.schedulingStatesWithContext().toBuilder()