From 0445f7d6e8a5d366b7c37c5e48f43ef36a029c75 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 15 Nov 2024 15:43:12 +0400
Subject: [PATCH] Enable auto-night-mode by default.

---
 Telegram/SourceFiles/core/core_settings.cpp | 14 +++++++++-----
 Telegram/SourceFiles/core/core_settings.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Telegram/SourceFiles/core/core_settings.cpp b/Telegram/SourceFiles/core/core_settings.cpp
index 756d42138..5170b16fc 100644
--- a/Telegram/SourceFiles/core/core_settings.cpp
+++ b/Telegram/SourceFiles/core/core_settings.cpp
@@ -240,7 +240,7 @@ QByteArray Settings::serialize() const {
 		+ Serialize::stringSize(_customFontFamily)
 		+ sizeof(qint32) * 3
 		+ Serialize::bytearraySize(_tonsiteStorageToken)
-		+ sizeof(qint32) * 6;
+		+ sizeof(qint32) * 7;
 
 	auto result = QByteArray();
 	result.reserve(size);
@@ -309,7 +309,7 @@ QByteArray Settings::serialize() const {
 			<< qint32(_thirdSectionExtendedBy)
 			<< qint32(_notifyFromAll ? 1 : 0)
 			<< qint32(_nativeWindowFrame.current() ? 1 : 0)
-			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0)
+			<< qint32(0) // Legacy system dark mode
 			<< _cameraDeviceId.current()
 			<< qint32(_ipRevealWarning ? 1 : 0)
 			<< qint32(_groupCallPushToTalk ? 1 : 0)
@@ -400,7 +400,8 @@ QByteArray Settings::serialize() const {
 			<< qint32(_skipToastsInFocus ? 1 : 0)
 			<< qint32(_recordVideoMessages ? 1 : 0)
 			<< SerializeVideoQuality(_videoQuality)
-			<< qint32(_ivZoom.current());
+			<< qint32(_ivZoom.current())
+			<< qint32(_systemDarkModeEnabled.current() ? 1 : 0);
 	}
 
 	Ensures(result.size() == size);
@@ -477,6 +478,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	qint32 notifyFromAll = _notifyFromAll ? 1 : 0;
 	qint32 nativeWindowFrame = _nativeWindowFrame.current() ? 1 : 0;
 	qint32 systemDarkModeEnabled = _systemDarkModeEnabled.current() ? 1 : 0;
+	qint32 legacySystemDarkModeEnabled = 0;
 	qint32 ipRevealWarning = _ipRevealWarning ? 1 : 0;
 	qint32 groupCallPushToTalk = _groupCallPushToTalk ? 1 : 0;
 	QByteArray groupCallPushToTalkShortcut = _groupCallPushToTalkShortcut;
@@ -610,7 +612,7 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 		stream >> nativeWindowFrame;
 	}
 	if (!stream.atEnd()) {
-		stream >> systemDarkModeEnabled;
+		stream >> legacySystemDarkModeEnabled;
 	}
 	if (!stream.atEnd()) {
 		stream >> cameraDeviceId;
@@ -853,6 +855,9 @@ void Settings::addFromSerialized(const QByteArray &serialized) {
 	if (!stream.atEnd()) {
 		stream >> ivZoom;
 	}
+	if (!stream.atEnd()) {
+		stream >> systemDarkModeEnabled;
+	}
 	if (stream.status() != QDataStream::Ok) {
 		LOG(("App Error: "
 			"Bad data for Core::Settings::constructFromSerialized()"));
@@ -1453,7 +1458,6 @@ void Settings::resetOnLastLogout() {
 	_thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
 	_notifyFromAll = true;
 	_tabbedReplacedWithInfo = false; // per-window
-	_systemDarkModeEnabled = false;
 	_hiddenGroupCallTooltips = 0;
 	_storiesClickTooltipHidden = false;
 	_ttlVoiceClickTooltipHidden = false;
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index b03f4ed5f..87fb383f4 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -1036,7 +1036,7 @@ private:
 	bool _notifyFromAll = true;
 	rpl::variable<bool> _nativeWindowFrame = false;
 	rpl::variable<std::optional<bool>> _systemDarkMode = std::nullopt;
-	rpl::variable<bool> _systemDarkModeEnabled = false;
+	rpl::variable<bool> _systemDarkModeEnabled = true;
 	rpl::variable<WindowTitleContent> _windowTitleContent;
 	WindowPosition _windowPosition; // per-window
 	bool _disableOpenGL = false;