diff --git a/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt b/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt index 8f66a9c15..142dcdf16 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt @@ -18,12 +18,12 @@ class EntryInfo : Parcelable { constructor() private constructor(parcel: Parcel) { - id = parcel.readString() - title = parcel.readString() - username = parcel.readString() - password = parcel.readString() - url = parcel.readString() - notes = parcel.readString() + id = parcel.readString() ?: id + title = parcel.readString() ?: title + username = parcel.readString() ?: username + password = parcel.readString() ?: password + url = parcel.readString() ?: url + notes = parcel.readString() ?: notes parcel.readList(customFields, Field::class.java.classLoader) } diff --git a/app/src/main/java/com/kunzisoft/keepass/model/Field.kt b/app/src/main/java/com/kunzisoft/keepass/model/Field.kt index 9d4abcfae..d689684b5 100644 --- a/app/src/main/java/com/kunzisoft/keepass/model/Field.kt +++ b/app/src/main/java/com/kunzisoft/keepass/model/Field.kt @@ -15,8 +15,8 @@ class Field : Parcelable { } constructor(parcel: Parcel) { - this.name = parcel.readString() - this.protectedValue = parcel.readParcelable(ProtectedString::class.java.classLoader) + this.name = parcel.readString() ?: name + this.protectedValue = parcel.readParcelable(ProtectedString::class.java.classLoader) ?: protectedValue } override fun describeContents(): Int { diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationField.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationField.kt index 08d5a411a..5f16bc089 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationField.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationField.kt @@ -34,9 +34,9 @@ import java.util.ArrayList open class ClipboardEntryNotificationField : Parcelable { private var id: NotificationFieldId = NotificationFieldId.UNKNOWN - var value: String - var label: String - var copyText: String + var value: String = "" + var label: String = "" + var copyText: String = "" val actionKey: String get() = getActionKey(id) @@ -60,9 +60,9 @@ open class ClipboardEntryNotificationField : Parcelable { protected constructor(parcel: Parcel) { id = NotificationFieldId.values()[parcel.readInt()] - value = parcel.readString() - label = parcel.readString() - copyText = parcel.readString() + value = parcel.readString() ?: value + label = parcel.readString() ?: label + copyText = parcel.readString() ?: copyText } override fun writeToParcel(dest: Parcel, flags: Int) { diff --git a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt index 46fa8531d..2831176b8 100644 --- a/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt +++ b/app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt @@ -59,7 +59,7 @@ class ClipboardEntryNotificationService : NotificationService() { //Get settings val prefs = PreferenceManager.getDefaultSharedPreferences(this) val timeoutClipboardClear = prefs.getString(getString(R.string.clipboard_timeout_key), - getString(R.string.clipboard_timeout_default)) + getString(R.string.clipboard_timeout_default)) ?: "6000" notificationTimeoutMilliSecs = java.lang.Long.parseLong(timeoutClipboardClear) when {