From 9c91cdc34c054e3b5fe390fda7ec246fe9e43ca7 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 20 Sep 2020 21:47:22 +0530 Subject: [PATCH] autofill-parser: drop use of core-ktx We use an alpha version of core-ktx that might be undesirable for projects including the library Signed-off-by: Harsh Shandilya --- autofill-parser/build.gradle.kts | 1 - .../autofillparser/AutofillFormParser.kt | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts index 23d3e304..a4d0582d 100644 --- a/autofill-parser/build.gradle.kts +++ b/autofill-parser/build.gradle.kts @@ -49,7 +49,6 @@ afterEvaluate { } dependencies { - implementation(Dependencies.AndroidX.core_ktx) implementation(Dependencies.AndroidX.autofill) implementation(Dependencies.Kotlin.Coroutines.android) implementation(Dependencies.Kotlin.Coroutines.core) 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 30ff40d3..c9aa2f2e 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 @@ -12,7 +12,6 @@ import android.os.Build import android.os.Bundle import android.view.autofill.AutofillId import androidx.annotation.RequiresApi -import androidx.core.os.bundleOf import com.github.ajalt.timberkt.d /** @@ -49,9 +48,11 @@ sealed class FormOrigin(open val identifier: String) { } } - fun toBundle() = when (this) { - is Web -> bundleOf(BUNDLE_KEY_WEB_IDENTIFIER to identifier) - is App -> bundleOf(BUNDLE_KEY_APP_IDENTIFIER to identifier) + fun toBundle() = Bundle().apply { + when (this@FormOrigin) { + is Web -> putString(BUNDLE_KEY_WEB_IDENTIFIER, identifier) + is App -> putString(BUNDLE_KEY_APP_IDENTIFIER, identifier) + } } }