[nemo-qml-plugin-devicelock] Support separate encryption code. Contrbutes to JB#54397 #2
Conversation
salmelamike
force-pushed
the
jb54397
branch
2 times, most recently
from
a38ee4a
to
335dd1e
Compare
salmelamike
force-pushed
the
jb54397
branch
6 times, most recently
from
12f0b1e
to
de9bea9
Compare
…butes to JB#54397 Add means to change encryption and security codes separately.
| @@ -404,6 +405,10 @@ void HostAuthenticationInput::lockedOut( | |||
| } | |||
| } | |||
|
|
|||
| bool HostAuthenticationInput::checkEncryptionCodeValidity(const QString &code) | |||
| { | |||
| return Sailfish::MinUi::checkCodeValidity(code.toLocal8Bit().data()); | |||
There was a problem hiding this comment.
MinUI provides a boot time UI framework, code validity check sounds like something that should be part of device lock libraries, used by encryption unlock minui, no the other way around.
There was a problem hiding this comment.
What this checks is that if the code characters are defined in MinUI keyboard. But good point, the logic probably should be moved here.
| @@ -2,11 +2,16 @@ | |||
| "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"> | |||
| <node name="/authenticator"> | |||
| <interface name="org.nemomobile.devicelock.SecurityCodeSettings"> | |||
| <property name="SecurityCodeSet" type="b"/> | |||
| <property name="set" type="b"/> | |||
There was a problem hiding this comment.
Why the name change? 'set' is ambiguous, and a verb.
The capitalization of property and method names have all followed D-Bus standards until now too.
| @@ -81,16 +81,42 @@ HostAuthenticationInput::Availability CliAuthenticator::availability(QVariantMap | |||
| } | |||
| } | |||
|
|
|||
| HostAuthenticationInput::Availability CliAuthenticator::encAvailability(QVariantMap *) const | |||
There was a problem hiding this comment.
Qt style prefers full words to contractions, and encryption in full is used elsewhere in the API.
|
|
||
| propertyChanged( | ||
| QStringLiteral("org.nemomobile.devicelock.DeviceLock"), | ||
| QStringLiteral("EncrypionEnabled"), |
There was a problem hiding this comment.
Encryption is misspelled.
| if (pname == QLatin1String("devicelock_settings.conf")) { | ||
| reloadSettings(); | ||
| } | ||
| if (pname == m_alphanumEncryptionCodeSetFile.toLatin1()) { |
There was a problem hiding this comment.
The conversion to Latin1 is unnecessary and does the opposite of what you want and would probably fail to compile with QT_NO_CAST_FROM_ASCII. You're comparing a string of known encoding QLatin1String to one of unknown encoding QByteArray.
The original code is technically incorrect too, it shouldn't assume pevent->name is a latin1 string but utf8. Arbitrary files won't end up in the watched directory though so in practice all files should be within the latin1 subset of utf8.
| @@ -277,4 +285,21 @@ void SettingsWatcher::reloadSettings() | |||
| g_key_file_free(settings); | |||
| } | |||
|
|
|||
| void SettingsWatcher::readAlphanumericEncryptionSet() | |||
| { | |||
| bool exists = QFile(m_alphanumEncryptionCodeSetFile).exists(); | |||
There was a problem hiding this comment.
Use the static exists() function of QFile instead of constructing an object. QFile::exists(m_alphanumEncryptionCodeSetFile)
|
We are not doing separate encryption codes. Closing. |
Add means to change encryption and security codes separately.