aboutsummaryrefslogtreecommitdiff
path: root/autofill-parser
diff options
context:
space:
mode:
authorrenovate[bot] <29139614+renovate[bot]@users.noreply.github.com>2023-09-27 18:45:59 +0000
committerGitHub <noreply@github.com>2023-09-27 18:45:59 +0000
commit47d65d074078490b3694f305ad8badc73188dfbc (patch)
treeecc4c9426895af8ddba5967ccc9cba3c52ba60fd /autofill-parser
parent403e378dc33907757979fe681dacefb1366f12f5 (diff)
fix(deps): update dependency com.slack.lint:slack-lint-checks to v0.6.0 (#2697)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'autofill-parser')
-rw-r--r--autofill-parser/lint-baseline.xml2
-rw-r--r--autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt2
-rw-r--r--autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt4
-rw-r--r--autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillStrategyDsl.kt8
-rw-r--r--autofill-parser/src/test/kotlin/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoaderTest.kt8
5 files changed, 15 insertions, 9 deletions
diff --git a/autofill-parser/lint-baseline.xml b/autofill-parser/lint-baseline.xml
index 8d55468b..1f0a317f 100644
--- a/autofill-parser/lint-baseline.xml
+++ b/autofill-parser/lint-baseline.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0-alpha01" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha01)" variant="all" version="8.3.0-alpha01">
+<issues format="6" by="lint 8.3.0-alpha05" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0-alpha05)" variant="all" version="8.3.0-alpha05">
</issues>
diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
index 6a8e16f3..badaabcb 100644
--- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
+++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillFormParser.kt
@@ -116,7 +116,7 @@ private class AutofillFormParser(
if (trustedBrowserInfo?.multiOriginMethod == BrowserMultiOriginMethod.WebView) {
FormField(node, fieldIndex, true, inheritedWebOrigin)
} else {
- check(inheritedWebOrigin == null)
+ check(inheritedWebOrigin == null) { "'inheritedWebOrigin' should be null here" }
FormField(node, fieldIndex, false)
}
if (field.relevantField) {
diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
index 97419048..c7bd99fc 100644
--- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
+++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillScenario.kt
@@ -105,7 +105,9 @@ public sealed class AutofillScenario<out T : Any> {
val genericPassword = mutableListOf<T>()
fun build(): AutofillScenario<T> {
- require(genericPassword.isEmpty() || (currentPassword.isEmpty() && newPassword.isEmpty()))
+ require(genericPassword.isEmpty() || (currentPassword.isEmpty() && newPassword.isEmpty())) {
+ "Password requirements failed."
+ }
return if (currentPassword.isNotEmpty() || newPassword.isNotEmpty()) {
ClassifiedAutofillScenario(
username = username,
diff --git a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillStrategyDsl.kt b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillStrategyDsl.kt
index 0a75f078..04e8d98c 100644
--- a/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillStrategyDsl.kt
+++ b/autofill-parser/src/main/java/com/github/androidpasswordstore/autofillparser/AutofillStrategyDsl.kt
@@ -357,13 +357,17 @@ private constructor(
logcat { "$name: Matched $type" }
when (type) {
FillableFieldType.Username -> {
- check(matchResult.size == 1 && scenarioBuilder.username == null)
+ check(matchResult.size == 1 && scenarioBuilder.username == null) {
+ "Scenario has existing username or too many matches"
+ }
scenarioBuilder.username = matchResult.single()
// Hidden username fields should be saved but not filled.
scenarioBuilder.fillUsername = scenarioBuilder.username!!.isVisible == true
}
FillableFieldType.Otp -> {
- check(matchResult.size == 1 && scenarioBuilder.otp == null)
+ check(matchResult.size == 1 && scenarioBuilder.otp == null) {
+ "Scenario has existing OTP or too many matches"
+ }
scenarioBuilder.otp = matchResult.single()
}
FillableFieldType.CurrentPassword -> scenarioBuilder.currentPassword.addAll(matchResult)
diff --git a/autofill-parser/src/test/kotlin/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoaderTest.kt b/autofill-parser/src/test/kotlin/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoaderTest.kt
index 0ee72880..f48759bb 100644
--- a/autofill-parser/src/test/kotlin/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoaderTest.kt
+++ b/autofill-parser/src/test/kotlin/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoaderTest.kt
@@ -10,9 +10,9 @@ import kotlin.test.Test
class PublicSuffixListLoaderTest {
@Test
fun testLoadingBundledPublicSuffixList() {
- requireNotNull(javaClass.classLoader).getResourceAsStream("publicsuffixes").buffered().use {
- stream ->
- PublicSuffixListLoader.load(stream)
- }
+ requireNotNull(javaClass.classLoader) { "Null classloader????" }
+ .getResourceAsStream("publicsuffixes")
+ .buffered()
+ .use { stream -> PublicSuffixListLoader.load(stream) }
}
}