From 1fad137c1e0f0f2ea8f65f8e19ae55b3ba1fe696 Mon Sep 17 00:00:00 2001 From: Philipp Crocoll Date: Mon, 15 Jun 2020 11:24:38 +0200 Subject: [PATCH] fix https://github.com/PhilippC/keepass2android/issues/1015 (bad error message when file not found) --- src/Kp2aBusinessLogic/UiStringKey.cs | 3 ++- src/Kp2aBusinessLogic/database/edit/LoadDB.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Kp2aBusinessLogic/UiStringKey.cs b/src/Kp2aBusinessLogic/UiStringKey.cs index a358c646..5b762493 100644 --- a/src/Kp2aBusinessLogic/UiStringKey.cs +++ b/src/Kp2aBusinessLogic/UiStringKey.cs @@ -88,6 +88,7 @@ namespace keepass2android ReadOnlyReason_ReadOnlyKitKat, ReadOnlyReason_LocalBackup, Ok, - cancel + cancel, + FileNotFound } } diff --git a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs index a5c33513..03cbaad2 100644 --- a/src/Kp2aBusinessLogic/database/edit/LoadDB.cs +++ b/src/Kp2aBusinessLogic/database/edit/LoadDB.cs @@ -123,7 +123,7 @@ namespace keepass2android { if (!(e is InvalidCompositeKeyException)) Kp2aLog.LogUnexpectedError(e); - Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + e.Message, false, Exception); + Finish(false, _app.GetResourceString(UiStringKey.ErrorOcurred) + " " + (e.Message ?? (e is FileNotFoundException ? _app.GetResourceString(UiStringKey.FileNotFound) : "")), false, Exception); return; }