From 93d76705089fb6e49a3626f25bad644f5f4849ae Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Tue, 16 Apr 2024 11:20:22 -0400
Subject: [PATCH] Merge EditEntryNote into EditEntryField

---
 src/cli/edit.go | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/cli/edit.go b/src/cli/edit.go
index 36262fa..a9657be 100644
--- a/src/cli/edit.go
+++ b/src/cli/edit.go
@@ -35,35 +35,24 @@ func EditEntryField(targetLocation string, hidePassword bool, field int) {
 		unencryptedEntry[field] = input("Username:")
 	case 2:
 		unencryptedEntry[field] = input("URL:")
+	case 3: // edit notes fields
+		// store note and non-note data separately
+		nonNoteData := unencryptedEntry[:3]
+		noteData := unencryptedEntry[3:]
+
+		// edit the note
+		editedNote, noteEdited := editNote(noteData)
+		if !noteEdited { // exit early if the note was not edited
+			fmt.Println(backend.AnsiError + "Entry is unchanged" + backend.AnsiReset)
+			os.Exit(1)
+		}
+		unencryptedEntry = append(nonNoteData, editedNote...)
 	}
 
 	// write and preview the modified entry
 	writeEntryCLI(targetLocation, unencryptedEntry, hidePassword)
 }
 
-// EditEntryNote edits the note of an entry at targetLocation (user input)
-func EditEntryNote(targetLocation string, hidePassword bool) {
-	// fetch old entry data (with all required lines present)
-	unencryptedEntry := backend.GetOldEntryData(targetLocation, 2)
-
-	// store non-note data separately
-	nonNoteData := unencryptedEntry[:3]
-
-	// store note data separately
-	noteData := unencryptedEntry[3:]
-
-	// edit the note
-	editedNote, noteEdited := editNote(noteData)
-	if !noteEdited { // exit early if the note was not edited
-		fmt.Println(backend.AnsiError + "Entry is unchanged" + backend.AnsiReset)
-		os.Exit(1)
-	}
-	unencryptedEntry = append(nonNoteData, editedNote...)
-
-	// write and preview the modified entry
-	writeEntryCLI(targetLocation, unencryptedEntry, hidePassword)
-}
-
 // GenUpdate generates a new password for an entry at targetLocation (user input)
 func GenUpdate(targetLocation string, hidePassword bool) {
 	// fetch old entry data