Version 3.2.5: Add information about macOS build.

Version 3.2.5. [Windows]
- Fix connecting in case bad characters appear in device name.
2021-11-16 14:35:28 +04:00 · 2021-11-16 12:45:34 +04:00 · 2021-11-16 12:39:24 +04:00 · 2021-11-16 12:39:19 +04:00 · 2021-11-16 12:38:59 +04:00 · 2021-11-15 23:24:20 +04:00
16 changed files with 48 additions and 36 deletions
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -10,7 +10,7 @@
  <Identity Name="TelegramMessengerLLP.TelegramDesktop"
    ProcessorArchitecture="ARCHITECTURE"
    Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="3.2.3.0" />
+    Version="3.2.5.0" />
  <Properties>
    <DisplayName>Telegram Desktop</DisplayName>
    <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -44,8 +44,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,3,0
- PRODUCTVERSION 3,2,3,0
+ FILEVERSION 3,2,5,0
+ PRODUCTVERSION 3,2,5,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram FZ-LLC"
            VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "3.2.3.0"
+            VALUE "FileVersion", "3.2.5.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "3.2.3.0"
+            VALUE "ProductVersion", "3.2.5.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -35,8 +35,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,3,0
- PRODUCTVERSION 3,2,3,0
+ FILEVERSION 3,2,5,0
+ PRODUCTVERSION 3,2,5,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -53,10 +53,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram FZ-LLC"
            VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "3.2.3.0"
