diff --git a/app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt b/app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt index b3859507d..d07c51a8c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/TemplateAbstractView.kt @@ -31,8 +31,9 @@ import com.kunzisoft.keepass.otp.OtpElement import com.kunzisoft.keepass.otp.OtpEntryFields import com.kunzisoft.keepass.settings.PreferencesUtil import com.kunzisoft.keepass.utils.KeyboardUtil.hideKeyboard -import com.kunzisoft.keepass.utils.readListCompat import com.kunzisoft.keepass.utils.readParcelableCompat +import com.kunzisoft.keepass.utils.readSetCompat +import com.kunzisoft.keepass.utils.writeSetCompat abstract class TemplateAbstractView< @@ -47,7 +48,7 @@ abstract class TemplateAbstractView< protected var mEntryInfo: EntryInfo? = null // To keep unprotected views during orientation change - protected var mUnprotectedFields = mutableListOf() + protected var mUnprotectedFields = mutableSetOf() private var mViewFields = mutableListOf() @@ -696,7 +697,7 @@ abstract class TemplateAbstractView< } else { mTemplate = state.template mEntryInfo = state.entryInfo - mUnprotectedFields = state.unprotectedFields + mUnprotectedFields = state.unprotectedFields.toMutableSet() onRestoreEntryInstanceState(state) buildTemplateAndPopulateInfo() super.onRestoreInstanceState(state.superState) @@ -722,7 +723,7 @@ abstract class TemplateAbstractView< protected class SavedState : BaseSavedState { var template: Template? = null var entryInfo: EntryInfo? = null - var unprotectedFields = mutableListOf() + var unprotectedFields = setOf() // TODO Move var tempDateTimeViewId: Int? = null @@ -731,7 +732,7 @@ abstract class TemplateAbstractView< private constructor(parcel: Parcel) : super(parcel) { template = parcel.readParcelableCompat() ?: template entryInfo = parcel.readParcelableCompat() ?: entryInfo - parcel.readListCompat(unprotectedFields) + unprotectedFields = parcel.readSetCompat() val dateTimeViewId = parcel.readInt() if (dateTimeViewId != -1) tempDateTimeViewId = dateTimeViewId @@ -741,7 +742,7 @@ abstract class TemplateAbstractView< super.writeToParcel(out, flags) out.writeParcelable(template, flags) out.writeParcelable(entryInfo, flags) - out.writeList(unprotectedFields) + out.writeSetCompat(unprotectedFields) out.writeInt(tempDateTimeViewId ?: -1) } diff --git a/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt b/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt index 9a2d418c1..0ef5e34ef 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/TextFieldView.kt @@ -218,9 +218,11 @@ open class TextFieldView @JvmOverloads constructor(context: Context, } override fun changeProtectedValueParameters() { + val isCurrentlyProtected = isCurrentlyProtected() + showButton.isSelected = isCurrentlyProtected valueView.apply { if (showButton.isVisible) { - applyHiddenStyle(isCurrentlyProtected()) + applyHiddenStyle(isCurrentlyProtected) } else { linkify() } diff --git a/database/src/main/java/com/kunzisoft/keepass/utils/ParcelableUtil.kt b/database/src/main/java/com/kunzisoft/keepass/utils/ParcelableUtil.kt index 6055f21d2..b9c29e304 100644 --- a/database/src/main/java/com/kunzisoft/keepass/utils/ParcelableUtil.kt +++ b/database/src/main/java/com/kunzisoft/keepass/utils/ParcelableUtil.kt @@ -113,6 +113,24 @@ inline fun Parcel.readListCompat(outVal: MutableList) { } } +inline fun Parcel.writeListCompat(list: List) { + writeList(list) +} + +inline fun Parcel.readListCompat(): List { + val outVal = mutableListOf() + readListCompat(outVal) + return outVal +} + +inline fun Parcel.writeSetCompat(set: Set) { + writeList(set.toList()) +} + +inline fun Parcel.readSetCompat(): Set { + return readListCompat().toSet() +} + // For writing to a Parcel fun Parcel.writeParcelableMap(map: Map, flags: Int) { writeInt(map.size)