mirror of https://github.com/procxx/kepka.git
crash fixed, 0.9.12 dev
This commit is contained in:
parent
032ca377cd
commit
a83700f943
|
@ -2948,7 +2948,7 @@ namespace Local {
|
||||||
result += _stringSize(user->firstName) + _stringSize(user->lastName) + _stringSize(user->phone) + _stringSize(user->username) + sizeof(quint64);
|
result += _stringSize(user->firstName) + _stringSize(user->lastName) + _stringSize(user->phone) + _stringSize(user->username) + sizeof(quint64);
|
||||||
|
|
||||||
// flags
|
// flags
|
||||||
if (AppVersion >= 9009) {
|
if (AppVersion >= 9012) {
|
||||||
result += sizeof(qint32);
|
result += sizeof(qint32);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2975,14 +2975,14 @@ namespace Local {
|
||||||
UserData *user = peer->asUser();
|
UserData *user = peer->asUser();
|
||||||
|
|
||||||
stream << user->firstName << user->lastName << user->phone << user->username << quint64(user->access);
|
stream << user->firstName << user->lastName << user->phone << user->username << quint64(user->access);
|
||||||
if (AppVersion >= 9009) {
|
if (AppVersion >= 9012) {
|
||||||
stream << qint32(user->flags);
|
stream << qint32(user->flags);
|
||||||
}
|
}
|
||||||
stream << qint32(user->onlineTill) << qint32(user->contact) << qint32(user->botInfo ? user->botInfo->version : -1);
|
stream << qint32(user->onlineTill) << qint32(user->contact) << qint32(user->botInfo ? user->botInfo->version : -1);
|
||||||
} else if (peer->isChat()) {
|
} else if (peer->isChat()) {
|
||||||
ChatData *chat = peer->asChat();
|
ChatData *chat = peer->asChat();
|
||||||
|
|
||||||
qint32 flagsData = (AppVersion >= 9009) ? chat->flags : (chat->haveLeft() ? 1 : 0);
|
qint32 flagsData = (AppVersion >= 9012) ? chat->flags : (chat->haveLeft() ? 1 : 0);
|
||||||
|
|
||||||
stream << chat->name << qint32(chat->count) << qint32(chat->date) << qint32(chat->version) << qint32(chat->creator);
|
stream << chat->name << qint32(chat->count) << qint32(chat->date) << qint32(chat->version) << qint32(chat->creator);
|
||||||
stream << qint32(chat->isForbidden ? 1 : 0) << qint32(flagsData) << chat->invitationUrl;
|
stream << qint32(chat->isForbidden ? 1 : 0) << qint32(flagsData) << chat->invitationUrl;
|
||||||
|
@ -3010,7 +3010,7 @@ namespace Local {
|
||||||
quint64 access;
|
quint64 access;
|
||||||
qint32 flags = 0, onlineTill, contact, botInfoVersion;
|
qint32 flags = 0, onlineTill, contact, botInfoVersion;
|
||||||
from.stream >> first >> last >> phone >> username >> access;
|
from.stream >> first >> last >> phone >> username >> access;
|
||||||
if (from.version >= 9009) {
|
if (from.version >= 9012) {
|
||||||
from.stream >> flags;
|
from.stream >> flags;
|
||||||
}
|
}
|
||||||
from.stream >> onlineTill >> contact >> botInfoVersion;
|
from.stream >> onlineTill >> contact >> botInfoVersion;
|
||||||
|
@ -3042,7 +3042,7 @@ namespace Local {
|
||||||
qint32 count, date, version, creator, forbidden, flagsData, flags;
|
qint32 count, date, version, creator, forbidden, flagsData, flags;
|
||||||
from.stream >> name >> count >> date >> version >> creator >> forbidden >> flagsData >> invitationUrl;
|
from.stream >> name >> count >> date >> version >> creator >> forbidden >> flagsData >> invitationUrl;
|
||||||
|
|
||||||
if (from.version >= 9009) {
|
if (from.version >= 9012) {
|
||||||
flags = flagsData;
|
flags = flagsData;
|
||||||
} else {
|
} else {
|
||||||
// flagsData was haveLeft
|
// flagsData was haveLeft
|
||||||
|
@ -3131,6 +3131,12 @@ namespace Local {
|
||||||
_writeMap();
|
_writeMap();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (saved.version == 9011) { // broken dev version
|
||||||
|
clearKey(_savedPeersKey);
|
||||||
|
_savedPeersKey = 0;
|
||||||
|
_writeMap();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
quint32 count = 0;
|
quint32 count = 0;
|
||||||
saved.stream >> count;
|
saved.stream >> count;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.9.11</string>
|
<string>0.9.12</string>
|
||||||
<key>CFBundleSignature</key>
|
<key>CFBundleSignature</key>
|
||||||
<string>????</string>
|
<string>????</string>
|
||||||
<key>CFBundleURLTypes</key>
|
<key>CFBundleURLTypes</key>
|
||||||
|
|
Binary file not shown.
|
@ -1687,7 +1687,7 @@
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
CURRENT_PROJECT_VERSION = 0.9.11;
|
CURRENT_PROJECT_VERSION = 0.9.12;
|
||||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
GCC_OPTIMIZATION_LEVEL = 0;
|
GCC_OPTIMIZATION_LEVEL = 0;
|
||||||
|
@ -1706,7 +1706,7 @@
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
COPY_PHASE_STRIP = YES;
|
COPY_PHASE_STRIP = YES;
|
||||||
CURRENT_PROJECT_VERSION = 0.9.11;
|
CURRENT_PROJECT_VERSION = 0.9.12;
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
|
||||||
GCC_OPTIMIZATION_LEVEL = fast;
|
GCC_OPTIMIZATION_LEVEL = fast;
|
||||||
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
|
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
|
||||||
|
@ -1733,10 +1733,10 @@
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
CODE_SIGN_IDENTITY = "";
|
CODE_SIGN_IDENTITY = "";
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
CURRENT_PROJECT_VERSION = 0.9.11;
|
CURRENT_PROJECT_VERSION = 0.9.12;
|
||||||
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
|
||||||
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
||||||
DYLIB_CURRENT_VERSION = 0.9.11;
|
DYLIB_CURRENT_VERSION = 0.9.12;
|
||||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
FRAMEWORK_SEARCH_PATHS = "";
|
FRAMEWORK_SEARCH_PATHS = "";
|
||||||
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
|
||||||
|
@ -1867,10 +1867,10 @@
|
||||||
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
|
||||||
CODE_SIGN_IDENTITY = "";
|
CODE_SIGN_IDENTITY = "";
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
CURRENT_PROJECT_VERSION = 0.9.11;
|
CURRENT_PROJECT_VERSION = 0.9.12;
|
||||||
DEBUG_INFORMATION_FORMAT = dwarf;
|
DEBUG_INFORMATION_FORMAT = dwarf;
|
||||||
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
DYLIB_COMPATIBILITY_VERSION = 0.9;
|
||||||
DYLIB_CURRENT_VERSION = 0.9.11;
|
DYLIB_CURRENT_VERSION = 0.9.12;
|
||||||
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
ENABLE_STRICT_OBJC_MSGSEND = YES;
|
||||||
ENABLE_TESTABILITY = YES;
|
ENABLE_TESTABILITY = YES;
|
||||||
FRAMEWORK_SEARCH_PATHS = "";
|
FRAMEWORK_SEARCH_PATHS = "";
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AppVersion 9011
|
AppVersion 9012
|
||||||
AppVersionStrMajor 0.9
|
AppVersionStrMajor 0.9
|
||||||
AppVersionStrSmall 0.9.11
|
AppVersionStrSmall 0.9.12
|
||||||
AppVersionStr 0.9.11
|
AppVersionStr 0.9.12
|
||||||
DevChannel 1
|
DevChannel 1
|
||||||
|
|
Loading…
Reference in New Issue