refactor: fix Android Studio warnings

Co-authored-by: David Allison <62114487+david-allison@users.noreply.github.com>

Author: 2 people

AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt

@@ -23,7 +23,6 @@ package com.ichi2.anki
 
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
-import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
@@ -149,7 +148,6 @@ import com.ichi2.libanki.undoableOp
 import com.ichi2.themes.Themes
 import com.ichi2.themes.Themes.getResFromAttr
 import com.ichi2.ui.FixedEditText
-import com.ichi2.utils.ClipboardUtil.getText
 import com.ichi2.utils.HandlerUtils.newHandler
 import com.ichi2.utils.HashUtil.hashSetInit
 import com.ichi2.utils.Stopwatch
@@ -243,7 +241,6 @@ abstract class AbstractFlashcardViewer :
     internal var easeButton3: EaseButton? = null
     internal var easeButton4: EaseButton? = null
     protected var topBarLayout: RelativeLayout? = null
-    private val clipboard: ClipboardManager? = null
     private var previousAnswerIndicator: PreviousAnswerIndicator? = null
 
     private var currentEase: Ease? = null
@@ -282,9 +279,6 @@ abstract class AbstractFlashcardViewer :
     var cardContent: String? = null
         private set
 
-    private var viewerUrl: String? = null
-    private val fadeDuration = 300
-
     @VisibleForTesting(otherwise = VisibleForTesting.PROTECTED)
     internal lateinit var cardMediaPlayer: CardMediaPlayer
 
@@ -403,7 +397,7 @@ abstract class AbstractFlashcardViewer :
                 val diffX = abs(event.rawX - touchX)
                 val diffY = abs(event.rawY - touchY)
                 // If a click is not coming then we reset the touch
-                if (diffX > Companion.CLICK_ACTION_THRESHOLD || diffY > Companion.CLICK_ACTION_THRESHOLD) {
+                if (diffX > CLICK_ACTION_THRESHOLD || diffY > CLICK_ACTION_THRESHOLD) {
                     hasBeenTouched = false
                 }
             }
@@ -734,19 +728,6 @@ abstract class AbstractFlashcardViewer :
 
     protected open fun answerFieldIsFocused(): Boolean = answerField != null && answerField!!.isFocused
 
-    protected fun clipboardHasText(): Boolean = !getText(clipboard).isNullOrEmpty()
-
-    /**
-     * Returns the text stored in the clipboard or the empty string if the clipboard is empty or contains something that
-     * cannot be converted to text.
-     *
-     * @return the text in clipboard or the empty string.
-     */
-    private fun clipboardGetText(): CharSequence {
-        val text = getText(clipboard)
-        return text ?: ""
-    }
-
     val deckOptionsLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { _ ->
             Timber.i("Returned from deck options -> Restarting activity")
@@ -2073,7 +2054,7 @@ abstract class AbstractFlashcardViewer :
         private fun isTouchingEdge(e1: MotionEvent): Boolean {
             val height = touchLayer!!.height
             val width = touchLayer!!.width
-            val margin = Companion.NO_GESTURE_BORDER_DIP * resources.displayMetrics.density + 0.5f
+            val margin = NO_GESTURE_BORDER_DIP * resources.displayMetrics.density + 0.5f
             return e1.x < margin || e1.y < margin || height - e1.y < margin || width - e1.x < margin
         }
 
@@ -2143,7 +2124,7 @@ abstract class AbstractFlashcardViewer :
         private fun initShakeDetector() {
             Timber.d("Initializing shake detector")
             if (gestureProcessor.isBound(Gesture.SHAKE)) {
-                val sensorManager = getSystemService(Context.SENSOR_SERVICE) as SensorManager
+                val sensorManager = getSystemService(SENSOR_SERVICE) as SensorManager
                 shakeDetector =
                     ShakeDetector(this).apply {
                         start(sensorManager, SensorManager.SENSOR_DELAY_UI)
@@ -2456,7 +2437,7 @@ abstract class AbstractFlashcardViewer :
                 return true
             }
 
-            when (val signalOrdinal = url.toSignal()) {
+            when (url.toSignal()) {
                 Signal.SIGNAL_UNHANDLED -> {}
                 Signal.SIGNAL_NOOP -> return true
                 Signal.TYPE_FOCUS -> return true

AnkiDroid/src/main/java/com/ichi2/anki/analytics/AcraAnalyticsInteraction.kt

@@ -30,6 +30,7 @@ import java.io.File
  * See <a href="https://github.com/ACRA/acra/wiki/Custom-Extensions">Custom Extensions</a>
  */
 @AutoService(ReportInteraction::class)
+@Suppress("unused") // Not unused. ACRA dynamically loads this class
 class AcraAnalyticsInteraction : ReportInteraction {
     override fun performInteraction(
         context: Context,

AnkiDroid/src/main/java/com/ichi2/anki/analytics/UsageAnalytics.kt

@@ -377,7 +377,7 @@ object UsageAnalytics {
     object Actions {
         // Analytics actions used in Help Dialog
         @AnalyticsConstant
-        val OPENED_HELPDIALOG = "Opened HelpDialogBox"
+        val OPENED_HELP_DIALOG = "Opened HelpDialogBox"
 
         @AnalyticsConstant
         val OPENED_USING_ANKIDROID = "Opened Using AnkiDroid"

AnkiDroid/src/main/java/com/ichi2/anki/browser/BrowserColumnCollection.kt

@@ -24,7 +24,10 @@ import com.ichi2.anki.model.CardsOrNotes
 import com.ichi2.anki.model.CardsOrNotes.CARDS
 import com.ichi2.anki.model.CardsOrNotes.NOTES
 import com.ichi2.libanki.BrowserConfig
+import com.ichi2.libanki.BrowserConfig.ACTIVE_CARD_COLUMNS_KEY
+import com.ichi2.libanki.BrowserConfig.ACTIVE_NOTE_COLUMNS_KEY
 import com.ichi2.libanki.BrowserDefaults
+import net.ankiweb.rsdroid.Backend
 import timber.log.Timber
 
 /**

AnkiDroid/src/main/java/com/ichi2/anki/dialogs/help/HelpDialog.kt

@@ -122,7 +122,7 @@ class HelpDialog : DialogFragment() {
         private const val PAGE_TAG = "HelpMenuPage"
 
         fun newHelpInstance(): HelpDialog {
-            UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, Actions.OPENED_HELPDIALOG)
+            UsageAnalytics.sendAnalyticsEvent(Category.LINK_CLICKED, Actions.OPENED_HELP_DIALOG)
             return HelpDialog().apply {
                 arguments =
                     bundleOf(

AnkiDroid/src/main/java/com/ichi2/utils/ClipboardUtil.kt

@@ -57,8 +57,6 @@ object ClipboardUtil {
 
     fun getUri(clipboard: ClipboardManager?): Uri? = clipboard?.getFirstItem()?.uri
 
-    fun hasSVG(description: ClipDescription): Boolean = description.hasMimeType("image/svg+xml")
-
     fun hasMedia(clipboard: ClipboardManager?): Boolean =
         clipboard
             ?.primaryClip
@@ -79,9 +77,6 @@ object ClipboardUtil {
 
     fun getDescription(clipboard: ClipboardManager?): ClipDescription? = clipboard?.primaryClip?.description
 
-    @CheckResult
-    fun getText(clipboard: ClipboardManager?): CharSequence? = clipboard?.getFirstItem()?.text
-
     @CheckResult
     fun getPlainText(
         clipboard: ClipboardManager?,