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

fix to potential crash when reloading database

Browse Source
This commit is contained in:
Philipp Crocoll
2023-03-31 08:00:44 +02:00
parent cf222a2db1
commit 4910c73a5e
2 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/keepass2android/app/App.cs
View File

@@ -475,22 +475,26 @@ namespace keepass2android
builder.SetMessage(activity.GetString(Resource.String.AskReloadFile)); builder.SetMessage(activity.GetString(Resource.String.AskReloadFile));
builder.SetPositiveButton(activity.GetString(Android.Resource.String.Yes), bool buttonPressed = false;
builder.SetPositiveButton(activity.GetString(Android.Resource.String.Yes),
(dlgSender, dlgEvt) => (dlgSender, dlgEvt) =>
{ {
buttonPressed = true;
CurrentDb.ReloadRequested = true; CurrentDb.ReloadRequested = true;
activity.SetResult(KeePass.ExitReloadDb); activity.SetResult(KeePass.ExitReloadDb);
activity.Finish(); activity.Finish();
if (actionOnResult != null) if (actionOnResult != null)
{ {
actionOnResult(true); actionOnResult(true);
actionOnResult = null; actionOnResult = null;
} }
}); });
builder.SetNegativeButton(activity.GetString(Android.Resource.String.No), (dlgSender, dlgEvt) => builder.SetNegativeButton(activity.GetString(Android.Resource.String.No), (dlgSender, dlgEvt) =>
{ {
if (actionOnResult != null) buttonPressed = true;
if (actionOnResult != null)
{ {
actionOnResult(false); actionOnResult(false);
actionOnResult = null; actionOnResult = null;
@@ -501,10 +505,18 @@ namespace keepass2android
Dialog dialog = builder.Create(); Dialog dialog = builder.Create();
dialog.SetOnDismissListener(new Util.DismissListener(() => dialog.SetOnDismissListener(new Util.DismissListener(() =>
{ {
if (actionOnResult != null) //dismiss can be called when we're calling activity.Finish() during button press.
actionOnResult(false); //don't do anything then.
})); if (buttonPressed)
return;
if (actionOnResult != null)
{
actionOnResult(false);
actionOnResult = null;
}
}));
dialog.Show(); dialog.Show();
} }

11
src/keepass2android/views/PwGroupView.cs
View File

@@ -77,10 +77,15 @@ namespace keepass2android.view
AddView(gv, lp); AddView(gv, lp);
} }
private void PopulateView(View gv, PwGroup pw) { private void PopulateView(View gv, PwGroup pw)
{
_pwGroup = pw; _pwGroup = pw;
Kp2aLog.Log($"Populating group view {_groupBaseActivity.IsFinishing} {pw.Name}");
ImageView iv = (ImageView) gv.FindViewById(Resource.Id.icon);
if (_groupBaseActivity.IsFinishing)
return;
ImageView iv = (ImageView) gv.FindViewById(Resource.Id.icon);
Database db = App.Kp2a.FindDatabaseForElement(pw); Database db = App.Kp2a.FindDatabaseForElement(pw);
db.DrawableFactory.AssignDrawableTo(iv, _groupBaseActivity, db.KpDatabase, pw.IconId, pw.CustomIconUuid, true); db.DrawableFactory.AssignDrawableTo(iv, _groupBaseActivity, db.KpDatabase, pw.IconId, pw.CustomIconUuid, true);
gv.FindViewById(Resource.Id.icon).Visibility = ViewStates.Visible; gv.FindViewById(Resource.Id.icon).Visibility = ViewStates.Visible;