From 1071e0e7498ca4c1d82cb655e5e59040ea1beb04 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 29 Jul 2021 21:23:59 +0530 Subject: Revamp PSL updates (#1475) * build: import Mozilla's Gradle plugin for PSL updates * autofill-parser: add tests for PublicSuffixListLoader * autofill-parser: regenerate publicsuffixes list * github: switch to Gradle plugin for PSL updates --- .../components/lib/publicsuffixlist/PublicSuffixListLoader.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'autofill-parser/src/main/java/mozilla') diff --git a/autofill-parser/src/main/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoader.kt b/autofill-parser/src/main/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoader.kt index 5f3fc296..8491030d 100644 --- a/autofill-parser/src/main/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoader.kt +++ b/autofill-parser/src/main/java/mozilla/components/lib/publicsuffixlist/PublicSuffixListLoader.kt @@ -16,8 +16,8 @@ private const val PUBLIC_SUFFIX_LIST_FILE = "publicsuffixes" internal object PublicSuffixListLoader { - fun load(context: Context): PublicSuffixListData = - context.assets.open(PUBLIC_SUFFIX_LIST_FILE).buffered().use { stream -> + fun load(inputStream: BufferedInputStream): PublicSuffixListData = + inputStream.use { stream -> val publicSuffixSize = stream.readInt() val publicSuffixBytes = stream.readFully(publicSuffixSize) @@ -26,6 +26,9 @@ internal object PublicSuffixListLoader { PublicSuffixListData(publicSuffixBytes, exceptionBytes) } + + fun load(context: Context): PublicSuffixListData = + load(context.assets.open(PUBLIC_SUFFIX_LIST_FILE).buffered()) } @Suppress("MagicNumber") -- cgit v1.2.3