Merge pull request fyne-io#1920 from zdima/zdima-patch-1

The onConfirm callback should be called only when user click on 'Ok' of a EntryDialog dialog.

dialog/entry.go

@@ -49,9 +49,9 @@ func (i *EntryDialog) SetOnClosed(callback func()) {
 func NewEntryDialog(title, message string, onConfirm func(string), parent fyne.Window) *EntryDialog {
 	i := &EntryDialog{entry: widget.NewEntry()}
 	items := []*widget.FormItem{widget.NewFormItem(message, i.entry)}
-	i.formDialog = NewForm(title, "Ok", "Cancel", items, func(_ bool) {
+	i.formDialog = NewForm(title, "Ok", "Cancel", items, func(ok bool) {
 		// User has confirmed and entered an input
-		if onConfirm != nil {
+		if ok && onConfirm != nil {
 			onConfirm(i.entry.Text)
 		}
 

dialog/entry_test.go

@@ -0,0 +1,32 @@
+package dialog
+
+import (
+	"testing"
+
+	"fyne.io/fyne/v2/test"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEntryDialog_Confirm(t *testing.T) {
+	value := ""
+	ed := NewEntryDialog("Test", "message", func(v string) {
+		value = v
+	}, test.NewWindow(nil))
+	ed.Show()
+	test.Type(ed.entry, "123")
+	test.Tap(ed.confirm)
+
+	assert.Equal(t, value, "123", "Control form should be confirmed with no validation")
+}
+
+func TestEntryDialog_Dismiss(t *testing.T) {
+	value := "123"
+	ed := NewEntryDialog("Test", "message", func(v string) {
+		value = v
+	}, test.NewWindow(nil))
+	ed.Show()
+	test.Type(ed.entry, "XYZ")
+	test.Tap(ed.cancel)
+
+	assert.Equal(t, value, "123", "Control form should not change value on dismiss")
+}