feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Do sanity check for keystore path and certificate alias

Browse Source 
Task-number: QTCREATORBUG-17304
Change-Id: Ifc0e354789d49efa3cb1d3e3e67eb40b331b40c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
This commit is contained in:
Vikas Pachdha
2017-01-10 16:33:56 +01:00
parent 8c0510f672
commit 3fa45170b5
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -182,6 +182,12 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta
bool AndroidBuildApkStep::verifyKeystorePassword()
{
if (!m_keystorePath.exists()) {
addOutput(tr("Cannot sign the package. Invalid keystore path(%1).")
.arg(m_keystorePath.toString()), ErrorOutput);
return false;
}
if (AndroidManager::checkKeystorePassword(m_keystorePath.toString(), m_keystorePasswd))
return true;
@@ -195,6 +201,13 @@ bool AndroidBuildApkStep::verifyKeystorePassword()
bool AndroidBuildApkStep::verifyCertificatePassword()
{
if (!AndroidManager::checkCertificateExists(m_keystorePath.toString(), m_keystorePasswd,
m_certificateAlias)) {
addOutput(tr("Cannot sign the package. Certificate alias %1 does not exist.")
.arg(m_certificateAlias), ErrorOutput);
return false;
}
if (AndroidManager::checkCertificatePassword(m_keystorePath.toString(), m_keystorePasswd,
m_certificateAlias, m_certificatePasswd)) {
return true;