void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 15:13:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix new settings saving.

Browse source
This commit is contained in:
John Preston 2020-06-29 21:34:08 +04:00
parent 1a07a388d0
commit c777f51427
4 changed files with 79 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
Telegram/SourceFiles/storage/details/storage_settings_scheme.cpp
View file

@ -54,6 +54,7 @@ bool ReadSetting(
ip.toStdString(), ip.toStdString(),
port, port,
{}); {});
context.legacyRead = true;
} break; } break;
case dbiDcOptionOld: { case dbiDcOptionOld: {
@ -69,6 +70,7 @@ bool ReadSetting(
ip.toStdString(), ip.toStdString(),
port, port,
{}); {});
context.legacyRead = true;
} break; } break;
case dbiDcOptionsOld: { case dbiDcOptionsOld: {
@ -78,6 +80,7 @@ bool ReadSetting(
context.fallbackConfigLegacyDcOptions.constructFromSerialized( context.fallbackConfigLegacyDcOptions.constructFromSerialized(
serialized); serialized);
context.legacyRead = true;
} break; } break;
case dbiApplicationSettings: { case dbiApplicationSettings: {
@ -94,6 +97,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacyChatSizeMax = maxSize; context.fallbackConfigLegacyChatSizeMax = maxSize;
context.legacyRead = true;
} break; } break;
case dbiSavedGifsLimitOld: { case dbiSavedGifsLimitOld: {
@ -102,6 +106,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacySavedGifsLimit = limit; context.fallbackConfigLegacySavedGifsLimit = limit;
context.legacyRead = true;
} break; } break;
case dbiStickersRecentLimitOld: { case dbiStickersRecentLimitOld: {
@ -110,6 +115,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacyStickersRecentLimit = limit; context.fallbackConfigLegacyStickersRecentLimit = limit;
context.legacyRead = true;
} break; } break;
case dbiStickersFavedLimitOld: { case dbiStickersFavedLimitOld: {
@ -118,6 +124,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacyStickersFavedLimit = limit; context.fallbackConfigLegacyStickersFavedLimit = limit;
context.legacyRead = true;
} break; } break;
case dbiMegagroupSizeMaxOld: { case dbiMegagroupSizeMaxOld: {
@ -126,6 +133,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacyMegagroupSizeMax = maxSize; context.fallbackConfigLegacyMegagroupSizeMax = maxSize;
context.legacyRead = true;
} break; } break;
case dbiUser: { case dbiUser: {
@ -204,6 +212,7 @@ bool ReadSetting(
context.cacheTotalTimeLimit = NoTimeLimit(time) ? 0 : time; context.cacheTotalTimeLimit = NoTimeLimit(time) ? 0 : time;
context.cacheBigFileTotalSizeLimit = size; context.cacheBigFileTotalSizeLimit = size;
context.cacheBigFileTotalTimeLimit = NoTimeLimit(time) ? 0 : time; context.cacheBigFileTotalTimeLimit = NoTimeLimit(time) ? 0 : time;
context.legacyRead = true;
} break; } break;
case dbiCacheSettings: { case dbiCacheSettings: {
@ -241,6 +250,7 @@ bool ReadSetting(
Core::App().settings().setSoundNotify((v & 0x01) == 0x01); Core::App().settings().setSoundNotify((v & 0x01) == 0x01);
Core::App().settings().setFlashBounceNotify((v & 0x02) == 0x00); Core::App().settings().setFlashBounceNotify((v & 0x02) == 0x00);
context.legacyRead = true;
} break; } break;
case dbiAutoDownloadOld: { case dbiAutoDownloadOld: {
@ -268,6 +278,7 @@ bool ReadSetting(
set(Type::VoiceMessage, audio); set(Type::VoiceMessage, audio);
set(Type::AutoPlayGIF, gif); set(Type::AutoPlayGIF, gif);
set(Type::AutoPlayVideoMessage, gif); set(Type::AutoPlayVideoMessage, gif);
context.legacyRead = true;
} break; } break;
case dbiAutoPlayOld: { case dbiAutoPlayOld: {
@ -294,12 +305,15 @@ bool ReadSetting(
} }
} }
} }
context.legacyRead = true;
} break; } break;
case dbiDialogsModeOld: { case dbiDialogsModeOld: {
qint32 enabled, modeInt; qint32 enabled, modeInt;
stream >> enabled >> modeInt; stream >> enabled >> modeInt;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiDialogsFiltersOld: { case dbiDialogsFiltersOld: {
@ -308,6 +322,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.sessionSettings().setDialogsFiltersEnabled(enabled == 1); context.sessionSettings().setDialogsFiltersEnabled(enabled == 1);
context.legacyRead = true;
} break; } break;
case dbiModerateModeOld: { case dbiModerateModeOld: {
@ -316,6 +331,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setModerateModeEnabled(enabled == 1); Core::App().settings().setModerateModeEnabled(enabled == 1);
context.legacyRead = true;
} break; } break;
case dbiIncludeMutedOld: { case dbiIncludeMutedOld: {
@ -324,12 +340,15 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setIncludeMutedCounter(v == 1); Core::App().settings().setIncludeMutedCounter(v == 1);
context.legacyRead = true;
} break; } break;
case dbiShowingSavedGifsOld: { case dbiShowingSavedGifsOld: {
qint32 v; qint32 v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiDesktopNotifyOld: { case dbiDesktopNotifyOld: {
@ -338,12 +357,15 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setDesktopNotify(v == 1); Core::App().settings().setDesktopNotify(v == 1);
context.legacyRead = true;
} break; } break;
case dbiWindowsNotificationsOld: { case dbiWindowsNotificationsOld: {
qint32 v; qint32 v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiNativeNotificationsOld: { case dbiNativeNotificationsOld: {
@ -352,6 +374,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setNativeNotifications(v == 1); Core::App().settings().setNativeNotifications(v == 1);
context.legacyRead = true;
} break; } break;
case dbiNotificationsCountOld: { case dbiNotificationsCountOld: {
@ -360,6 +383,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setNotificationsCount((v > 0 ? v : 3)); Core::App().settings().setNotificationsCount((v > 0 ? v : 3));
context.legacyRead = true;
} break; } break;
case dbiNotificationsCornerOld: { case dbiNotificationsCornerOld: {
@ -368,6 +392,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setNotificationsCorner(static_cast<Core::Settings::ScreenCorner>((v >= 0 && v < 4) ? v : 2)); Core::App().settings().setNotificationsCorner(static_cast<Core::Settings::ScreenCorner>((v >= 0 && v < 4) ? v : 2));
context.legacyRead = true;
} break; } break;
case dbiDialogsWidthRatioOld: { case dbiDialogsWidthRatioOld: {
@ -376,6 +401,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setDialogsWidthRatio(v / 1000000.); Core::App().settings().setDialogsWidthRatio(v / 1000000.);
context.legacyRead = true;
} break; } break;
case dbiLastSeenWarningSeenOld: { case dbiLastSeenWarningSeenOld: {
@ -384,6 +410,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setLastSeenWarningSeen(v == 1); Core::App().settings().setLastSeenWarningSeen(v == 1);
context.legacyRead = true;
} break; } break;
case dbiSessionSettings: { case dbiSessionSettings: {
@ -413,6 +440,8 @@ bool ReadSetting(
QString v; QString v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiTxtDomainStringOld: { case dbiTxtDomainStringOld: {
@ -421,6 +450,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.fallbackConfigLegacyTxtDomainString = v; context.fallbackConfigLegacyTxtDomainString = v;
context.legacyRead = true;
} break; } break;
case dbiConnectionTypeOld: { case dbiConnectionTypeOld: {
@ -452,6 +482,7 @@ bool ReadSetting(
Global::SetProxiesList({}); Global::SetProxiesList({});
} }
Core::App().refreshGlobalProxy(); Core::App().refreshGlobalProxy();
context.legacyRead = true;
} break; } break;
case dbiConnectionType: { case dbiConnectionType: {
@ -564,6 +595,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.themeKeyLegacy = key; context.themeKeyLegacy = key;
context.legacyRead = true;
} break; } break;
case dbiThemeKey: { case dbiThemeKey: {
@ -658,6 +690,7 @@ bool ReadSetting(
} }
return cConfigScale(); return cConfigScale();
}()); }());
context.legacyRead = true;
} break; } break;
case dbiScalePercent: { case dbiScalePercent: {
@ -675,12 +708,16 @@ bool ReadSetting(
qint32 v; qint32 v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiLangFileOld: { // deprecated case dbiLangFileOld: { // deprecated
QString v; QString v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiWindowPosition: { case dbiWindowPosition: {
@ -697,12 +734,16 @@ bool ReadSetting(
QString v; QString v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiMutePeerOld: { // deprecated case dbiMutePeerOld: { // deprecated
quint64 peerId; quint64 peerId;
stream >> peerId; stream >> peerId;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiMutedPeersOld: { // deprecated case dbiMutedPeersOld: { // deprecated
@ -715,6 +756,8 @@ bool ReadSetting(
stream >> peerId; stream >> peerId;
} }
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiSendKeyOld: { case dbiSendKeyOld: {
@ -730,12 +773,15 @@ bool ReadSetting(
return false; return false;
} }
Core::App().settings().setSendSubmitWay(unchecked); Core::App().settings().setSendSubmitWay(unchecked);
context.legacyRead = true;
} break; } break;
case dbiCatsAndDogs: { // deprecated case dbiCatsAndDogsOld: { // deprecated
qint32 v; qint32 v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
context.legacyRead = true;
} break; } break;
case dbiTileBackgroundOld: { case dbiTileBackgroundOld: {
@ -752,6 +798,7 @@ bool ReadSetting(
context.tileNight = tile; context.tileNight = tile;
} }
context.tileRead = true; context.tileRead = true;
context.legacyRead = true;
} break; } break;
case dbiTileBackground: { case dbiTileBackground: {
@ -770,6 +817,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setAdaptiveForWide(v == 1); Core::App().settings().setAdaptiveForWide(v == 1);
context.legacyRead = true;
} break; } break;
case dbiAutoLockOld: { case dbiAutoLockOld: {
@ -779,6 +827,7 @@ bool ReadSetting(
Core::App().settings().setAutoLock(v); Core::App().settings().setAutoLock(v);
Global::RefLocalPasscodeChanged().notify(); Global::RefLocalPasscodeChanged().notify();
context.legacyRead = true;
} break; } break;
case dbiReplaceEmojiOld: { case dbiReplaceEmojiOld: {
@ -787,6 +836,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setReplaceEmoji(v == 1); Core::App().settings().setReplaceEmoji(v == 1);
context.legacyRead = true;
} break; } break;
case dbiSuggestEmojiOld: { case dbiSuggestEmojiOld: {
@ -795,6 +845,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setSuggestEmoji(v == 1); Core::App().settings().setSuggestEmoji(v == 1);
context.legacyRead = true;
} break; } break;
case dbiSuggestStickersByEmojiOld: { case dbiSuggestStickersByEmojiOld: {
@ -803,6 +854,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setSuggestStickersByEmoji(v == 1); Core::App().settings().setSuggestStickersByEmoji(v == 1);
context.legacyRead = true;
} break; } break;
case dbiDefaultAttach: { case dbiDefaultAttach: {
@ -821,6 +873,7 @@ bool ReadSetting(
case dbinvShowName: Core::App().settings().setNotifyView(dbinvShowName); break; case dbinvShowName: Core::App().settings().setNotifyView(dbinvShowName); break;
default: Core::App().settings().setNotifyView(dbinvShowPreview); break; default: Core::App().settings().setNotifyView(dbinvShowPreview); break;
} }
context.legacyRead = true;
} break; } break;
case dbiAskDownloadPathOld: { case dbiAskDownloadPathOld: {
@ -829,6 +882,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setAskDownloadPath(v == 1); Core::App().settings().setAskDownloadPath(v == 1);
context.legacyRead = true;
} break; } break;
case dbiDownloadPathOldOld: { case dbiDownloadPathOldOld: {
@ -840,6 +894,7 @@ bool ReadSetting(
Core::App().settings().setDownloadPathBookmark(QByteArray()); Core::App().settings().setDownloadPathBookmark(QByteArray());
Core::App().settings().setDownloadPath(v); Core::App().settings().setDownloadPath(v);
#endif // OS_WIN_STORE #endif // OS_WIN_STORE
context.legacyRead = true;
} break; } break;
case dbiDownloadPathOld: { case dbiDownloadPathOld: {
@ -854,6 +909,7 @@ bool ReadSetting(
Core::App().settings().setDownloadPath(v); Core::App().settings().setDownloadPath(v);
psDownloadPathEnableAccess(); psDownloadPathEnableAccess();
#endif // OS_WIN_STORE #endif // OS_WIN_STORE
context.legacyRead = true;
} break; } break;
case dbiCompressPastedImageOld: { case dbiCompressPastedImageOld: {
@ -864,14 +920,15 @@ bool ReadSetting(
Core::App().settings().setSendFilesWay((v == 1) Core::App().settings().setSendFilesWay((v == 1)
? SendFilesWay::Album ? SendFilesWay::Album
: SendFilesWay::Files); : SendFilesWay::Files);
context.legacyRead = true;
} break; } break;
case dbiEmojiTabOld: { case dbiEmojiTabOld: { // deprecated
qint32 v; qint32 v;
stream >> v; stream >> v;
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
// deprecated context.legacyRead = true;
} break; } break;
case dbiRecentEmojiOldOld: { case dbiRecentEmojiOldOld: {
@ -903,6 +960,7 @@ bool ReadSetting(
} }
cSetRecentEmojiPreload(p); cSetRecentEmojiPreload(p);
} }
context.legacyRead = true;
} break; } break;
case dbiRecentEmojiOld: { case dbiRecentEmojiOld: {
@ -921,6 +979,7 @@ bool ReadSetting(
} }
cSetRecentEmojiPreload(p); cSetRecentEmojiPreload(p);
} }
context.legacyRead = true;
} break; } break;
case dbiRecentEmoji: { case dbiRecentEmoji: {
@ -955,6 +1014,7 @@ bool ReadSetting(
} }
} }
cSetEmojiVariants(variants); cSetEmojiVariants(variants);
context.legacyRead = true;
} break; } break;
case dbiEmojiVariants: { case dbiEmojiVariants: {
@ -975,6 +1035,7 @@ bool ReadSetting(
i.key(), i.key(),
i.value()); i.value());
} }
context.legacyRead = true;
} break; } break;
case dbiDialogLastPath: { case dbiDialogLastPath: {
@ -991,6 +1052,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setSongVolume(snap(v / 1e6, 0., 1.)); Core::App().settings().setSongVolume(snap(v / 1e6, 0., 1.));
context.legacyRead = true;
} break; } break;
case dbiVideoVolumeOld: { case dbiVideoVolumeOld: {
@ -999,6 +1061,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setVideoVolume(snap(v / 1e6, 0., 1.)); Core::App().settings().setVideoVolume(snap(v / 1e6, 0., 1.));
context.legacyRead = true;
} break; } break;
case dbiPlaybackSpeedOld: { case dbiPlaybackSpeedOld: {
@ -1007,6 +1070,7 @@ bool ReadSetting(
if (!CheckStreamStatus(stream)) return false; if (!CheckStreamStatus(stream)) return false;
Core::App().settings().setVoiceMsgPlaybackDoubled(v == 2); Core::App().settings().setVoiceMsgPlaybackDoubled(v == 2);
context.legacyRead = true;
} break; } break;
case dbiCallSettingsOld: { case dbiCallSettingsOld: {
@ -1035,6 +1099,7 @@ bool ReadSetting(
app.setCallInputVolume(inputVolume); app.setCallInputVolume(inputVolume);
app.setCallAudioDuckingEnabled(duckingEnabled); app.setCallAudioDuckingEnabled(duckingEnabled);
} }
context.legacyRead = true;
} break; } break;
case dbiFallbackProductionConfig: { case dbiFallbackProductionConfig: {

4
Telegram/SourceFiles/storage/details/storage_settings_scheme.h
View file

@ -64,6 +64,8 @@ struct ReadSettingsContext {
std::vector<std::shared_ptr<MTP::AuthKey>> mtpLegacyKeys; std::vector<std::shared_ptr<MTP::AuthKey>> mtpLegacyKeys;
qint32 mtpLegacyMainDcId = 0; qint32 mtpLegacyMainDcId = 0;
qint32 mtpLegacyUserId = 0; qint32 mtpLegacyUserId = 0;
bool legacyRead = false;
}; };
[[nodiscard]] bool ReadSetting( [[nodiscard]] bool ReadSetting(
@ -93,7 +95,7 @@ enum {
dbiConnectionTypeOld = 0x0f, dbiConnectionTypeOld = 0x0f,
// 0x10 reserved // 0x10 reserved
dbiDefaultAttach = 0x11, dbiDefaultAttach = 0x11,
dbiCatsAndDogs = 0x12, dbiCatsAndDogsOld = 0x12,
dbiReplaceEmojiOld = 0x13, dbiReplaceEmojiOld = 0x13,
dbiAskDownloadPathOld = 0x14, dbiAskDownloadPathOld = 0x14,
dbiDownloadPathOldOld = 0x15, dbiDownloadPathOldOld = 0x15,

3
Telegram/SourceFiles/storage/localstorage.cpp
View file

@ -405,6 +405,9 @@ void start() {
_settingsSalt = salt; _settingsSalt = salt;
applyReadContext(std::move(context)); applyReadContext(std::move(context));
if (context.legacyRead) {
writeSettings();
}
InitialLoadTheme(); InitialLoadTheme();

6
Telegram/SourceFiles/storage/storage_account.cpp
View file

@ -824,7 +824,11 @@ std::unique_ptr<Main::SessionSettings> Account::readSessionSettings() {
_readingUserSettings = false; _readingUserSettings = false;
LOG(("App Info: encrypted user settings read.")); LOG(("App Info: encrypted user settings read."));
return applyReadContext(std::move(context)); auto result = applyReadContext(std::move(context));
if (context.legacyRead) {
writeSessionSettings(result.get());
}
return result;
} }
std::unique_ptr<Main::SessionSettings> Account::applyReadContext( std::unique_ptr<Main::SessionSettings> Account::applyReadContext(