Commit 584d4eb8 authored by jpetrell's avatar jpetrell

Merge branch 'jb36739' into 'master'

[devicelock] Use term security code instead of lock code. Contributes to JB#36739

See merge request !24
parents 1fbbe608 3b8cb1a0
......@@ -22,7 +22,7 @@ Requires: nemo-devicelock-daemon
%{summary}.
%package -n nemo-devicelock-daemon-cli
Summary: The default command line lock code device lock daemon for Nemo Mobile
Summary: The default command line security code device lock daemon for Nemo Mobile
Group: System/GUI/Other
Requires: %{name} = %{version}-%{release}
Provides: nemo-devicelock-daemon = %{version}-%{release}
......
......@@ -231,7 +231,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
case Idle:
return;
case Authenticating:
qCDebug(daemon, "Lock code entered for authentication.");
qCDebug(daemon, "Security code entered for authentication.");
switch ((attempts = checkCode(code))) {
case Success:
case SecurityCodeExpired:
......@@ -243,7 +243,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
}
break;
case AuthenticatingForChange:
qCDebug(daemon, "Lock code entered for code change authentication.");
qCDebug(daemon, "Security code entered for code change authentication.");
switch ((attempts = checkCode(code))) {
case Success:
case SecurityCodeExpired:
......@@ -257,7 +257,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
}
break;
case EnteringNewSecurityCode:
qCDebug(daemon, "New lock code entered.");
qCDebug(daemon, "New security code entered.");
m_newCode = code;
m_state = RepeatingNewSecurityCode;
feedback(AuthenticationInput::RepeatNewSecurityCode, -1);
......@@ -273,7 +273,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
}
return;
case RepeatingNewSecurityCode: {
qCDebug(daemon, "New lock code confirmation entered.");
qCDebug(daemon, "New security code confirmation entered.");
if (m_newCode != code) {
qCDebug(daemon, "Lock codes don't match.");
m_newCode.clear();
......@@ -300,7 +300,7 @@ void HostAuthenticator::enterSecurityCode(const QString &code)
return;
}
case AuthenticatingForClear: {
qCDebug(daemon, "Lock code entered for clear authentication.");
qCDebug(daemon, "Security code entered for clear authentication.");
if ((attempts = checkCode(code)) == 0) {
if (clearCode(code)) {
securityCodeCleared();
......@@ -345,7 +345,7 @@ void HostAuthenticator::setCodeFinished(int result)
case Success:
m_currentCode.clear();
qCDebug(daemon, "Lock code changed.");
qCDebug(daemon, "Security code changed.");
securityCodeChanged(authenticateChallengeCode(m_challengeCode));
break;
case SecurityCodeInHistory:
......@@ -367,7 +367,7 @@ void HostAuthenticator::setCodeFinished(int result)
break;
default:
m_currentCode.clear();
qCDebug(daemon, "Lock code change failed.");
qCDebug(daemon, "Security code change failed.");
abortAuthentication(AuthenticationInput::SoftwareError);
break;
......
......@@ -266,7 +266,7 @@ void HostDeviceLock::setCodeFinished(int result)
{
switch (result) {
case Success:
qCDebug(daemon, "Lock code changed.");
qCDebug(daemon, "Security code changed.");
m_currentCode.clear();
if (m_state == ChangingSecurityCode || m_state == RepeatingNewSecurityCode) {
unlockFinished(unlockWithCode(m_newCode));
......@@ -294,7 +294,7 @@ void HostDeviceLock::setCodeFinished(int result)
}
return;
default:
qCDebug(daemon, "Lock code change failed.");
qCDebug(daemon, "Security code change failed.");
m_currentCode.clear();
if (m_state == Canceled) {
m_state = Idle;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment