qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'AlexVallat/Keepass2AndroidPerfOpt'

Browse Source 
Conflicts:
	src/Kp2aBusinessLogic/database/edit/LoadDB.cs
This commit is contained in:
Philipp Crocoll
2013-08-14 06:11:27 +02:00
parent c63302ef5e 05c131a745
commit e014b2c185
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Kp2aBusinessLogic/database/edit/LoadDB.cs
View File

@@ -17,6 +17,7 @@ This file is part of Keepass2Android, Copyright 2013 Philipp Crocoll. This file
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using KeePassLib.Serialization;
@@ -56,11 +57,25 @@ namespace keepass2android
Kp2aLog.Log("KeyFileException");
Finish(false, /*TODO Localize: use Keepass error text KPRes.KeyFileError (including "or invalid format")*/ _app.GetResourceString(UiStringKey.keyfile_does_not_exist));
}
catch (Exception e) {
catch (AggregateException e)
{
string message = e.Message;
foreach (var innerException in e.InnerExceptions)
{
message = innerException.Message; // Override the message shown with the last (hopefully most recent) inner exception
Kp2aLog.Log("Exception: " + message);
}
Finish(false, "An error occured: " + message);
return;
}
catch (Exception e)
{
Kp2aLog.Log("Exception: " + e);
Finish(false, "An error occured: " + e.Message);
return;
}
}
/* catch (InvalidPasswordException e) {
finish(false, Ctx.GetString(Resource.String.InvalidPassword));
return;