rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
J-Jamet
2019-09-14 11:17:16 +02:00
parent 6f95cc7296
commit 4e344458b2
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/model/EntryInfo.kt
View File

@@ -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)
}

4
app/src/main/java/com/kunzisoft/keepass/model/Field.kt
View File

@@ -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 {

12
app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationField.kt
View File

@@ -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) {

2
app/src/main/java/com/kunzisoft/keepass/notifications/ClipboardEntryNotificationService.kt
View File

@@ -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 {