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

make sure AutoExec items with unknown protocols don't crash the app, closes #1452

Browse Source
This commit is contained in:
Philipp Crocoll
2021-02-19 08:44:08 +01:00
parent 47f07c66bf
commit 8071e0692a
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/keepass2android/PasswordActivity.cs
View File

@@ -1981,8 +1981,18 @@ namespace keepass2android
}
}
private void InitializeFilenameView() {
SetEditText(Resource.Id.filename, App.Kp2a.GetFileStorage(_ioConnection).GetDisplayName(_ioConnection));
private void InitializeFilenameView()
{
string filenameToShow = _ioConnection.Path;
try
{
filenameToShow = App.Kp2a.GetFileStorage(_ioConnection).GetDisplayName(_ioConnection);
}
catch (Exception e)
{
Kp2aLog.LogUnexpectedError(e);
}
SetEditText(Resource.Id.filename, filenameToShow);
}

29
src/keepass2android/SelectCurrentDbActivity.cs
View File

@@ -35,7 +35,23 @@ namespace keepass2android
public class SelectCurrentDbActivity : LifecycleAwareActivity
{
private int ReqCodeOpenNewDb = 1;
private static bool IsValidIoc(AutoExecItem item)
{
IOConnectionInfo itemIoc;
if (!KeeAutoExecExt.TryGetDatabaseIoc(item, out itemIoc))
return false;
try
{
//see if we have a file storage for the given protocol
App.Kp2a.GetFileStorage(itemIoc);
}
catch (Exception e)
{
return false;
}
return true;
}
public class OpenDatabaseAdapter : BaseAdapter
{
@@ -164,9 +180,15 @@ namespace keepass2android
IOConnectionInfo itemIoc;
return KeeAutoExecExt.TryGetDatabaseIoc(item, out itemIoc) &&
displayedDb.Ioc.IsSameFileAs(itemIoc);
}))
})
&& IsValidIoc(item)
)
.ToList();
}
}
private void OnAutoExecItemSelected(AutoExecItem autoExecItem)
@@ -438,6 +460,9 @@ namespace keepass2android
continue;
if (!KeeAutoExecExt.IsDeviceEnabled(autoOpenItem, thisDevice, out _))
continue;
if (!IsValidIoc(autoOpenItem))
continue;
IOConnectionInfo dbIoc;
if (KeeAutoExecExt.TryGetDatabaseIoc(autoOpenItem, out dbIoc) &&
App.Kp2a.TryGetDatabase(dbIoc) == null &&