procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Alpha version 1.3.1: Fix build for old OS X versions.

This commit is contained in:
John Preston 2018-06-04 23:58:39 +03:00
parent 958d55a594
commit 812ffb4297
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Telegram/SourceFiles/passport/passport_encryption.cpp
View File

@ -199,7 +199,7 @@ std::map<QString, QString> DeserializeData(bytes::const_span bytes) {
auto result = std::map<QString, QString>(); auto result = std::map<QString, QString>();
for (auto i = object.constBegin(), e = object.constEnd(); i != e; ++i) { for (auto i = object.constBegin(), e = object.constEnd(); i != e; ++i) {
const auto key = i.key(); const auto key = i.key();
switch (i->type()) { switch ((*i).type()) {
case QJsonValue::Null: { case QJsonValue::Null: {
LOG(("API Error: null found inside decrypted JSON root. " LOG(("API Error: null found inside decrypted JSON root. "
"Defaulting to empty string value.")); "Defaulting to empty string value."));
@ -218,10 +218,10 @@ std::map<QString, QString> DeserializeData(bytes::const_span bytes) {
case QJsonValue::Double: { case QJsonValue::Double: {
LOG(("API Error: double found inside decrypted JSON root. " LOG(("API Error: double found inside decrypted JSON root. "
"Converting to string.")); "Converting to string."));
result[key] = QString::number(i->toDouble()); result[key] = QString::number((*i).toDouble());
} break; } break;
case QJsonValue::String: { case QJsonValue::String: {
result[key] = i->toString(); result[key] = (*i).toString();
} break; } break;
case QJsonValue::Array: { case QJsonValue::Array: {
LOG(("API Error: array found inside decrypted JSON root. " LOG(("API Error: array found inside decrypted JSON root. "
@ -264,7 +264,7 @@ std::vector<DataError> DeserializeErrors(bytes::const_span json) {
if (typeIt == fields.constEnd()) { if (typeIt == fields.constEnd()) {
LOG(("API Error: type was not found in an error.")); LOG(("API Error: type was not found in an error."));
continue; continue;
} else if (!typeIt->isString()) { } else if (!(*typeIt).isString()) {
LOG(("API Error: type was not a string in an error.")); LOG(("API Error: type was not a string in an error."));
continue; continue;
} }
@ -272,7 +272,7 @@ std::vector<DataError> DeserializeErrors(bytes::const_span json) {
if (descriptionIt == fields.constEnd()) { if (descriptionIt == fields.constEnd()) {
LOG(("API Error: description was not found in an error.")); LOG(("API Error: description was not found in an error."));
continue; continue;
} else if (!typeIt->isString()) { } else if (!(*typeIt).isString()) {
LOG(("API Error: description was not a string in an error.")); LOG(("API Error: description was not a string in an error."));
continue; continue;
} }
@ -280,29 +280,29 @@ std::vector<DataError> DeserializeErrors(bytes::const_span json) {
if (targetIt == fields.constEnd()) { if (targetIt == fields.constEnd()) {
LOG(("API Error: target aws not found in an error.")); LOG(("API Error: target aws not found in an error."));
continue; continue;
} else if (!targetIt->isString()) { } else if (!(*targetIt).isString()) {
LOG(("API Error: target was not as string in an error.")); LOG(("API Error: target was not as string in an error."));
continue; continue;
} }
auto next = DataError(); auto next = DataError();
next.type = typeIt->toString(); next.type = (*typeIt).toString();
next.text = descriptionIt->toString(); next.text = (*descriptionIt).toString();
const auto fieldIt = fields.constFind("field"); const auto fieldIt = fields.constFind("field");
const auto fileHashIt = fields.constFind("file_hash"); const auto fileHashIt = fields.constFind("file_hash");
if (fieldIt != fields.constEnd()) { if (fieldIt != fields.constEnd()) {
if (!fieldIt->isString()) { if (!(*fieldIt).isString()) {
LOG(("API Error: field was not a string in an error.")); LOG(("API Error: field was not a string in an error."));
continue; continue;
} }
next.key = fieldIt->toString(); next.key = (*fieldIt).toString();
} else if (fileHashIt != fields.constEnd()) { } else if (fileHashIt != fields.constEnd()) {
if (!fileHashIt->isString()) { if (!(*fileHashIt).isString()) {
LOG(("API Error: file_hash was not a string in an error.")); LOG(("API Error: file_hash was not a string in an error."));
continue; continue;
} }
next.key = QByteArray::fromBase64( next.key = QByteArray::fromBase64(
fileHashIt->toString().toUtf8()); (*fileHashIt).toString().toUtf8());
} else if (targetIt->toString() == "selfie") { } else if ((*targetIt).toString() == "selfie") {
next.key = QByteArray(); next.key = QByteArray();
} }
result.push_back(std::move(next)); result.push_back(std::move(next));

6
Telegram/SourceFiles/platform/mac/launcher_mac.mm
View File

@ -67,8 +67,10 @@ QString DeviceModel() {
QString SystemVersion() { QString SystemVersion() {
const int version = QSysInfo::macVersion(); const int version = QSysInfo::macVersion();
constexpr int kShift = 2; constexpr int kShift = 2;
if (version == QSysInfo::MV_None if (version == QSysInfo::MV_Unknown
|| version == QSysInfo::MV_Unknown #ifndef OS_MAC_OLD
|| version == QSysInfo::MV_None
#endif // OS_MAC_OLD
|| version < kShift + 6) { || version < kShift + 6) {
return "OS X"; return "OS X";
} else if (version < kShift + 12) { } else if (version < kShift + 12) {