+            VALUE "FileVersion", "3.2.5.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "3.2.3.0"
+            VALUE "ProductVersion", "3.2.5.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/SourceFiles/api/api_who_read.cpp
+++ b/Telegram/SourceFiles/api/api_who_read.cpp
@@ -291,10 +291,6 @@ bool WhoReadExists(not_null<HistoryItem*> item) {
 	const auto megagroup = peer->asMegagroup();
 	if (!chat && !megagroup) {
 		return false;
-	} else if (peer->migrateTo()) {
-		// They're all always marked as read.
-		// We don't know if there really are any readers.
-		return false;
 	}
 	const auto &appConfig = peer->session().account().appConfig();
 	const auto expirePeriod = TimeId(appConfig.get<double>(
--- a/Telegram/SourceFiles/core/application.cpp
+++ b/Telegram/SourceFiles/core/application.cpp
@@ -208,7 +208,6 @@ void Application::run() {
 	style::internal::StartFonts();

 	ThirdParty::start();
-	refreshGlobalProxy(); // Depends on Core::IsAppLaunched().

 	// Depends on OpenSSL on macOS, so on ThirdParty::start().
 	// Depends on notifications settings.
@@ -217,6 +216,8 @@ void Application::run() {
 	startLocalStorage();
 	ValidateScale();

+	refreshGlobalProxy(); // Depends on app settings being read.
+
 	if (Local::oldSettingsVersion() < AppVersion) {
 		RegisterUrlScheme();
 		psNewVersion();
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -22,7 +22,7 @@ constexpr auto AppId = "{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"_cs;
 constexpr auto AppNameOld = "Telegram Win (Unofficial)"_cs;
 constexpr auto AppName = "Telegram Desktop"_cs;
 constexpr auto AppFile = "Telegram"_cs;
-constexpr auto AppVersion = 3002003;
-constexpr auto AppVersionStr = "3.2.3";
+constexpr auto AppVersion = 3002005;
+constexpr auto AppVersionStr = "3.2.5";
 constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@@ -619,8 +619,8 @@ bool HistoryItem::allowsEdit(TimeId now) const {
 	return false;
 }

-bool HistoryItem::canStopPoll() const {
-	if (!isRegular()
+bool HistoryItem::canBeEdited() const {
+	if ((!isRegular() && !isScheduled())
 		|| Has<HistoryMessageVia>()
 		|| Has<HistoryMessageForwarded>()) {
 		return false;
@@ -641,6 +641,10 @@ bool HistoryItem::canStopPoll() const {
 	return out();
 }

+bool HistoryItem::canStopPoll() const {
+	return canBeEdited() && isRegular();
+}
+
 bool HistoryItem::canDelete() const {
 	if (isSponsored()) {
 		return false;
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@@ -373,6 +373,7 @@ public:
 	}

 	[[nodiscard]] bool canPin() const;
+	[[nodiscard]] bool canBeEdited() const;
 	[[nodiscard]] bool canStopPoll() const;
 	[[nodiscard]] virtual bool allowsSendNow() const;
 	[[nodiscard]] virtual bool allowsForward() const;
--- a/Telegram/SourceFiles/history/history_message.cpp
+++ b/Telegram/SourceFiles/history/history_message.cpp
@@ -1048,7 +1048,7 @@ bool HistoryMessage::isTooOldForEdit(TimeId now) const {
 }

 bool HistoryMessage::allowsEdit(TimeId now) const {
-	return canStopPoll()
+	return canBeEdited()
 		&& !isTooOldForEdit(now)
 		&& (!_media || _media->allowsEdit())
 		&& !isLegacyMessage()
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@@ -318,6 +318,11 @@ MainWindow::MainWindow(not_null<Controller*> controller)

 	Ui::Toast::SetDefaultParent(_body.data());

+	body()->sizeValue(
+	) | rpl::start_with_next([=](QSize size) {
+		updateControlsGeometry();
+	}, lifetime());
+
 	if (_outdated) {
 		_outdated->heightValue(
 		) | rpl::filter([=] {
@@ -749,10 +754,6 @@ void MainWindow::attachToTrayIcon(not_null<QSystemTrayIcon*> icon) {
 	});
 }

-void MainWindow::resizeEvent(QResizeEvent *e) {
-	updateControlsGeometry();
-}
-
 rpl::producer<> MainWindow::leaveEvents() const {
 	return _leaveEvents.events();
 }
--- a/Telegram/SourceFiles/window/main_window.h
+++ b/Telegram/SourceFiles/window/main_window.h
@@ -131,7 +131,6 @@ public:
 	}

 protected:
-	void resizeEvent(QResizeEvent *e) override;
 	void leaveEventHook(QEvent *e) override;

 	void savePosition(Qt::WindowState state = Qt::WindowActive);
--- a/Telegram/build/docker/centos_env/Dockerfile
+++ b/Telegram/build/docker/centos_env/Dockerfile
@@ -20,9 +20,9 @@ ENV CMAKE_VER 3.21.3
 ENV CMAKE_FILE cmake-$CMAKE_VER-Linux-x86_64.sh
 ENV PATH ${PATH}:${QT5_PREFIX}/bin:${QT6_PREFIX}/bin

-RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm
-RUN yum -y install centos-release-scl
+RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm && yum clean all
+RUN yum -y install https://packages.endpoint.com/rhel/7/os/x86_64/endpoint-repo-1.7-1.x86_64.rpm && yum clean all
+RUN yum -y install centos-release-scl && yum clean all

 RUN yum -y install git meson ninja-build autoconf automake libtool \
 	fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \
@@ -30,7 +30,7 @@ RUN yum -y install git meson ninja-build autoconf automake libtool \
 	webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \
 	devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \
 	devtoolset-9-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \
-	llvm-toolset-7.0-llvm-devel
+	llvm-toolset-7.0-llvm-devel perl-XML-Parser && yum clean all

 SHELL [ "bash", "-c", ". /opt/rh/devtoolset-9/enable; exec bash -c \"$@\"", "-s"]

@@ -45,7 +45,7 @@ RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
 RUN rm $CMAKE_FILE

 FROM builder AS patches
-RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 17c7e63cfd
+RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout be978cc050

 FROM builder AS extra-cmake-modules

@@ -652,7 +652,6 @@ RUN rm -rf libsigcplusplus
 FROM patches AS glibmm
 COPY --from=mm-common ${LibrariesPath}/mm-common-cache /
 COPY --from=libsigcplusplus ${LibrariesPath}/libsigcplusplus-cache /
-RUN yum -y install perl-XML-Parser

 # equals to glib version of Ubuntu 14.04
 RUN git clone -b 2.40.0 --depth=1 $GIT/GNOME/glibmm.git
@@ -677,6 +676,7 @@ ARG QT6

 COPY --from=libffi ${LibrariesPath}/libffi-cache /
 COPY --from=zlib ${LibrariesPath}/zlib-cache /
+COPY --from=libepoxy ${LibrariesPath}/libepoxy-cache /
 COPY --from=libproxy ${LibrariesPath}/libproxy-cache /
 COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache /
 COPY --from=xcb ${LibrariesPath}/xcb-cache /
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -401,7 +401,7 @@ if customRunCommand:
 stage('patches', """
    git clone https://github.com/desktop-app/patches.git
    cd patches
-    git checkout 17c7e63cfd
+    git checkout 85bce38ec7
 """)

 stage('depot_tools', """
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,7 +1,7 @@
-AppVersion         3002003
+AppVersion         3002005
 AppVersionStrMajor 3.2
-AppVersionStrSmall 3.2.3
-AppVersionStr      3.2.3
+AppVersionStrSmall 3.2.5
+AppVersionStr      3.2.5
 BetaChannel        0
 AlphaVersion       0
-AppVersionOriginal 3.2.3
+AppVersionOriginal 3.2.5
--- a/Telegram/lib_base
+++ b/Telegram/lib_base
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,13 @@
+3.2.5 (16.11.21) [Windows, macOS]
+
+- Fix connecting in case bad characters appear in device name on Windows.
+- Fix custom input methods on macOS.
+
+3.2.4 (13.11.21)
+
+- Fix editing of scheduled messages on macOS.
+- Fix launching on Chrome OS in Crostini container. 
+
 3.2.3 (08.11.21)

 - Fix autoupdater launch on macOS.
Author	SHA1	Message	Date
John Preston	f55d3d1c6a	Version 3.2.5: Add information about macOS build.	2021-11-16 14:35:28 +04:00
John Preston	deea69e119	Version 3.2.5. [Windows] - Fix connecting in case bad characters appear in device name.	2021-11-16 12:45:34 +04:00
John Preston	6925bf6a8e	Refresh global proxy after settings being read. Fixes #16600, fixes #17249.	2021-11-16 12:39:24 +04:00
John Preston	a0110fed27	Allow to see who viewed message from the migrated history.	2021-11-16 12:39:19 +04:00
John Preston	30a945a043	Clean device name string. Fixes #17243.	2021-11-16 12:38:59 +04:00
Amin Vakil	c062b4b3a1	Run yum clean all also for remote installations They may try to install some dependencies from official centos mirrors.	2021-11-15 23:24:20 +04:00
Amin Vakil	06fb5540e1	Run yum clean all after package installation KISS :) Co-authored-by: ilya-fedin <fedin-ilja2010@ya.ru> Make it in oneline Co-authored-by: ilya-fedin <fedin-ilja2010@ya.ru> perl-XML-Parser installation has been moved Co-authored-by: ilya-fedin <fedin-ilja2010@ya.ru> Typo Co-authored-by: ilya-fedin <fedin-ilja2010@ya.ru>	2021-11-15 23:24:20 +04:00
John Preston	0e9a7ffe46	Version 3.2.4. - Fix editing of scheduled messages on macOS. - Fix launching on Chrome OS in Crostini container (fixes #17210).	2021-11-13 13:51:38 +04:00
John Preston	2f48fe920e	Fixed edit of scheduled messages.	2021-11-13 13:44:56 +04:00
Ilya Fedin	936d4004ff	Update controls geometry in MainWindow according to body changes	2021-11-10 19:30:29 +04:00
Ilya Fedin	fd03217032	Update patches in Docker	2021-11-09 16:17:45 +04:00