Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-27 06:04:42 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve error message when browser proxy cannot be found (#9385)

Browse source 
Co-authored-by: Blessio <blessio.blog@blessio.com>
Co-authored-by: Jonathan White <support@dmapps.us>
This commit is contained in:
Jonathan White 2023-08-05 21:20:45 -04:00
parent 4ea0a1058c
commit 663d4d99ae
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
8 changed files with 119 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/browser/NativeMessageInstaller.cpp
View file

@ -272,17 +272,24 @@ QString constructFlatpakPath()
#endif
/**
* Gets the path to keepassxc-proxy binary
*
* @param location Custom proxy path
* @return path Path to keepassxc-proxy
* Returns the effective proxy path used to build the native messaging JSON script
*/
QString NativeMessageInstaller::getProxyPath() const
{
QString result;
if (browserSettings()->useCustomProxy()) {
return browserSettings()->customProxyLocation();
result = browserSettings()->customProxyLocation();
} else {
result = getInstalledProxyPath();
}
return result;
}
/**
* Returns the original proxy path at the time of installation
*/
QString NativeMessageInstaller::getInstalledProxyPath() const
{
QString path;
#if defined(KEEPASSXC_DIST_APPIMAGE)
path = QProcessEnvironment::systemEnvironment().value("APPIMAGE");