Skip to content

Commit 7a4f721

Browse files
committed
fix(migration): check status of migration when fetching proxy password from keychain.
Signed-off-by: Camila Ayres <[email protected]>
1 parent c2b6605 commit 7a4f721

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/gui/accountmanager.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,11 @@ AccountPtr AccountManager::loadAccountHelper(QSettings &settings)
671671
acc->setUploadLimit(settings.value(networkUploadLimitC).toInt());
672672
acc->setDownloadLimit(settings.value(networkDownloadLimitC).toInt());
673673

674+
ConfigFile configFile;
674675
const auto proxyPasswordKey = QString(acc->userIdAtHostWithPort() + networkProxyPasswordKeychainKeySuffixC);
675-
const auto job = new QKeychain::ReadPasswordJob(Theme::instance()->appName(), this);
676+
const auto appName = configFile.isUnbrandedToBrandedMigrationInProgress() ? ConfigFile::unbrandedAppName
677+
: Theme::instance()->appName();
678+
const auto job = new QKeychain::ReadPasswordJob(appName, this);
676679
job->setKey(proxyPasswordKey);
677680
connect(job, &QKeychain::Job::finished, this, [acc](const QKeychain::Job *const incomingJob) {
678681
const auto incomingReadJob = qobject_cast<const QKeychain::ReadPasswordJob *>(incomingJob);

0 commit comments

Comments
 (0)