From 524c8ccfc55360ff7dd7ff3b6776197ee3838b8d Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 20 Jul 2021 17:12:48 +0200
Subject: [PATCH] Fix small TODO

---
 .../keepass/activities/EntryEditActivity.kt          | 12 ++----------
 .../kunzisoft/keepass/view/DateTimeEditFieldView.kt  |  6 +++++-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 4865e1892..9e0282548 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -378,19 +378,11 @@ class EntryEditActivity : LockingActivity(),
      * Add a new customized field
      */
     private fun addNewCustomField() {
-        //if (mIsTemplate) {
-            // TODO Custom Dialog to add a complete template field
-        //} else {
-            EntryCustomFieldDialogFragment.getInstance().show(supportFragmentManager, "customFieldDialog")
-        //}
+        EntryCustomFieldDialogFragment.getInstance().show(supportFragmentManager, "customFieldDialog")
     }
 
     private fun editCustomField(field: Field) {
-        //if (mIsTemplate) {
-        // TODO Custom Dialog to edit a complete template field
-        //} else {
-            EntryCustomFieldDialogFragment.getInstance(field).show(supportFragmentManager, "customFieldDialog")
-        //}
+        EntryCustomFieldDialogFragment.getInstance(field).show(supportFragmentManager, "customFieldDialog")
     }
 
     override fun onNewCustomFieldApproved(newField: Field) {
diff --git a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt
index 88e844653..6173baf55 100644
--- a/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/view/DateTimeEditFieldView.kt
@@ -121,7 +121,11 @@ class DateTimeEditFieldView @JvmOverloads constructor(context: Context,
             return if (activation) dateTime.toString() else ""
         }
         set(value) {
-            // TODO set date time string value
+            mDateTime = try {
+                DateInstant(value)
+            } catch (e: Exception) {
+                DateInstant.NEVER_EXPIRES
+            }
         }
 
     override var isFieldVisible: Boolean