Skip to content
Snippets Groups Projects
Commit 4f9991e6 authored by Rafael Roquetto's avatar Rafael Roquetto
Browse files

BlackBerry: update debug token requester error string


Add handling for 10.2 NDK error messages

Change-Id: I8f7a809cb14a288aaef44afcc9e3127595d4c793
Reviewed-by: default avatarMehdi Fekari <mfekari@blackberry.com>
Reviewed-by: default avatarNicolas Arnaud-Cormos <nicolas@kdab.com>
parent 87a5c100
No related branches found
No related tags found
No related merge requests found
...@@ -34,7 +34,9 @@ ...@@ -34,7 +34,9 @@
namespace { namespace {
static const char PROCESS_NAME[] = "blackberry-debugtokenrequest"; static const char PROCESS_NAME[] = "blackberry-debugtokenrequest";
static const char ERR_WRONG_CSK_PASS[] = "The signature on the code signing request didn't verify."; static const char ERR_WRONG_CSK_PASS[] = "The signature on the code signing request didn't verify.";
static const char ERR_WRONG_CSK_PASS_10_2[] = "The specified CSK password is not valid.";
static const char ERR_WRONG_KEYSTORE_PASS[] = "Failed to decrypt keystore, invalid password"; static const char ERR_WRONG_KEYSTORE_PASS[] = "Failed to decrypt keystore, invalid password";
static const char ERR_WRONG_KEYSTORE_PASS_10_2[] = "Failed to decrypt keystore, invalid store password or store password not supplied.";
static const char ERR_NETWORK_UNREACHABLE[] = "Network is unreachable"; static const char ERR_NETWORK_UNREACHABLE[] = "Network is unreachable";
static const char ERR_NOT_YET_REGISTGERED[] = "Not yet registered to request debug tokens"; static const char ERR_NOT_YET_REGISTGERED[] = "Not yet registered to request debug tokens";
} }
...@@ -46,8 +48,9 @@ BlackBerryDebugTokenRequester::BlackBerryDebugTokenRequester(QObject *parent) : ...@@ -46,8 +48,9 @@ BlackBerryDebugTokenRequester::BlackBerryDebugTokenRequester(QObject *parent) :
BlackBerryNdkProcess(QLatin1String(PROCESS_NAME), parent) BlackBerryNdkProcess(QLatin1String(PROCESS_NAME), parent)
{ {
addErrorStringMapping(QLatin1String(ERR_WRONG_CSK_PASS), WrongCskPassword); addErrorStringMapping(QLatin1String(ERR_WRONG_CSK_PASS), WrongCskPassword);
addErrorStringMapping(QLatin1String(ERR_WRONG_CSK_PASS_10_2), WrongCskPassword);
addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword); addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword);
addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS), WrongKeystorePassword); addErrorStringMapping(QLatin1String(ERR_WRONG_KEYSTORE_PASS_10_2), WrongKeystorePassword);
addErrorStringMapping(QLatin1String(ERR_NETWORK_UNREACHABLE), NetworkUnreachable); addErrorStringMapping(QLatin1String(ERR_NETWORK_UNREACHABLE), NetworkUnreachable);
addErrorStringMapping(QLatin1String(ERR_NOT_YET_REGISTGERED), NotYetRegistered); addErrorStringMapping(QLatin1String(ERR_NOT_YET_REGISTGERED), NotYetRegistered);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment