diff options
| -rw-r--r-- | format-common/api/format-common.api | 1 | ||||
| -rw-r--r-- | format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/format-common/api/format-common.api b/format-common/api/format-common.api index c088a828..09ff55a2 100644 --- a/format-common/api/format-common.api +++ b/format-common/api/format-common.api @@ -2,6 +2,7 @@ public final class dev/msfjarvis/aps/data/passfile/PasswordEntry { public static final field Companion Ldev/msfjarvis/aps/data/passfile/PasswordEntry$Companion; public fun <init> (Ldev/msfjarvis/aps/util/time/UserClock;Ldev/msfjarvis/aps/util/totp/TotpFinder;Lkotlinx/coroutines/CoroutineScope;[B)V public final fun getExtraContent ()Ljava/util/Map; + public final fun getExtraContentString ()Ljava/lang/String; public final fun getExtraContentWithoutAuthData ()Ljava/lang/String; public final fun getPassword ()Ljava/lang/String; public final fun getTotp ()Lkotlinx/coroutines/flow/StateFlow; diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt b/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt index 96337bf7..b2633c71 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt +++ b/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt @@ -5,7 +5,6 @@ package dev.msfjarvis.aps.data.passfile -import androidx.annotation.VisibleForTesting import com.github.michaelbull.result.mapBoth import dagger.assisted.Assisted import dagger.assisted.AssistedInject @@ -52,6 +51,12 @@ constructor( public val extraContent: Map<String, String> /** + * Direct [String] representation of the extra content of this entry, before any transforms are + * applied. Only use this when the extra content is required in a formatting-preserving manner. + */ + public val extraContentString: String + + /** * A [StateFlow] providing the current TOTP. It will emit a single empty string on initialization * which is replaced with a real TOTP if applicable. Call [hasTotp] to verify whether or not you * need to observe this value. @@ -67,7 +72,6 @@ constructor( private val totpSecret: String? private val totpPeriod: Long private val totpAlgorithm: String - @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) internal val extraContentString: String init { val (foundPassword, passContent) = findAndStripPassword(content.split("\n".toRegex())) |