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

avoid opening password activity when database is already open, closes https://github.com/PhilippC/keepass2android/issues/706

Browse Source
This commit is contained in:
Philipp Crocoll
2019-03-25 10:10:19 +01:00
parent d8286eb639
commit c4a1b6a82e
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/keepass2android/SelectCurrentDbActivity.cs
View File

@@ -215,15 +215,29 @@ namespace keepass2android
if (!string.IsNullOrEmpty(Intent.GetStringExtra(Util.KeyFilename)))
{
//forward to password activity
Intent i = new Intent(this, typeof(PasswordActivity));
IOConnectionInfo ioc = new IOConnectionInfo();
Util.SetIoConnectionFromIntent(ioc, Intent);
Util.PutIoConnectionToIntent(ioc, i);
i.PutExtra(PasswordActivity.KeyKeyfile, i.GetStringExtra(PasswordActivity.KeyKeyfile));
i.PutExtra(PasswordActivity.KeyPassword, i.GetStringExtra(PasswordActivity.KeyPassword));
LaunchingOther = true;
StartActivityForResult(i, ReqCodeOpenNewDb);
if (App.Kp2a.TrySelectCurrentDb(ioc))
{
if (!OpenAutoExecEntries(App.Kp2a.CurrentDb))
{
LaunchingOther = true;
AppTask.CanActivateSearchViewOnStart = true;
AppTask.LaunchFirstGroupActivity(this);
}
}
else
{
//forward to password activity
Intent i = new Intent(this, typeof(PasswordActivity));
Util.PutIoConnectionToIntent(ioc, i);
i.PutExtra(PasswordActivity.KeyKeyfile, i.GetStringExtra(PasswordActivity.KeyKeyfile));
i.PutExtra(PasswordActivity.KeyPassword, i.GetStringExtra(PasswordActivity.KeyPassword));
LaunchingOther = true;
StartActivityForResult(i, ReqCodeOpenNewDb);
}
}
else
{
@@ -282,6 +296,14 @@ namespace keepass2android
}
if (App.Kp2a.TrySelectCurrentDb(ioc))
{
if (OpenAutoExecEntries(App.Kp2a.CurrentDb)) return false;
LaunchingOther = true;
AppTask.CanActivateSearchViewOnStart = true;
AppTask.LaunchFirstGroupActivity(this);
}
else
{
Intent launchIntent = new Intent(this, typeof(PasswordActivity));
Util.PutIoConnectionToIntent(ioc, launchIntent);