From 954d522341de528247d62baeee89911bfbcadfb4 Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sun, 18 Aug 2019 22:32:33 +0200 Subject: [PATCH] Add UUID in Entry View --- .../keepass/activities/EntryActivity.kt | 3 + .../keepass/view/EntryContentsView.kt | 8 +++ .../main/res/layout/view_entry_contents.xml | 56 ++++++++++++++++--- app/src/main/res/values/strings.xml | 1 + 4 files changed, 60 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt index 5d014dd38..3403256fd 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryActivity.kt @@ -236,6 +236,9 @@ class EntryActivity : LockingHideActivity() { entryContentsView?.assignExpiresDate(getString(R.string.never)) } + // Assign special data + entryContentsView?.assignUUID(entry.nodeId.id) + database.stopManageEntry(entry) } diff --git a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt index f2d60843b..4b398f2fd 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/EntryContentsView.kt @@ -65,6 +65,8 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri private val lastAccessDateView: TextView private val expiresDateView: TextView + private val uuidView: TextView + val isUserNamePresent: Boolean get() = userNameContainerView.visibility == View.VISIBLE @@ -97,6 +99,8 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri lastAccessDateView = findViewById(R.id.entry_accessed) expiresDateView = findViewById(R.id.entry_expires) + uuidView = findViewById(R.id.entry_UUID) + val attrColorAccent = intArrayOf(R.attr.colorAccent) val taColorAccent = context.theme.obtainStyledAttributes(attrColorAccent) colorAccent = taColorAccent.getColor(0, Color.BLACK) @@ -238,6 +242,10 @@ class EntryContentsView @JvmOverloads constructor(context: Context, attrs: Attri expiresDateView.text = constString } + fun assignUUID(uuid: UUID) { + uuidView.text = uuid.toString() + } + override fun generateDefaultLayoutParams(): LayoutParams { return LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT) } diff --git a/app/src/main/res/layout/view_entry_contents.xml b/app/src/main/res/layout/view_entry_contents.xml index f01658422..61b3bb81f 100644 --- a/app/src/main/res/layout/view_entry_contents.xml +++ b/app/src/main/res/layout/view_entry_contents.xml @@ -182,45 +182,53 @@ android:orientation="vertical"> - - - - - - - - @@ -228,4 +236,36 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5edb381b0..6bb891b32 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -75,6 +75,7 @@ Confirm password Created Expires + UUID Keyfile Modified Could not find entry data.