[Cleanup]: Fix Android Studio Warnings in various Kotlin files ankidr…

…oid#13282 (ankidroid#16095) * Fixed some Kotlin Android Studio Warnings * Reverted import changes * Update OperationTest.kt code legibility improved --------- Co-authored-by: Bernardo Galante <ba@MacBook-Air-de-Bernardo.local>
henriqueccmac · May 27, 2024 · c0cd3b5 · c0cd3b5
1 parent ba70fd7
commit c0cd3b5
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 45 deletions.
diff --git a/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt b/AnkiDroid/src/androidTest/java/com/ichi2/anki/reviewer/PeripheralKeymapTest.kt
@@ -52,7 +52,7 @@ class PeripheralKeymapTest : InstrumentedTest() {
         )
     }
 
-    protected fun getNumpadEvent(keycode: Int): KeyEvent {
+    private fun getNumpadEvent(keycode: Int): KeyEvent {
         return KeyEvent(0, 0, KeyEvent.ACTION_UP, keycode, 0, KeyEvent.META_NUM_LOCK_ON)
     }
 }
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -2191,8 +2191,6 @@ open class CardBrowser :
             return s
         }
 
-        const val CARD_NOT_AVAILABLE = -1
-
         fun dueString(col: Collection, card: Card): String {
             var t = nextDue(col, card)
             if (card.queue < 0) {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.kt
@@ -180,7 +180,7 @@ object MetaDB {
     }
 
     /** Reset the widget status.  */
-    fun resetWidget(context: Context): Boolean {
+    private fun resetWidget(context: Context): Boolean {
         openDBIfClosed(context)
         try {
             Timber.i("MetaDB:: Resetting widget status")
@@ -249,9 +249,9 @@ object MetaDB {
             mMetaDb!!.rawQuery(
                 query,
                 arrayOf(
-                    java.lang.Long.toString(did),
-                    Integer.toString(ord),
-                    Integer.toString(qa.int)
+                    did.toString(),
+                    ord.toString(),
+                    qa.int.toString()
                 )
             ).use { cur ->
                 Timber.v("getLanguage: %s", query)
@@ -275,7 +275,7 @@ object MetaDB {
         try {
             mMetaDb!!.rawQuery(
                 "SELECT state FROM whiteboardState  WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur -> return DatabaseUtil.getScalarBoolean(cur) }
         } catch (e: Exception) {
             Timber.e(e, "Error retrieving whiteboard state from MetaDB ")
@@ -296,7 +296,7 @@ object MetaDB {
             val metaDb = mMetaDb!!
             metaDb.rawQuery(
                 "SELECT _id FROM whiteboardState WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur ->
                 if (cur.moveToNext()) {
                     metaDb.execSQL(
@@ -327,7 +327,7 @@ object MetaDB {
         try {
             mMetaDb!!.rawQuery(
                 "SELECT stylus FROM whiteboardState WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur -> return DatabaseUtil.getScalarBoolean(cur) }
         } catch (e: Exception) {
             Timber.e(e, "Error retrieving whiteboard stylus mode state from MetaDB ")
@@ -348,7 +348,7 @@ object MetaDB {
             val metaDb = mMetaDb!!
             metaDb.rawQuery(
                 "SELECT _id FROM whiteboardState WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur ->
                 if (cur.moveToNext()) {
                     metaDb.execSQL(
@@ -379,7 +379,7 @@ object MetaDB {
         try {
             mMetaDb!!.rawQuery(
                 "SELECT visible FROM whiteboardState WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur -> return DatabaseUtil.getScalarBoolean(cur) }
         } catch (e: Exception) {
             Timber.e(e, "Error retrieving whiteboard state from MetaDB ")
@@ -400,7 +400,7 @@ object MetaDB {
             val metaDb = mMetaDb!!
             metaDb.rawQuery(
                 "SELECT _id FROM whiteboardState WHERE did  = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur ->
                 if (cur.moveToNext()) {
                     metaDb.execSQL(
@@ -429,7 +429,7 @@ object MetaDB {
         try {
             mMetaDb!!.rawQuery(
                 "SELECT lightpencolor, darkpencolor FROM whiteboardState WHERE did = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur ->
                 cur.moveToFirst()
                 val light = DatabaseUtil.getInteger(cur, 0)
@@ -456,7 +456,7 @@ object MetaDB {
             val metaDb = mMetaDb!!
             metaDb.rawQuery(
                 "SELECT _id FROM whiteboardState WHERE did  = ?",
-                arrayOf(java.lang.Long.toString(did))
+                arrayOf(did.toString())
             ).use { cur ->
                 if (cur.moveToNext()) {
                     metaDb.execSQL(

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt
@@ -814,9 +814,9 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
         }
     }
 
-    private fun addFromAedict(extra_text: String?): Boolean {
+    private fun addFromAedict(extraText: String?): Boolean {
         var category: String
-        val notepadLines = extra_text!!.split("\n".toRegex()).toTypedArray()
+        val notepadLines = extraText!!.split("\n".toRegex()).toTypedArray()
         for (i in notepadLines.indices) {
             if (notepadLines[i].startsWith("[") && notepadLines[i].endsWith("]")) {
                 category = notepadLines[i].substring(1, notepadLines[i].length - 1)
@@ -1189,7 +1189,7 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
             return sp.roundToInt().toString()
         }
 
-    fun addNewNote() {
+    private fun addNewNote() {
         openNewNoteEditor { }
     }
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.kt
@@ -131,7 +131,7 @@ object ReadText {
         showDialogAfterDelay(dialog, 500)
     }
 
-    internal fun showDialogAfterDelay(dialog: AlertDialog.Builder, delayMillis: Int) {
+    private fun showDialogAfterDelay(dialog: AlertDialog.Builder, delayMillis: Int) {
         postDelayedOnNewHandler({
             try {
                 dialog.show()

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt b/AnkiDroid/src/main/java/com/ichi2/anki/noteeditor/FieldState.kt
@@ -79,7 +79,7 @@ class FieldState private constructor(private val editor: NoteEditor) {
         return editLines
     }
 
-    protected fun createFields(type: FieldChangeType): List<FieldEditLine> {
+    private fun createFields(type: FieldChangeType): List<FieldEditLine> {
         val fields = getFields(type)
         val editLines: MutableList<FieldEditLine> = ArrayList(fields.size)
         for (i in fields.indices) {

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/Notetypes.kt
@@ -103,7 +103,7 @@ class Notetypes(val col: Collection) {
     }
 
     private fun _get_cached(ntid: int): NotetypeJson? {
-        return _cache.get(ntid)
+        return _cache[ntid]
     }
 
     @NeedsTest("14827: styles are updated after syncing style changes")

diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/sched/Scheduler.kt
@@ -536,7 +536,7 @@ open class Scheduler(val col: Collection) {
         var revTime: Double
         var relrnRate: Double
         var relrnTime: Double
-        if (reload || etaCache.get(0) == -1.0) {
+        if (reload || etaCache[0] == -1.0) {
             col
                 .db
                 .query(
@@ -574,12 +574,12 @@ open class Scheduler(val col: Collection) {
             etaCache[4] = relrnRate
             etaCache[5] = relrnTime
         } else {
-            newRate = etaCache.get(0)
-            newTime = etaCache.get(1)
-            revRate = etaCache.get(2)
-            revTime = etaCache.get(3)
-            relrnRate = etaCache.get(4)
-            relrnTime = etaCache.get(5)
+            newRate = etaCache[0]
+            newTime = etaCache[1]
+            revRate = etaCache[2]
+            revTime = etaCache[3]
+            relrnRate = etaCache[4]
+            relrnTime = etaCache[5]
         }
 
         // Calculate the total time for each queue based on the historical average duration per rep

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/dialogs/tags/TagsDialogTest.kt
@@ -88,12 +88,11 @@ class TagsDialogTest {
             val returnedOption = AtomicReference<CardStateFilter>()
             f.parentFragmentManager.setFragmentResultListener(
                 TagsDialogListener.ON_SELECTED_TAGS_KEY,
-                mockLifecycleOwner(),
-                { _: String?, bundle: Bundle ->
-                    returnedList.set(bundle.getStringArrayList(TagsDialogListener.ON_SELECTED_TAGS__SELECTED_TAGS))
-                    returnedOption.set(bundle.getSerializableCompat<CardStateFilter>(TagsDialogListener.ON_SELECTED_TAGS__OPTION))
-                }
-            )
+                mockLifecycleOwner()
+            ) { _: String?, bundle: Bundle ->
+                returnedList.set(bundle.getStringArrayList(TagsDialogListener.ON_SELECTED_TAGS__SELECTED_TAGS))
+                returnedOption.set(bundle.getSerializableCompat<CardStateFilter>(TagsDialogListener.ON_SELECTED_TAGS__OPTION))
+            }
             val body = dialog!!.getCustomView()
             val optionsGroup = body.findViewById<RadioGroup>(R.id.tags_dialog_options_radiogroup)
             Assert.assertEquals(optionsGroup.visibility.toLong(), View.VISIBLE.toLong())

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicelayer/ScopedStorageAnkiDroidTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicelayer/ScopedStorageAnkiDroidTest.kt
@@ -28,7 +28,6 @@ import com.ichi2.libanki.Collection
 import com.ichi2.testutils.ShadowStatFs
 import com.ichi2.testutils.assertFalse
 import com.ichi2.testutils.createTransientDirectory
-import io.mockk.*
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.junit.Test

diff --git a/...roid/src/test/java/com/ichi2/anki/servicelayer/scopedstorage/MigrateEssentialFilesTest.kt b/...roid/src/test/java/com/ichi2/anki/servicelayer/scopedstorage/MigrateEssentialFilesTest.kt
@@ -38,7 +38,6 @@ import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.kotlin.*
 import org.robolectric.shadows.ShadowStatFs
 import java.io.File
 import kotlin.io.path.Path

diff --git a/AnkiDroid/src/test/java/com/ichi2/anki/servicelayer/scopedstorage/OperationTest.kt b/AnkiDroid/src/test/java/com/ichi2/anki/servicelayer/scopedstorage/OperationTest.kt
@@ -97,8 +97,8 @@ interface OperationTest {
          * The [MoveDirectoryContent] that performs the action mentioned in the class description.
          */
         val spy: MoveDirectoryContent
-            get() = spy(moveDirectoryContent) {
-                doAnswer { toMoveOperation(it) }.whenever(it).toMoveOperation(any())
+            get() = spy(moveDirectoryContent) { moveDirectoryContent ->
+                doAnswer { toMoveOperation(it) }.whenever(moveDirectoryContent).toMoveOperation(any())
             }
     }
 }

diff --git a/...t/java/com/ichi2/anki/servicelayer/scopedstorage/ScopedStorageMigrationIntegrationTest.kt b/...t/java/com/ichi2/anki/servicelayer/scopedstorage/ScopedStorageMigrationIntegrationTest.kt
@@ -274,7 +274,7 @@ private constructor(source: Directory, destination: Directory, val filesToMigrat
     companion object {
         // media DB created on demand, and no -journal file in new backend
         // collection.log no longer exists
-        val INTEGRATION_INTENDED_REMAINING_FILE_COUNT: Int = 2
+        const val INTEGRATION_INTENDED_REMAINING_FILE_COUNT: Int = 2
 
         /**
          * A MigrateUserDataTest from inputSource to inputDestination (or transient directories if not provided)

diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/SchedulerTest.kt
@@ -982,7 +982,7 @@ open class SchedulerTest : JvmTest() {
         note2.setItem("Back", "two")
         col.addNote(note2)
         Assert.assertEquals(Counts(2, 0, 0), col.sched.counts())
-        var c = col.sched.card!!
+        val c = col.sched.card!!
         // getCard does not decrement counts
         Assert.assertEquals(Counts(2, 0, 0), col.sched.counts())
         Assert.assertEquals(Counts.Queue.NEW, col.sched.countIdx())

diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/UtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/UtilsTest.kt
@@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 class UtilsTest {

diff --git a/AnkiDroid/src/test/java/com/ichi2/testutils/JvmTest.kt b/AnkiDroid/src/test/java/com/ichi2/testutils/JvmTest.kt
@@ -67,7 +67,7 @@ open class JvmTest : TestClass {
                     return
                 }
                 // use println(): Timber may not work under the Jvm
-                System.out.println(tag + ": " + message)
+                println("$tag: $message")
                 t?.printStackTrace()
             }
         })

diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/JSONObjectTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/JSONObjectTest.kt
@@ -18,7 +18,6 @@ package com.ichi2.utils
 import android.annotation.SuppressLint
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.ichi2.testutils.EmptyApplication
-import junit.framework.TestCase.*
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before

diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilsTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/LanguageUtilsTest.kt
@@ -23,7 +23,6 @@ import org.hamcrest.Matchers
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.annotation.Config
-import java.util.*
 
 @RunWith(AndroidJUnit4::class)
 @Config(application = EmptyApplication::class)

diff --git a/AnkiDroid/src/test/java/com/ichi2/utils/TagsUtilTest.kt b/AnkiDroid/src/test/java/com/ichi2/utils/TagsUtilTest.kt
@@ -19,7 +19,6 @@ import org.junit.Test
 import org.junit.experimental.runners.Enclosed
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
-import java.util.*
 
 @RunWith(Enclosed::class)
 class TagsUtilTest {