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

Revert "avoid potential crash in Android 12 while reloading the Database, closes https://github.com/PhilippC/keepass2android/issues/1909"

Browse Source 
This reverts commit 40146a42ce,
because the root problem is fixed.
This commit is contained in:
nikoyak
2022-12-20 11:42:31 +03:00
parent 5d06a8b62a
commit b9d0f56e0f
2 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/keepass2android/views/PwEntryView.cs
View File

@@ -72,20 +72,7 @@ namespace keepass2android.view
_textView = (TextView)ev.FindViewById(Resource.Id.entry_text); _textView = (TextView)ev.FindViewById(Resource.Id.entry_text);
_textView.TextSize = PrefsUtil.GetListTextSize(groupActivity); _textView.TextSize = PrefsUtil.GetListTextSize(groupActivity);
Database db; Database db = App.Kp2a.FindDatabaseForElement(pw);
try
{
db = App.Kp2a.FindDatabaseForElement(pw);
}
catch (Exception e)
{
//for some reason, since Android 12 we get here when the database is reloaded (after making remote changes and selecting sync)
//we can just ignore this.
Console.WriteLine(e);
return;
}
ev.FindViewById(Resource.Id.entry_icon_bkg).Visibility = db.DrawableFactory.IsWhiteIconSet ? ViewStates.Visible : ViewStates.Gone; ev.FindViewById(Resource.Id.entry_icon_bkg).Visibility = db.DrawableFactory.IsWhiteIconSet ? ViewStates.Visible : ViewStates.Gone;

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

@@ -81,22 +81,8 @@ namespace keepass2android.view
_pwGroup = pw; _pwGroup = pw;
ImageView iv = (ImageView) gv.FindViewById(Resource.Id.icon); ImageView iv = (ImageView) gv.FindViewById(Resource.Id.icon);
Database db = App.Kp2a.FindDatabaseForElement(pw);
Database db; db.DrawableFactory.AssignDrawableTo(iv, _groupBaseActivity, db.KpDatabase, pw.IconId, pw.CustomIconUuid, true);
try
{
db = App.Kp2a.FindDatabaseForElement(pw);
}
catch (Exception e)
{
//for some reason, since Android 12 we get here when the database is reloaded (after making remote changes and selecting sync)
//we can just ignore this.
Console.WriteLine(e);
return;
}
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;
gv.FindViewById(Resource.Id.check_mark).Visibility = ViewStates.Invisible; gv.FindViewById(Resource.Id.check_mark).Visibility = ViewStates.Invisible;