From 5cf917f7d663febee6051c098412698223d76b87 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andywilliams.me>
Date: Fri, 27 Nov 2020 15:58:08 +0000
Subject: [PATCH] Pull GBoard android fix from mobile driver

Fixes #1256
---
 CHANGELOG.md                                    | 1 +
 go.mod                                          | 2 +-
 go.sum                                          | 4 ++--
 vendor/github.com/fyne-io/mobile/app/android.go | 3 +++
 vendor/modules.txt                              | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20a4f21789..7e568e94e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ More detailed release notes can be found on the [releases page](https://github.c
 * Fixed Card widget MinSize (#1581)
 * Fix missing release tag to enable BuildRelease in Settings.BuildType()
 * Dialog shadow does not resize after Refresh (#1370)
+* Android Duplicate Number Entry (#1256)
 
 
 ## 1.4.1 - 20 November 2020
diff --git a/go.mod b/go.mod
index de56ba37b2..ce997d0010 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/akavel/rsrc v0.8.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fsnotify/fsnotify v1.4.9
-	github.com/fyne-io/mobile v0.1.1
+	github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc
 	github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3
 	github.com/godbus/dbus/v5 v5.0.3
diff --git a/go.sum b/go.sum
index 67a15c4d9b..9271298b02 100644
--- a/go.sum
+++ b/go.sum
@@ -10,8 +10,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fyne-io/glfw/v3.3/glfw v0.0.0-20201123143003-f2279069162d h1:WfVxpuVm+5Gr3ipAoWrxV8lJFYkaBWoEwFRrWThWRSU=
 github.com/fyne-io/glfw/v3.3/glfw v0.0.0-20201123143003-f2279069162d/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/fyne-io/mobile v0.1.1 h1:Snu9tKaVgu81314egPeqMC09z/k4D/bts0n1O2MfPbk=
-github.com/fyne-io/mobile v0.1.1/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
+github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc h1:oNo/EXJa9DurC8zmzWDzBCUV3R/b03SWCW/Qftmgpb0=
+github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc/go.mod h1:/kOrWrZB6sasLbEy2JIvr4arEzQTXBTZGb3Y96yWbHY=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw=
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
 github.com/godbus/dbus/v5 v5.0.3 h1:ZqHaoEF7TBzh4jzPmqVhE/5A1z9of6orkAe5uHoAeME=
diff --git a/vendor/github.com/fyne-io/mobile/app/android.go b/vendor/github.com/fyne-io/mobile/app/android.go
index 4592a140a1..742dfff54b 100644
--- a/vendor/github.com/fyne-io/mobile/app/android.go
+++ b/vendor/github.com/fyne-io/mobile/app/android.go
@@ -545,6 +545,9 @@ func processKey(env *C.JNIEnv, e *C.AInputEvent) {
 		Rune: rune(C.getKeyRune(env, e)),
 		Code: convAndroidKeyCode(int32(C.AKeyEvent_getKeyCode(e))),
 	}
+	if k.Rune >= '0' && k.Rune <= '9' { // GBoard generates key events for numbers, but we see them in textChanged
+		return
+	}
 	switch C.AKeyEvent_getAction(e) {
 	case C.AKEY_STATE_DOWN:
 		k.Direction = key.DirPress
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 18f4ba17be..7ae636741b 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -8,7 +8,7 @@ github.com/akavel/rsrc/ico
 github.com/davecgh/go-spew/spew
 # github.com/fsnotify/fsnotify v1.4.9
 github.com/fsnotify/fsnotify
-# github.com/fyne-io/mobile v0.1.1
+# github.com/fyne-io/mobile v0.1.2-0.20201127155338-06aeb98410cc
 github.com/fyne-io/mobile/app
 github.com/fyne-io/mobile/app/internal/callfn
 github.com/fyne-io/mobile/event/key