From 4fb8db982c4033b65be162b69412848e7d06090f Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 25 Jun 2018 13:24:22 +0200 Subject: [PATCH] add missing calls to base.OnActivityResult() in *EditActivity, leading to errors saving with YubiChallenge (#4). --- src/keepass2android/EntryEditActivity.cs | 1 + src/keepass2android/GroupEditActivity.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/keepass2android/EntryEditActivity.cs b/src/keepass2android/EntryEditActivity.cs index b860d0db..5ee22207 100644 --- a/src/keepass2android/EntryEditActivity.cs +++ b/src/keepass2android/EntryEditActivity.cs @@ -713,6 +713,7 @@ namespace keepass2android protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) { + base.OnActivityResult(requestCode, resultCode, data); switch (resultCode) { case (Result)ResultOkIconPicker: diff --git a/src/keepass2android/GroupEditActivity.cs b/src/keepass2android/GroupEditActivity.cs index 3da41d72..051d4ad0 100644 --- a/src/keepass2android/GroupEditActivity.cs +++ b/src/keepass2android/GroupEditActivity.cs @@ -144,7 +144,8 @@ namespace keepass2android protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) { - switch ((int)resultCode) + base.OnActivityResult(requestCode, resultCode, data); + switch ((int)resultCode) { case EntryEditActivity.ResultOkIconPicker: _selectedIconId = data.Extras.GetInt(IconPickerActivity.KeyIconId, (int) PwIcon.Key);