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

automatically reload database at ExitReloadDb -> fixes https://keepass2android.codeplex.com/workitem/274 (if loading fails, old key is not visible in UI)

Browse Source
This commit is contained in:
Philipp Crocoll
2014-12-19 21:26:18 +01:00
parent a93fd417ad
commit f1c01d2955
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/keepass2android/PasswordActivity.cs
View File

@@ -257,28 +257,29 @@ namespace keepass2android
Finish(); Finish();
break; break;
case KeePass.ExitReloadDb: case KeePass.ExitReloadDb:
//if the activity was killed, fill password/keyfile so the user can directly hit load again
if (App.Kp2a.GetDb().Loaded) if (App.Kp2a.GetDb().Loaded)
{ {
if (App.Kp2a.GetDb().KpDatabase.MasterKey.ContainsType(typeof(KcpPassword))) //remember the composite key for reloading:
{ var compositeKey = App.Kp2a.GetDb().KpDatabase.MasterKey;
KcpPassword kcpPassword = (KcpPassword)App.Kp2a.GetDb().KpDatabase.MasterKey.GetUserKey(typeof(KcpPassword)); //lock the database:
String password = kcpPassword.Password.ReadString(); App.Kp2a.LockDatabase(false);
SetEditText(Resource.Id.password, password);
}
if (App.Kp2a.GetDb().KpDatabase.MasterKey.ContainsType(typeof(KcpKeyFile)))
{
KcpKeyFile kcpKeyfile = (KcpKeyFile)App.Kp2a.GetDb().KpDatabase.MasterKey.GetUserKey(typeof(KcpKeyFile));
_keyFileOrProvider = IOConnectionInfo.SerializeToString(kcpKeyfile.Ioc);
UpdateKeyfileIocView();
} //reload the database (without most other stuff performed in PerformLoadDatabase.
// We're assuming that the db file (and if appropriate also the key file) are still available
// and there's no need to re-init the file storage. if it is, loading will fail and the user has
// to retry with typing the full password, but that's intended to avoid showing the password to a
// a potentially unauthorized user (feature request https://keepass2android.codeplex.com/workitem/274)
Handler handler = new Handler();
OnFinish onFinish = new AfterLoad(handler, this);
_performingLoad = true;
LoadDb task = new LoadDb(App.Kp2a, _ioConnection, _loadDbTask, compositeKey, _keyFileOrProvider, onFinish);
_loadDbTask = null; // prevent accidental re-use
new ProgressTask(App.Kp2a, this, task).Run();
} }
App.Kp2a.LockDatabase(false);
break; break;
case Result.Ok: case Result.Ok:
if (requestCode == RequestCodeSelectKeyfile) if (requestCode == RequestCodeSelectKeyfile)