mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-12-23 20:12:34 +00:00
refactor indendation, fix a bug in MinecraftProcess & fix a bug in
InstanceLauncher
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@@ -25,72 +25,72 @@ int scrambler = 0x9586309;
|
||||
|
||||
QString scramble(QString in_)
|
||||
{
|
||||
QByteArray in = in_.toUtf8();
|
||||
QByteArray out;
|
||||
for (int i = 0; i<in.length(); i++)
|
||||
out.append(in.at(i) ^ scrambler);
|
||||
return QString::fromUtf8(out);
|
||||
QByteArray in = in_.toUtf8();
|
||||
QByteArray out;
|
||||
for (int i = 0; i<in.length(); i++)
|
||||
out.append(in.at(i) ^ scrambler);
|
||||
return QString::fromUtf8(out);
|
||||
}
|
||||
|
||||
inline QString base64(QString in)
|
||||
{
|
||||
return QString(in.toUtf8().toBase64());
|
||||
return QString(in.toUtf8().toBase64());
|
||||
}
|
||||
inline QString unbase64(QString in)
|
||||
{
|
||||
return QString::fromUtf8(QByteArray::fromBase64(in.toLatin1()));
|
||||
return QString::fromUtf8(QByteArray::fromBase64(in.toLatin1()));
|
||||
}
|
||||
|
||||
inline QString scramble64(QString in)
|
||||
{
|
||||
return base64(scramble(in));
|
||||
return base64(scramble(in));
|
||||
}
|
||||
inline QString unscramble64(QString in)
|
||||
{
|
||||
return scramble(unbase64(in));
|
||||
return scramble(unbase64(in));
|
||||
}
|
||||
|
||||
// StubKeyring implementation
|
||||
inline QString generateKey(QString service, QString username)
|
||||
{
|
||||
return QString("%1/%2").arg(base64(service)).arg(scramble64(username));
|
||||
return QString("%1/%2").arg(base64(service)).arg(scramble64(username));
|
||||
}
|
||||
|
||||
bool StubKeyring::storePassword(QString service, QString username, QString password)
|
||||
{
|
||||
m_settings.setValue(generateKey(service, username), scramble64(password));
|
||||
return true;
|
||||
m_settings.setValue(generateKey(service, username), scramble64(password));
|
||||
return true;
|
||||
}
|
||||
|
||||
QString StubKeyring::getPassword(QString service, QString username)
|
||||
{
|
||||
QString key = generateKey(service, username);
|
||||
if (!m_settings.contains(key))
|
||||
return QString();
|
||||
return unscramble64(m_settings.value(key).toString());
|
||||
QString key = generateKey(service, username);
|
||||
if (!m_settings.contains(key))
|
||||
return QString();
|
||||
return unscramble64(m_settings.value(key).toString());
|
||||
}
|
||||
|
||||
inline bool StubKeyring::hasPassword(QString service, QString username)
|
||||
bool StubKeyring::hasPassword(QString service, QString username)
|
||||
{
|
||||
return m_settings.contains(generateKey(service, username));
|
||||
return m_settings.contains(generateKey(service, username));
|
||||
}
|
||||
|
||||
QStringList StubKeyring::getStoredAccounts(QString service)
|
||||
{
|
||||
service = base64(service).append('/');
|
||||
QStringList out;
|
||||
QStringList in(m_settings.allKeys());
|
||||
QStringListIterator it(in);
|
||||
while(it.hasNext())
|
||||
{
|
||||
QString c = it.next();
|
||||
if (c.startsWith(service))
|
||||
out << unscramble64(c.mid(service.length()));
|
||||
}
|
||||
return out;
|
||||
service = base64(service).append('/');
|
||||
QStringList out;
|
||||
QStringList in(m_settings.allKeys());
|
||||
QStringListIterator it(in);
|
||||
while(it.hasNext())
|
||||
{
|
||||
QString c = it.next();
|
||||
if (c.startsWith(service))
|
||||
out << unscramble64(c.mid(service.length()));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
StubKeyring::StubKeyring() :
|
||||
m_settings(QSettings::UserScope, "Orochimarufan", "Keyring")
|
||||
m_settings(QSettings::UserScope, "Orochimarufan", "Keyring")
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user