mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-08-31 06:26:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into games

Browse Source
This commit is contained in:
John Preston
2016-09-15 21:56:57 +03:00
parent 26ca5fafbb c00456e12e
commit 578cf4ed61
17 changed files with 198 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Telegram/SourceFiles/localstorage.cpp
View File

@@ -581,6 +581,7 @@ namespace {
FileKey _backgroundKey = 0;
bool _backgroundWasRead = false;
bool _readingUserSettings = false;
FileKey _userSettingsKey = 0;
FileKey _recentHashtagsAndBotsKey = 0;
bool _recentHashtagsAndBotsWereRead = false;
@@ -1548,6 +1549,12 @@ namespace {
}
void _writeUserSettings() {
if (_readingUserSettings) {
LOG(("App Error: attempt to write settings while reading them!"));
return;
}
LOG(("App Info: writing encrypted user settings..."));
if (!_userSettingsKey) {
_userSettingsKey = genKey();
_mapChanged = true;
@@ -1622,22 +1629,28 @@ namespace {
void _readUserSettings() {
FileReadDescriptor userSettings;
if (!readEncryptedFile(userSettings, _userSettingsKey)) {
LOG(("App Info: could not read encrypted user settings..."));
_readOldUserSettings();
return _writeUserSettings();
}
LOG(("App Info: reading encrypted user settings..."));
_readingUserSettings = true;
while (!userSettings.stream.atEnd()) {
quint32 blockId;
userSettings.stream >> blockId;
if (!_checkStreamStatus(userSettings.stream)) {
_readingUserSettings = false;
return _writeUserSettings();
}
if (!_readSetting(blockId, userSettings.stream, userSettings.version)) {
_readingUserSettings = false;
return _writeUserSettings();
}
}
_readingUserSettings = false;
LOG(("App Info: encrypted user settings read."));
}
void _writeMtpData() {