[Cleanup]: Fix Android Studio Warnings ankidroid#13282 (ankidroid#15957)

* [Cleanup]: Fix Android Studio Warnings {regarding Constant Conditions}
krmanik · Mar 21, 2024 · 2cc60e8 · 2cc60e8
1 parent 20504ac
commit 2cc60e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/jsaddons/NpmUtils.kt b/AnkiDroid/src/main/java/com/ichi2/anki/jsaddons/NpmUtils.kt
@@ -83,10 +83,7 @@ object NpmUtils {
             val arr = name.split('/')
             val scope = arr[0].removePrefix("@")
             val isValidScopeName = validateName(scope)
-
-            if (!isValidScopeName) {
-                return isValidScopeName
-            }
+            if (!isValidScopeName) return false
 
             // validate name again
             return validateName(arr[1])

diff --git a/AnkiDroid/src/test/java/com/ichi2/libanki/ConfigTest.kt b/AnkiDroid/src/test/java/com/ichi2/libanki/ConfigTest.kt
@@ -47,7 +47,7 @@ class ConfigTest : JvmTest() {
         assertThat(col.config.get("int"), equalTo(5))
         // explicitly nulled key should work
         col.config.set("null", JSONObject.NULL)
-        var b: Int? = null
+        val b: Int? = null
         assertThat(col.config.get("null"), equalTo(b))
         // missing key should be the same
         assertThat(col.config.get("missing"), equalTo(b))