Version 2.9: Add jemalloc submodule.

Version 2.9: Fix build on Linux.
Fix requesting screencast rights on macOS.
2021-07-30 21:26:05 +03:00 · 2021-07-30 21:03:49 +03:00 · 2021-07-30 20:45:00 +03:00 · 2021-07-30 18:21:54 +03:00 · 2021-07-30 17:35:30 +03:00 · 2021-07-30 16:11:42 +03:00
356 changed files with 5215 additions and 10342 deletions
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-cmake.md'
+      - '!docs/building-linux.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -13,7 +13,6 @@ on:
      - '!.github/workflows/linux.yml'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -25,7 +24,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-cmake.md'
+      - '!docs/building-linux.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -33,7 +32,6 @@ on:
      - '!.github/workflows/linux.yml'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -94,7 +92,10 @@ jobs:
          if [ -n "${{ matrix.defines }}" ]; then
            DEFINE="-D ${{ matrix.defines }}=ON"
            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then
-              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON"
+              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
+            fi
+            if [ "${{ matrix.defines }}" == "DESKTOP_APP_DISABLE_GTK_INTEGRATION" ]; then
+              DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
            fi
            echo Define from matrix: $DEFINE
            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-xcode.md'
+      - '!docs/building-mac.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -14,7 +14,6 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -24,7 +23,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-xcode.md'
+      - '!docs/building-mac.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -33,7 +32,6 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -64,7 +62,7 @@ jobs:
      UPLOAD_ARTIFACT: "false"
      ONLY_CACHE: "false"
      MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-xcode.md"
+      DOC_PATH: "docs/building-mac.md"
      AUTO_CACHING: "1"

    steps:
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -11,7 +11,6 @@ on:
      - '.github/**'
      - '!.github/workflows/snap.yml'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
@@ -29,7 +28,6 @@ on:
      - '.github/**'
      - '!.github/workflows/snap.yml'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/Resources/winrc/**'
      - 'Telegram/SourceFiles/platform/win/**'
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -5,7 +5,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-msvc.md'
+      - '!docs/building-win.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -14,8 +14,6 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
-      - '!Telegram/Patches/build_ffmpeg_win.sh'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/SourceFiles/platform/linux/**'
      - 'Telegram/SourceFiles/platform/mac/**'
@@ -26,7 +24,7 @@ on:
    paths-ignore:
      - 'docs/**'
      - '**.md'
-      - '!docs/building-msvc.md'
+      - '!docs/building-win.md'
      - 'changelog.txt'
      - 'LEGAL'
      - 'LICENSE'
@@ -35,12 +33,9 @@ on:
      - 'lib/xdg/**'
      - 'snap/**'
      - 'Telegram/build/**'
-      - 'Telegram/Patches/**'
-      - '!Telegram/Patches/build_ffmpeg_win.sh'
      - 'Telegram/Resources/uwp/**'
      - 'Telegram/SourceFiles/platform/linux/**'
      - 'Telegram/SourceFiles/platform/mac/**'
-      - '!Telegram/Patches/breakpad.diff'
      - 'Telegram/Telegram/**'
      - 'Telegram/configure.sh'
      - 'Telegram/Telegram.plist'
@@ -65,7 +60,7 @@ jobs:
      UPLOAD_ARTIFACT: "false"
      ONLY_CACHE: "false"
      MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-msvc.md"
+      DOC_PATH: "docs/building-win.md"
      AUTO_CACHING: "1"

    defaults:
--- a/.gitmodules
+++ b/.gitmodules
@@ -91,3 +91,6 @@
 [submodule "Telegram/lib_waylandshells"]
 	path = Telegram/lib_waylandshells
 	url = https://github.com/desktop-app/lib_waylandshells.git
+[submodule "Telegram/ThirdParty/jemalloc"]
+	path = Telegram/ThirdParty/jemalloc
+	url = https://github.com/jemalloc/jemalloc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,13 @@ include(cmake/validate_special_target.cmake)
 include(cmake/version.cmake)
 desktop_app_parse_version(Telegram/build/version)

+set(project_langs C CXX)
+if (APPLE)
+    set(project_langs C CXX OBJC OBJCXX)
+endif()
+
 project(Telegram
-    LANGUAGES C CXX
+    LANGUAGES ${project_langs}
    VERSION ${desktop_app_version_cmake}
    DESCRIPTION "Official Telegram Desktop messenger"
    HOMEPAGE_URL "https://desktop.telegram.org"
@@ -24,6 +29,7 @@ set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT T

 get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
 get_filename_component(submodules_loc "Telegram" REALPATH)
+get_filename_component(cmake_helpers_loc "cmake" REALPATH)

 include(cmake/variables.cmake)
 include(cmake/nice_target_sources.cmake)
@@ -32,6 +38,7 @@ include(cmake/target_link_frameworks.cmake)
 include(cmake/init_target.cmake)
 include(cmake/generate_target.cmake)
 include(cmake/nuget.cmake)
+include(cmake/validate_d3d_compiler.cmake)

 include(cmake/options.cmake)

--- a/README.md
+++ b/README.md
@@ -63,9 +63,9 @@ Version **1.8.15** was the last that supports older systems

 ## Build instructions

-* Visual Studio 2019 [(32 bits)][msvc32] [(64 bits)][msvc64]
-* [Xcode 12][xcode]
-* [CMake on GNU/Linux][cmake]
+* Windows [(32-bit)][win32] [(64-bit)][win64]
+* [macOS][mac]
+* [GNU/Linux using Docker][linux]

 [//]: # (LINKS)
 [telegram]: https://telegram.org
@@ -73,10 +73,9 @@ Version **1.8.15** was the last that supports older systems
 [telegram_api]: https://core.telegram.org
 [telegram_proto]: https://core.telegram.org/mtproto
 [license]: LICENSE
-[msvc32]: docs/building-msvc.md
-[msvc64]: docs/building-msvc-x64.md
-[xcode]: docs/building-xcode.md
-[xcode_old]: docs/building-xcode-old.md
-[cmake]: docs/building-cmake.md
+[win32]: docs/building-win.md
+[win64]: docs/building-win-x64.md
+[mac]: docs/building-mac.md
+[linux]: docs/building-linux.md
 [preview_image]: https://github.com/telegramdesktop/tdesktop/blob/dev/docs/assets/preview.png "Preview of Telegram Desktop"
 [preview_image_url]: https://raw.githubusercontent.com/telegramdesktop/tdesktop/dev/docs/assets/preview.png
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -82,59 +82,6 @@ PRIVATE
    desktop-app::external_xxhash
 )

-if (LINUX)
-    target_link_libraries(Telegram
-    PRIVATE
-        desktop-app::external_glibmm
-        desktop-app::external_glib
-    )
-
-    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_statusnotifieritem
-            desktop-app::external_dbusmenu_qt
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::external_xcb
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
-        target_link_libraries(Telegram
-        PRIVATE
-            desktop-app::lib_waylandshells
-            desktop-app::external_kwayland
-        )
-    endif()
-
-    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
-        target_link_libraries(Telegram PRIVATE rt)
-        find_package(PkgConfig REQUIRED)
-
-        if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-            pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
-            target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
-
-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-                pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
-                target_link_libraries(Telegram PRIVATE PkgConfig::X11)
-            endif()
-        else()
-            pkg_check_modules(GTK REQUIRED gtk+-3.0)
-            target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
-
-            if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
-                target_link_libraries(Telegram PRIVATE X11)
-            endif()
-        endif()
-    endif()
-endif()
-
 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h)
 nice_target_sources(Telegram ${src_loc}
 PRIVATE
@@ -273,6 +220,7 @@ PRIVATE
    calls/group/calls_choose_join_as.h
    calls/group/calls_group_call.cpp
    calls/group/calls_group_call.h
+    calls/group/calls_group_common.cpp
    calls/group/calls_group_common.h
    calls/group/calls_group_invite_controller.cpp
    calls/group/calls_group_invite_controller.h
@@ -318,6 +266,8 @@ PRIVATE
    calls/calls_video_bubble.h
    calls/calls_video_incoming.cpp
    calls/calls_video_incoming.h
+    chat_helpers/bot_command.cpp
+    chat_helpers/bot_command.h
    chat_helpers/bot_keyboard.cpp
    chat_helpers/bot_keyboard.h
    chat_helpers/emoji_keywords.cpp
@@ -617,6 +567,8 @@ PRIVATE
    history/view/history_view_cursor_state.h
    history/view/history_view_element.cpp
    history/view/history_view_element.h
+    history/view/history_view_empty_list_bubble.cpp
+    history/view/history_view_empty_list_bubble.h
    history/view/history_view_group_call_tracker.cpp
    history/view/history_view_group_call_tracker.h
    history/view/history_view_list_widget.cpp
@@ -753,6 +705,10 @@ PRIVATE
    lang/lang_numbers_animation.h
    lang/lang_translator.cpp
    lang/lang_translator.h
+    layout/layout_document_generic_preview.cpp
+    layout/layout_document_generic_preview.h
+    layout/layout_item_base.cpp
+    layout/layout_item_base.h
    main/main_account.cpp
    main/main_account.h
    main/main_app_config.cpp
@@ -894,16 +850,12 @@ PRIVATE
    platform/linux/linux_desktop_environment.h
    platform/linux/linux_gdk_helper.cpp
    platform/linux/linux_gdk_helper.h
-    platform/linux/linux_gsd_media_keys.cpp
-    platform/linux/linux_gsd_media_keys.h
    platform/linux/linux_gtk_integration_dummy.cpp
    platform/linux/linux_gtk_integration_p.h
    platform/linux/linux_gtk_integration.cpp
    platform/linux/linux_gtk_integration.h
    platform/linux/linux_gtk_open_with_dialog.cpp
    platform/linux/linux_gtk_open_with_dialog.h
-    platform/linux/linux_notification_service_watcher.cpp
-    platform/linux/linux_notification_service_watcher.h
    platform/linux/linux_wayland_integration_dummy.cpp
    platform/linux/linux_wayland_integration.cpp
    platform/linux/linux_wayland_integration.h
@@ -922,7 +874,6 @@ PRIVATE
    platform/linux/notifications_manager_linux.h
    platform/linux/specific_linux.cpp
    platform/linux/specific_linux.h
-    platform/linux/window_title_linux.h
    platform/mac/file_utilities_mac.mm
    platform/mac/file_utilities_mac.h
    platform/mac/launcher_mac.mm
@@ -937,7 +888,6 @@ PRIVATE
    platform/mac/specific_mac_p.mm
    platform/mac/specific_mac_p.h
    platform/mac/window_title_mac.mm
-    platform/mac/window_title_mac.h
    platform/mac/touchbar/items/mac_formatter_item.h
    platform/mac/touchbar/items/mac_formatter_item.mm
    platform/mac/touchbar/items/mac_pinned_chats_item.h
@@ -968,8 +918,6 @@ PRIVATE
    platform/win/notifications_manager_win.h
    platform/win/specific_win.cpp
    platform/win/specific_win.h
-    platform/win/window_title_win.cpp
-    platform/win/window_title_win.h
    platform/win/windows_app_user_model_id.cpp
    platform/win/windows_app_user_model_id.h
    platform/win/windows_dlls.cpp
@@ -1143,13 +1091,11 @@ PRIVATE
    window/window_outdated_bar.h
    window/window_peer_menu.cpp
    window/window_peer_menu.h
+    window/window_section_common.h
    window/window_session_controller.cpp
    window/window_session_controller.h
    window/window_slide_animation.cpp
    window/window_slide_animation.h
-    window/window_title_qt.cpp
-    window/window_title_qt.h
-    window/window_title.h
    window/window_top_bar_wrap.h
    window/themes/window_theme.cpp
    window/themes/window_theme.h
@@ -1176,8 +1122,6 @@ PRIVATE
    config.h
    facades.cpp
    facades.h
-    layout.cpp
-    layout.h
    logs.cpp
    logs.h
    main.cpp
@@ -1190,21 +1134,8 @@ PRIVATE
    stdafx.h
 )

-if (NOT LINUX)
-    remove_target_sources(Telegram ${src_loc}
-        window/window_title_qt.cpp
-        window/window_title_qt.h
-    )
-endif()
-
 if (DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
    remove_target_sources(Telegram ${src_loc}
-        platform/linux/linux_gsd_media_keys.cpp
-        platform/linux/linux_gsd_media_keys.h
-        platform/linux/linux_mpris_support.cpp
-        platform/linux/linux_mpris_support.h
-        platform/linux/linux_notification_service_watcher.cpp
-        platform/linux/linux_notification_service_watcher.h
        platform/linux/linux_xdp_file_dialog.cpp
        platform/linux/linux_xdp_file_dialog.h
        platform/linux/linux_xdp_open_with_dialog.cpp
@@ -1322,6 +1253,48 @@ elseif (APPLE)
            )
        endif()
    endif()
+else()
+    target_link_libraries(Telegram
+    PRIVATE
+        desktop-app::external_glibmm
+        desktop-app::external_glib
+    )
+
+    if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_statusnotifieritem
+            desktop-app::external_dbusmenu_qt
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::external_xcb
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
+        target_link_libraries(Telegram
+        PRIVATE
+            desktop-app::lib_waylandshells
+            desktop-app::external_kwayland
+        )
+    endif()
+
+    if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
+        find_package(PkgConfig REQUIRED)
+
+        pkg_check_modules(GTK REQUIRED gtk+-3.0)
+        target_include_directories(Telegram SYSTEM PRIVATE ${GTK_INCLUDE_DIRS})
+
+        if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
+            target_link_libraries(Telegram PRIVATE X11)
+        endif()
+
+        target_link_libraries(Telegram PRIVATE rt)
+    endif()
 endif()

 if (build_macstore)
@@ -1464,7 +1437,7 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
    endif()

    if (DESKTOP_APP_SPECIAL_TARGET)
-        add_executable(Packer WIN32)
+        add_executable(Packer)
        init_target(Packer)

        add_dependencies(Telegram Packer)
--- a/Telegram/Patches/breakpad.diff
+++ b/Telegram/Patches/breakpad.diff
@@ -1,651 +0,0 @@
-diff --git a/src/build/common.gypi b/src/build/common.gypi
-index 29990c65..53e99d44 100644
--- a/src/build/common.gypi
-+++ b/src/build/common.gypi
-@@ -330,6 +330,7 @@
-           'VCCLCompilerTool': {
-             'WarnAsError': 'true',
-             'Detect64BitPortabilityProblems': 'false',
-+            'TreatWChar_tAsBuiltInType': 'false',
-           },
-         },
-       }],
-diff --git a/src/client/mac/Breakpad.xcodeproj/project.pbxproj b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-index 1a93ce6d..b5986e33 100644
--- a/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-+++ b/src/client/mac/Breakpad.xcodeproj/project.pbxproj
-@@ -35,6 +35,19 @@
- /* End PBXAggregateTarget section */
- 
- /* Begin PBXBuildFile section */
-+		0748C0431C63C409004489BF /* MachIPC.mm in Sources */ = {isa = PBXBuildFile; fileRef = F92C53790ECCE635009BE4BA /* MachIPC.mm */; };
-+		0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536F0ECCE3FD009BE4BA /* minidump_generator.cc */; };
-+		0748C0451C63C46C004489BF /* string_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53820ECCE635009BE4BA /* string_utilities.cc */; };
-+		0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C538F0ECCE70A009BE4BA /* minidump_file_writer.cc */; };
-+		0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
-+		0748C0491C63C4CF004489BF /* macho_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537A0ECCE635009BE4BA /* macho_id.cc */; };
-+		0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
-+		0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */ = {isa = PBXBuildFile; fileRef = F92C53870ECCE6C0009BE4BA /* convert_UTF.c */; };
-+		0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537C0ECCE635009BE4BA /* macho_utilities.cc */; };
-+		0748C04D1C63C50F004489BF /* file_id.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53740ECCE635009BE4BA /* file_id.cc */; };
-+		0748C04E1C63C51C004489BF /* md5.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D72CA0D13DFAD5C006CABE3 /* md5.cc */; };
-+		0748C04F1C63C523004489BF /* macho_walker.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C537E0ECCE635009BE4BA /* macho_walker.cc */; };
-+		0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D61A25D14F43CFC002D5862 /* bootstrap_compat.cc */; };
- 		162F64F2161C577500CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
- 		162F64F3161C577500CD68D5 /* arch_utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 162F64F1161C577500CD68D5 /* arch_utilities.h */; };
- 		162F64F4161C579B00CD68D5 /* arch_utilities.cc in Sources */ = {isa = PBXBuildFile; fileRef = 162F64F0161C577500CD68D5 /* arch_utilities.cc */; };
-@@ -67,6 +80,7 @@
- 		4DBE49A7134A4F280072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
- 		4DBE49A8134A4F380072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
- 		4DBE49A9134A4F460072546A /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DBE4769134A4F080072546A /* CoreServices.framework */; };
-+		5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53690ECCE3FD009BE4BA /* breakpad_nlist_64.cc */; };
- 		8B3101C611F0CD9F00FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
- 		8B3101C711F0CD9F00FCF3E4 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
- 		8B3101CA11F0CDB000FCF3E4 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
-@@ -170,11 +184,8 @@
- 		F92C564A0ECD10CA009BE4BA /* string_conversion.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53850ECCE6AD009BE4BA /* string_conversion.cc */; };
- 		F92C564C0ECD10DD009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
- 		F92C56570ECD113E009BE4BA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C554A0ECCF530009BE4BA /* Carbon.framework */; };
-		F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
- 		F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C53720ECCE3FD009BE4BA /* protected_memory_allocator.cc */; };
- 		F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
-		F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */ = {isa = PBXBuildFile; fileRef = F92C563C0ECD10B3009BE4BA /* breakpadUtilities.dylib */; };
-		F92C568A0ECD15F9009BE4BA /* Inspector in Resources */ = {isa = PBXBuildFile; fileRef = F92C53540ECCE349009BE4BA /* Inspector */; };
- 		F92C56A90ECE04C5009BE4BA /* crash_report_sender.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C56A80ECE04C5009BE4BA /* crash_report_sender.m */; };
- 		F93803CD0F8083B7004D428B /* dynamic_images.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536B0ECCE3FD009BE4BA /* dynamic_images.cc */; };
- 		F93803CE0F8083B7004D428B /* exception_handler.cc in Sources */ = {isa = PBXBuildFile; fileRef = F92C536D0ECCE3FD009BE4BA /* exception_handler.cc */; };
-@@ -213,7 +224,6 @@
- 		F9C44DBD0EF072A0003AEBAA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9C44DBA0EF072A0003AEBAA /* MainMenu.xib */; };
- 		F9C44E000EF077CD003AEBAA /* Breakpad.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
- 		F9C44E3C0EF08B12003AEBAA /* Breakpad.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Breakpad.framework */; };
-		F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */ = {isa = PBXBuildFile; fileRef = F92C56A00ECE04A7009BE4BA /* crash_report_sender.app */; };
- 		F9C44EA20EF09F93003AEBAA /* HTTPMultipartUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = F92C53770ECCE635009BE4BA /* HTTPMultipartUpload.m */; };
- 		F9C44EE50EF0A006003AEBAA /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C44EE40EF0A006003AEBAA /* SystemConfiguration.framework */; };
- 		F9C44EE90EF0A3C1003AEBAA /* GTMLogger.m in Sources */ = {isa = PBXBuildFile; fileRef = F9C44EE80EF0A3C1003AEBAA /* GTMLogger.m */; };
-@@ -410,20 +420,6 @@
- 			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
- 			remoteInfo = breakpadUtilities;
- 		};
-		F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F92C563B0ECD10B3009BE4BA;
-			remoteInfo = breakpadUtilities;
-		};
-		F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F92C53530ECCE349009BE4BA;
-			remoteInfo = Inspector;
-		};
- 		F93DE2FB0F82C3C600608B94 /* PBXContainerItemProxy */ = {
- 			isa = PBXContainerItemProxy;
- 			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-@@ -536,13 +532,6 @@
- 			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
- 			remoteInfo = Breakpad;
- 		};
-		F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = F92C569F0ECE04A7009BE4BA;
-			remoteInfo = crash_report_sender;
-		};
- /* End PBXContainerItemProxy section */
- 
- /* Begin PBXCopyFilesBuildPhase section */
-@@ -714,7 +703,6 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-				F92C565C0ECD1158009BE4BA /* breakpadUtilities.dylib in Frameworks */,
- 				8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
-@@ -1181,18 +1169,13 @@
- 			isa = PBXNativeTarget;
- 			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Breakpad" */;
- 			buildPhases = (
-				F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */,
- 				8DC2EF500486A6940098B216 /* Headers */,
-				8DC2EF520486A6940098B216 /* Resources */,
- 				8DC2EF540486A6940098B216 /* Sources */,
- 				8DC2EF560486A6940098B216 /* Frameworks */,
- 			);
- 			buildRules = (
- 			);
- 			dependencies = (
-				F92C56860ECD15EF009BE4BA /* PBXTargetDependency */,
-				F92C56880ECD15F1009BE4BA /* PBXTargetDependency */,
-				F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */,
- 			);
- 			name = Breakpad;
- 			productInstallPath = "$(HOME)/Library/Frameworks";
-@@ -1399,6 +1382,8 @@
- /* Begin PBXProject section */
- 		0867D690FE84028FC02AAC07 /* Project object */ = {
- 			isa = PBXProject;
-+			attributes = {
-+			};
- 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Breakpad" */;
- 			compatibilityVersion = "Xcode 3.1";
- 			developmentRegion = English;
-@@ -1583,16 +1568,6 @@
- /* End PBXReferenceProxy section */
- 
- /* Begin PBXResourcesBuildPhase section */
-		8DC2EF520486A6940098B216 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				F9C44E980EF09F56003AEBAA /* crash_report_sender.app in Resources */,
-				F92C568A0ECD15F9009BE4BA /* Inspector in Resources */,
-				F92C56650ECD1185009BE4BA /* breakpadUtilities.dylib in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
- 		F92C569C0ECE04A7009BE4BA /* Resources */ = {
- 			isa = PBXResourcesBuildPhase;
- 			buildActionMask = 2147483647;
-@@ -1640,20 +1615,6 @@
- 			shellPath = /bin/sh;
- 			shellScript = "install_name_tool -id \"@executable_path/../Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
- 		};
-		F97A0E850ED4EC15008784D3 /* Change install name of breakpadUtilities */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Change install name of breakpadUtilities";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "#!/bin/bash\ninstall_name_tool -id \"@executable_path/../Frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib\" \"${BUILT_PRODUCTS_DIR}/breakpadUtilities.dylib\"\n";
-		};
- 		F9C77DD80F7DD5CF0045F7DB /* ShellScript */ = {
- 			isa = PBXShellScriptBuildPhase;
- 			buildActionMask = 2147483647;
-@@ -1674,6 +1635,20 @@
- 			isa = PBXSourcesBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				5A8B220921E0C5740045F83C /* breakpad_nlist_64.cc in Sources */,
-+				0748C0501C63C52D004489BF /* bootstrap_compat.cc in Sources */,
-+				0748C04F1C63C523004489BF /* macho_walker.cc in Sources */,
-+				0748C04E1C63C51C004489BF /* md5.cc in Sources */,
-+				0748C04D1C63C50F004489BF /* file_id.cc in Sources */,
-+				0748C04C1C63C4EA004489BF /* macho_utilities.cc in Sources */,
-+				0748C04B1C63C4DB004489BF /* convert_UTF.c in Sources */,
-+				0748C04A1C63C4D4004489BF /* string_conversion.cc in Sources */,
-+				0748C0491C63C4CF004489BF /* macho_id.cc in Sources */,
-+				0748C0471C63C4A1004489BF /* dynamic_images.cc in Sources */,
-+				0748C0461C63C484004489BF /* minidump_file_writer.cc in Sources */,
-+				0748C0451C63C46C004489BF /* string_utilities.cc in Sources */,
-+				0748C0441C63C43C004489BF /* minidump_generator.cc in Sources */,
-+				0748C0431C63C409004489BF /* MachIPC.mm in Sources */,
- 				F92C565F0ECD116B009BE4BA /* protected_memory_allocator.cc in Sources */,
- 				F92C56630ECD1179009BE4BA /* exception_handler.cc in Sources */,
- 				F92C55D10ECD0064009BE4BA /* Breakpad.mm in Sources */,
-@@ -1955,16 +1930,6 @@
- 			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
- 			targetProxy = F92C564D0ECD10E5009BE4BA /* PBXContainerItemProxy */;
- 		};
-		F92C56860ECD15EF009BE4BA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F92C563B0ECD10B3009BE4BA /* breakpadUtilities */;
-			targetProxy = F92C56850ECD15EF009BE4BA /* PBXContainerItemProxy */;
-		};
-		F92C56880ECD15F1009BE4BA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F92C53530ECCE349009BE4BA /* Inspector */;
-			targetProxy = F92C56870ECD15F1009BE4BA /* PBXContainerItemProxy */;
-		};
- 		F93DE2FC0F82C3C600608B94 /* PBXTargetDependency */ = {
- 			isa = PBXTargetDependency;
- 			target = F93803BD0F80820F004D428B /* generator_test */;
-@@ -2025,11 +1990,6 @@
- 			target = 8DC2EF4F0486A6940098B216 /* Breakpad */;
- 			targetProxy = F9C44E190EF0790F003AEBAA /* PBXContainerItemProxy */;
- 		};
-		F9C44E970EF09F4B003AEBAA /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = F92C569F0ECE04A7009BE4BA /* crash_report_sender */;
-			targetProxy = F9C44E960EF09F4B003AEBAA /* PBXContainerItemProxy */;
-		};
- /* End PBXTargetDependency section */
- 
- /* Begin PBXVariantGroup section */
-@@ -2126,8 +2086,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-				SDKROOT = macosx10.5;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = Debug;
- 		};
-@@ -2135,7 +2099,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027811F0D3AF00FCF3E4 /* BreakpadRelease.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = Release;
- 		};
-@@ -2454,7 +2423,12 @@
- 			isa = XCBuildConfiguration;
- 			baseConfigurationReference = 8B31027711F0D3AF00FCF3E4 /* BreakpadDebug.xcconfig */;
- 			buildSettings = {
-+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
-+				CLANG_CXX_LIBRARY = "libc++";
- 				GCC_TREAT_WARNINGS_AS_ERRORS = NO;
-+				GCC_VERSION = "";
-+				MACOSX_DEPLOYMENT_TARGET = 10.8;
-+				SDKROOT = macosx;
- 			};
- 			name = "Debug With Code Coverage";
- 		};
-diff --git a/src/client/mac/Framework/Breakpad.mm b/src/client/mac/Framework/Breakpad.mm
-index 1d2e519b..943310fa 100644
--- a/src/client/mac/Framework/Breakpad.mm
-+++ b/src/client/mac/Framework/Breakpad.mm
-@@ -355,10 +355,10 @@ bool Breakpad::Initialize(NSDictionary *parameters) {
-     return false;
-   }
- 
-  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
-+//  if ([[parameters objectForKey:@BREAKPAD_IN_PROCESS] boolValue])
-     return InitializeInProcess(parameters);
-  else
-    return InitializeOutOfProcess(parameters);
-+//  else
-+//    return InitializeOutOfProcess(parameters);
- }
- 
- //=============================================================================
-@@ -373,52 +373,52 @@ bool Breakpad::InitializeInProcess(NSDictionary* parameters) {
- }
- 
- //=============================================================================
-bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
-  // Get path to Inspector executable.
-  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
-
-  // Standardize path (resolve symlinkes, etc.)  and escape spaces
-  inspectorPathString = [inspectorPathString stringByStandardizingPath];
-  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
-                                              componentsJoinedByString:@"\\ "];
-
-  // Create an on-demand server object representing the Inspector.
-  // In case of a crash, we simply need to call the LaunchOnDemand()
-  // method on it, then send a mach message to its service port.
-  // It will then launch and perform a process inspection of our crashed state.
-  // See the HandleException() method for the details.
-#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
-
-  name_t portName;
-  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
-
-  // Save the location of the Inspector
-  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
-          sizeof(inspector_path_));
-
-  // Append a single command-line argument to the Inspector path
-  // representing the bootstrap name of the launch-on-demand receive port.
-  // When the Inspector is launched, it can use this to lookup the port
-  // by calling bootstrap_check_in().
-  strlcat(inspector_path_, " ", sizeof(inspector_path_));
-  strlcat(inspector_path_, portName, sizeof(inspector_path_));
-
-  kern_return_t kr = inspector_.Initialize(inspector_path_,
-                                           portName,
-                                           true);        // shutdown on exit
-
-  if (kr != KERN_SUCCESS) {
-    return false;
-  }
-
-  // Create the handler (allocating it in our special protected pool)
-  handler_ =
-      new (gBreakpadAllocator->Allocate(
-          sizeof(google_breakpad::ExceptionHandler)))
-          google_breakpad::ExceptionHandler(
-              Breakpad::ExceptionHandlerDirectCallback, this, true);
-  return true;
-}
-+//bool Breakpad::InitializeOutOfProcess(NSDictionary* parameters) {
-+//  // Get path to Inspector executable.
-+//  NSString *inspectorPathString = KeyValue(@BREAKPAD_INSPECTOR_LOCATION);
-+//
-+//  // Standardize path (resolve symlinkes, etc.)  and escape spaces
-+//  inspectorPathString = [inspectorPathString stringByStandardizingPath];
-+//  inspectorPathString = [[inspectorPathString componentsSeparatedByString:@" "]
-+//                                              componentsJoinedByString:@"\\ "];
-+//
-+//  // Create an on-demand server object representing the Inspector.
-+//  // In case of a crash, we simply need to call the LaunchOnDemand()
-+//  // method on it, then send a mach message to its service port.
-+//  // It will then launch and perform a process inspection of our crashed state.
-+//  // See the HandleException() method for the details.
-+//#define RECEIVE_PORT_NAME "com.Breakpad.Inspector"
-+//
-+//  name_t portName;
-+//  snprintf(portName, sizeof(name_t),  "%s%d", RECEIVE_PORT_NAME, getpid());
-+//
-+//  // Save the location of the Inspector
-+//  strlcpy(inspector_path_, [inspectorPathString fileSystemRepresentation],
-+//          sizeof(inspector_path_));
-+//
-+//  // Append a single command-line argument to the Inspector path
-+//  // representing the bootstrap name of the launch-on-demand receive port.
-+//  // When the Inspector is launched, it can use this to lookup the port
-+//  // by calling bootstrap_check_in().
-+//  strlcat(inspector_path_, " ", sizeof(inspector_path_));
-+//  strlcat(inspector_path_, portName, sizeof(inspector_path_));
-+//
-+//  kern_return_t kr = inspector_.Initialize(inspector_path_,
-+//                                           portName,
-+//                                           true);        // shutdown on exit
-+//
-+//  if (kr != KERN_SUCCESS) {
-+//    return false;
-+//  }
-+//
-+//  // Create the handler (allocating it in our special protected pool)
-+//  handler_ =
-+//      new (gBreakpadAllocator->Allocate(
-+//          sizeof(google_breakpad::ExceptionHandler)))
-+//          google_breakpad::ExceptionHandler(
-+//              Breakpad::ExceptionHandlerDirectCallback, this, true);
-+//  return true;
-+//}
- 
- //=============================================================================
- Breakpad::~Breakpad() {
-@@ -445,10 +445,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   NSString *version = [parameters objectForKey:@BREAKPAD_VERSION];
-   NSString *urlStr = [parameters objectForKey:@BREAKPAD_URL];
-   NSString *interval = [parameters objectForKey:@BREAKPAD_REPORT_INTERVAL];
-  NSString *inspectorPathString =
-      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
-  NSString *reporterPathString =
-      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
-+//  NSString *inspectorPathString =
-+//      [parameters objectForKey:@BREAKPAD_INSPECTOR_LOCATION];
-+//  NSString *reporterPathString =
-+//      [parameters objectForKey:@BREAKPAD_REPORTER_EXE_LOCATION];
-   NSString *timeout = [parameters objectForKey:@BREAKPAD_CONFIRM_TIMEOUT];
-   NSArray  *logFilePaths = [parameters objectForKey:@BREAKPAD_LOGFILES];
-   NSString *logFileTailSize =
-@@ -536,39 +536,39 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   }
- 
-   // Find the helper applications if not specified in user config.
-  NSString *resourcePath = nil;
-  if (!inspectorPathString || !reporterPathString) {
-    resourcePath = GetResourcePath();
-    if (!resourcePath) {
-      return false;
-    }
-  }
-+//  NSString *resourcePath = nil;
-+//  if (!inspectorPathString || !reporterPathString) {
-+//    resourcePath = GetResourcePath();
-+//    if (!resourcePath) {
-+//      return false;
-+//    }
-+//  }
- 
-   // Find Inspector.
-  if (!inspectorPathString) {
-    inspectorPathString =
-        [resourcePath stringByAppendingPathComponent:@"Inspector"];
-  }
-
-  // Verify that there is an Inspector tool.
-  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
-    return false;
-  }
-+//  if (!inspectorPathString) {
-+//    inspectorPathString =
-+//        [resourcePath stringByAppendingPathComponent:@"Inspector"];
-+//  }
-+//
-+//  // Verify that there is an Inspector tool.
-+//  if (![[NSFileManager defaultManager] fileExistsAtPath:inspectorPathString]) {
-+//    return false;
-+//  }
- 
-   // Find Reporter.
-  if (!reporterPathString) {
-    reporterPathString =
-        [resourcePath
-         stringByAppendingPathComponent:@"crash_report_sender.app"];
-    reporterPathString =
-        [[NSBundle bundleWithPath:reporterPathString] executablePath];
-  }
-+//  if (!reporterPathString) {
-+//    reporterPathString =
-+//        [resourcePath
-+//         stringByAppendingPathComponent:@"crash_report_sender.app"];
-+//    reporterPathString =
-+//        [[NSBundle bundleWithPath:reporterPathString] executablePath];
-+//  }
- 
-   // Verify that there is a Reporter application.
-  if (![[NSFileManager defaultManager]
-             fileExistsAtPath:reporterPathString]) {
-    return false;
-  }
-+//  if (![[NSFileManager defaultManager]
-+//             fileExistsAtPath:reporterPathString]) {
-+//    return false;
-+//  }
- 
-   if (!dumpSubdirectory) {
-     dumpSubdirectory = @"";
-@@ -601,10 +601,10 @@ bool Breakpad::ExtractParameters(NSDictionary *parameters) {
-   dictionary.SetKeyValue(BREAKPAD_REPORT_INTERVAL, [interval UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_SKIP_CONFIRM,    [skipConfirm UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_CONFIRM_TIMEOUT, [timeout UTF8String]);
-  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
-                         [inspectorPathString fileSystemRepresentation]);
-  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
-                         [reporterPathString fileSystemRepresentation]);
-+//  dictionary.SetKeyValue(BREAKPAD_INSPECTOR_LOCATION,
-+//                         [inspectorPathString fileSystemRepresentation]);
-+//  dictionary.SetKeyValue(BREAKPAD_REPORTER_EXE_LOCATION,
-+//                         [reporterPathString fileSystemRepresentation]);
-   dictionary.SetKeyValue(BREAKPAD_LOGFILE_UPLOAD_SIZE,
-                          [logFileTailSize UTF8String]);
-   dictionary.SetKeyValue(BREAKPAD_REQUEST_COMMENTS,
-@@ -762,9 +762,9 @@ bool Breakpad::HandleException(int exception_type,
- bool Breakpad::HandleMinidump(const char *dump_dir, const char *minidump_id) {
-   google_breakpad::ConfigFile config_file;
-   config_file.WriteFile(dump_dir, config_params_, dump_dir, minidump_id);
-  google_breakpad::LaunchReporter(
-      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
-      config_file.GetFilePath());
-+//  google_breakpad::LaunchReporter(
-+//      config_params_->GetValueForKey(BREAKPAD_REPORTER_EXE_LOCATION),
-+//      config_file.GetFilePath());
-   return true;
- }
- 
-diff --git a/src/common/language.cc b/src/common/language.cc
-index 978fb855..a95ae5f7 100644
--- a/src/common/language.cc
-+++ b/src/common/language.cc
-@@ -46,8 +46,27 @@
- 
- #include <limits>
- 
-+#include <cstdio>
-+#include <iostream>
-+#include <memory>
-+#include <stdexcept>
-+#include <string>
-+#include <array>
-+
- namespace {
- 
-+std::string exec(std::string cmd) {
-+    std::array<char, 128> buffer;
-+    std::string result;
-+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
-+    if (!pipe) throw std::runtime_error("popen() failed!");
-+    while (!feof(pipe.get())) {
-+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
-+            result += buffer.data();
-+    }
-+    return result;
-+}
-+
- string MakeQualifiedNameWithSeparator(const string& parent_name,
-                                       const char* separator,
-                                       const string& name) {
-@@ -79,11 +98,29 @@ class CPPLanguage: public Language {
-     demangled->clear();
-     return kDontDemangle;
- #else
-+    DemangleResult result;
-+    if (mangled.find("type_erased_handlers") != std::string::npos
-+            && mangled.find("vtable_once_impl") != std::string::npos) {
-+
-+        auto demangled_str = exec("c++filt " + mangled);
-+        if (!demangled_str.empty() && demangled_str.back() == '\n') {
-+            demangled_str.pop_back();
-+        }
-+        if (demangled_str != mangled) {
-+            result = kDemangleSuccess;
-+            demangled->assign(demangled_str.c_str());
-+        } else {
-+            result = kDemangleFailure;
-+            demangled->clear();
-+        }
-+
-+    } else {
-+
-     int status;
-     char* demangled_c =
-         abi::__cxa_demangle(mangled.c_str(), NULL, NULL, &status);
- 
-    DemangleResult result;
-+//    DemangleResult result;
-     if (status == 0) {
-       result = kDemangleSuccess;
-       demangled->assign(demangled_c);
-@@ -96,6 +133,8 @@ class CPPLanguage: public Language {
-       free(reinterpret_cast<void*>(demangled_c));
-     }
- 
-+    }
-+
-     return result;
- #endif
-   }
-diff --git a/src/common/linux/elf_symbols_to_module.cc b/src/common/linux/elf_symbols_to_module.cc
-index 562875e1..43678510 100644
--- a/src/common/linux/elf_symbols_to_module.cc
-+++ b/src/common/linux/elf_symbols_to_module.cc
-@@ -39,6 +39,29 @@
- #include "common/byte_cursor.h"
- #include "common/module.h"
- 
-+#include <cstdio>
-+#include <iostream>
-+#include <memory>
-+#include <stdexcept>
-+#include <string>
-+#include <array>
-+
-+namespace {
-+
-+std::string exec(std::string cmd) {
-+    std::array<char, 128> buffer;
-+    std::string result;
-+    std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
-+    if (!pipe) throw std::runtime_error("popen() failed!");
-+    while (!feof(pipe.get())) {
-+        if (fgets(buffer.data(), 128, pipe.get()) != nullptr)
-+            result += buffer.data();
-+    }
-+    return result;
-+}
-+
-+}
-+
- namespace google_breakpad {
- 
- class ELFSymbolIterator {
-@@ -159,6 +182,19 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
-       Module::Extern *ext = new Module::Extern(iterator->value);
-       ext->name = SymbolString(iterator->name_offset, strings);
- #if !defined(__ANDROID__)  // Android NDK doesn't provide abi::__cxa_demangle.
-+      if (ext->name.find("type_erased_handlers") != std::string::npos
-+              && ext->name.find("vtable_once_impl") != std::string::npos) {
-+
-+          auto demangled_str = exec("c++filt " + ext->name);
-+          if (!demangled_str.empty() && demangled_str.back() == '\n') {
-+              demangled_str.pop_back();
-+          }
-+          if (demangled_str != ext->name) {
-+              ext->name = demangled_str;
-+          }
-+
-+      } else {
-+
-       int status = 0;
-       char* demangled =
-           abi::__cxa_demangle(ext->name.c_str(), NULL, NULL, &status);
-@@ -167,6 +203,8 @@ bool ELFSymbolsToModule(const uint8_t *symtab_section,
-           ext->name = demangled;
-         free(demangled);
-       }
-+
-+      }
- #endif
-       module->AddExtern(ext);
-     }
-diff --git a/src/tools/linux/tools_linux.gypi b/src/tools/linux/tools_linux.gypi
-index 1c15992e..020e4c1c 100644
--- a/src/tools/linux/tools_linux.gypi
-+++ b/src/tools/linux/tools_linux.gypi
-@@ -58,7 +58,7 @@
-       'target_name': 'minidump_upload',
-       'type': 'executable',
-       'sources': [
-        'symupload/minidump_upload.m',
-+        'symupload/minidump_upload.cc',
-       ],
-       'dependencies': [
-         '../common/common.gyp:common',
-diff --git a/src/tools/mac/dump_syms/macho_dump.cc b/src/tools/mac/dump_syms/macho_dump.cc
-index d882bbe8..3432bb45 100644
--- a/src/tools/mac/dump_syms/macho_dump.cc
-+++ b/src/tools/mac/dump_syms/macho_dump.cc
-@@ -140,7 +140,7 @@ void DumpFile(const char *filename) {
-   size_t object_files_size;
-   const SuperFatArch* super_fat_object_files =
-       fat_reader.object_files(&object_files_size);
-  struct fat_arch *object_files;
-+  struct fat_arch *object_files = 0;
-   if (!super_fat_object_files->ConvertToFatArch(object_files)) {
-     exit(1);
-   }
--- a/Telegram/Patches/build_ffmpeg_win.sh
+++ b/Telegram/Patches/build_ffmpeg_win.sh
@@ -1,121 +0,0 @@
-set -e
-FullExecPath=$PWD
-pushd `dirname $0` > /dev/null
-FullScriptPath=`pwd`
-popd > /dev/null
-
-pacman --noconfirm -Sy
-pacman --noconfirm -S msys/make
-pacman --noconfirm -S mingw64/mingw-w64-x86_64-opus
-pacman --noconfirm -S diffutils
-pacman --noconfirm -S pkg-config
-
-PKG_CONFIG_PATH="/mingw64/lib/pkgconfig:$PKG_CONFIG_PATH"
-
-./configure --toolchain=msvc \
--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
--extra-cxxflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \
--extra-ldflags="-libpath:$FullExecPath/../opus/win32/VS2015/Win32/Release" \
--disable-programs \
--disable-doc \
--disable-network \
--disable-everything \
--enable-hwaccel=h264_d3d11va \
--enable-hwaccel=h264_d3d11va2 \
--enable-hwaccel=h264_dxva2 \
--enable-hwaccel=hevc_d3d11va \
--enable-hwaccel=hevc_d3d11va2 \
--enable-hwaccel=hevc_dxva2 \
--enable-hwaccel=mpeg2_d3d11va \
--enable-hwaccel=mpeg2_d3d11va2 \
--enable-hwaccel=mpeg2_dxva2 \
--enable-protocol=file --enable-libopus \
--enable-decoder=aac \
--enable-decoder=aac_at \
--enable-decoder=aac_fixed \
--enable-decoder=aac_latm \
--enable-decoder=aasc \
--enable-decoder=alac \
--enable-decoder=alac_at \
--enable-decoder=flac \
--enable-decoder=gif \
--enable-decoder=h264 \
--enable-decoder=hevc \
--enable-decoder=mp1 \
--enable-decoder=mp1float \
--enable-decoder=mp2 \
--enable-decoder=mp2float \
--enable-decoder=mp3 \
--enable-decoder=mp3adu \
--enable-decoder=mp3adufloat \
--enable-decoder=mp3float \
--enable-decoder=mp3on4 \
--enable-decoder=mp3on4float \
--enable-decoder=mpeg4 \
--enable-decoder=msmpeg4v2 \
--enable-decoder=msmpeg4v3 \
--enable-decoder=opus \
--enable-decoder=pcm_alaw \
--enable-decoder=pcm_alaw_at \
--enable-decoder=pcm_f32be \
--enable-decoder=pcm_f32le \
--enable-decoder=pcm_f64be \
--enable-decoder=pcm_f64le \
--enable-decoder=pcm_lxf \
--enable-decoder=pcm_mulaw \
--enable-decoder=pcm_mulaw_at \
--enable-decoder=pcm_s16be \
--enable-decoder=pcm_s16be_planar \
--enable-decoder=pcm_s16le \
--enable-decoder=pcm_s16le_planar \
--enable-decoder=pcm_s24be \
--enable-decoder=pcm_s24daud \
--enable-decoder=pcm_s24le \
--enable-decoder=pcm_s24le_planar \
--enable-decoder=pcm_s32be \
--enable-decoder=pcm_s32le \
--enable-decoder=pcm_s32le_planar \
--enable-decoder=pcm_s64be \
--enable-decoder=pcm_s64le \
--enable-decoder=pcm_s8 \
--enable-decoder=pcm_s8_planar \
--enable-decoder=pcm_u16be \
--enable-decoder=pcm_u16le \
--enable-decoder=pcm_u24be \
--enable-decoder=pcm_u24le \
--enable-decoder=pcm_u32be \
--enable-decoder=pcm_u32le \
--enable-decoder=pcm_u8 \
--enable-decoder=pcm_zork \
--enable-decoder=vorbis \
--enable-decoder=wavpack \
--enable-decoder=wmalossless \
--enable-decoder=wmapro \
--enable-decoder=wmav1 \
--enable-decoder=wmav2 \
--enable-decoder=wmavoice \
--enable-encoder=libopus \
--enable-parser=aac \
--enable-parser=aac_latm \
--enable-parser=flac \
--enable-parser=h264 \
--enable-parser=hevc \
--enable-parser=mpeg4video \
--enable-parser=mpegaudio \
--enable-parser=opus \
--enable-parser=vorbis \
--enable-demuxer=aac \
--enable-demuxer=flac \
--enable-demuxer=gif \
--enable-demuxer=h264 \
--enable-demuxer=hevc \
--enable-demuxer=m4v \
--enable-demuxer=mov \
--enable-demuxer=mp3 \
--enable-demuxer=ogg \
--enable-demuxer=wav \
--enable-muxer=ogg \
--enable-muxer=opus
-
-make -j4
-make -j4 install
--- a/Telegram/Patches/crashpad.diff
+++ b/Telegram/Patches/crashpad.diff
@@ -1,107 +0,0 @@
-diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
-index 436ac5ad..8e14fb9c 100644
--- a/client/capture_context_mac_test.cc
-+++ b/client/capture_context_mac_test.cc
-@@ -34,11 +34,11 @@ namespace {
- // gtest assertions.
- void SanityCheckContext(const NativeCPUContext& context) {
- #if defined(ARCH_CPU_X86)
-  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #elif defined(ARCH_CPU_X86_64)
-  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #endif
- 
- #if defined(ARCH_CPU_X86_FAMILY)
-diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
-index 7e279015..27864388 100644
--- a/client/simulate_crash_mac.cc
-+++ b/client/simulate_crash_mac.cc
-@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
- 
- void SimulateCrash(const NativeCPUContext& cpu_context) {
- #if defined(ARCH_CPU_X86)
-  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE32_COUNT);
- #elif defined(ARCH_CPU_X86_64)
-  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE64_COUNT);
-diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
-index 87c5f845..ca813e4c 100644
--- a/client/simulate_crash_mac_test.cc
-+++ b/client/simulate_crash_mac_test.cc
-@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_thread_state*>(old_state);
-           switch (state->tsh.flavor) {
-             case x86_THREAD_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
-                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             case x86_THREAD_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
-                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
-@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_float_state*>(old_state);
-           switch (state->fsh.flavor) {
-             case x86_FLOAT_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
-                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             case x86_FLOAT_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
-                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
-@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_debug_state*>(old_state);
-           switch (state->dsh.flavor) {
-             case x86_DEBUG_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
-                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             case x86_DEBUG_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
-                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
-diff --git a/crashpad.gyp b/crashpad.gyp
-index 42fe0a26..d8af1bf1 100644
--- a/crashpad.gyp
-+++ b/crashpad.gyp
-@@ -25,7 +25,7 @@
-         'minidump/minidump.gyp:*',
-         'minidump/minidump_test.gyp:*',
-         'snapshot/snapshot.gyp:*',
-        'snapshot/snapshot_test.gyp:*',
-+#        'snapshot/snapshot_test.gyp:*',
-         'test/test.gyp:*',
-         'test/test_test.gyp:*',
-         'tools/tools.gyp:*',
--- a/Telegram/Patches/gyp.diff
+++ b/Telegram/Patches/gyp.diff
@@ -1,132 +0,0 @@
-diff --git a/pylib/gyp/generator/cmake.py b/pylib/gyp/generator/cmake.py
-index 4a2041cf..e5333926 100644
--- a/pylib/gyp/generator/cmake.py
-+++ b/pylib/gyp/generator/cmake.py
-@@ -1078,6 +1078,23 @@ def WriteTarget(namer, qualified_target, target_dicts, build_dir, config_to_use,
- 
-       output.write(')\n')
- 
-+  # Precompile header
-+  precompiled_header = config.get('cmake_precompiled_header', '')
-+  if precompiled_header:
-+    precompiled_header_script = config.get('cmake_precompiled_header_script', '')
-+    if not precompiled_header_script:
-+      print ('ERROR: cmake_precompiled_header requires cmake_precompiled_header_script')
-+    cmake_precompiled_header = NormjoinPath(path_from_cmakelists_to_gyp, precompiled_header)
-+    cmake_precompiled_header_script = NormjoinPathForceCMakeSource(path_from_cmakelists_to_gyp, precompiled_header_script)
-+    output.write('include(')
-+    output.write(cmake_precompiled_header_script)
-+    output.write(')\n')
-+    output.write('add_precompiled_header(')
-+    output.write(cmake_target_name)
-+    output.write(' ')
-+    output.write(cmake_precompiled_header)
-+    output.write(')\n')
-+
-   UnsetVariable(output, 'TOOLSET')
-   UnsetVariable(output, 'TARGET')
- 
-@@ -1120,6 +1137,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
-   SetVariable(output, 'configuration', config_to_use)
- 
-   ar = None
-+  ranlib = None
-+  nm = None
-   cc = None
-   cxx = None
- 
-@@ -1129,17 +1148,27 @@ def GenerateOutputForConfig(target_list, target_dicts, data,
-   for key, value in make_global_settings:
-     if key == 'AR':
-       ar = os.path.join(build_to_top, value)
-+    if key == 'RANLIB':
-+      ranlib = os.path.join(build_to_top, value)
-+    if key == 'NM':
-+      nm = os.path.join(build_to_top, value)
-     if key == 'CC':
-       cc = os.path.join(build_to_top, value)
-     if key == 'CXX':
-       cxx = os.path.join(build_to_top, value)
- 
-   ar = gyp.common.GetEnvironFallback(['AR_target', 'AR'], ar)
-+  ranlib = gyp.common.GetEnvironFallback(['RANLIB_target', 'RANLIB'], ranlib)
-+  nm = gyp.common.GetEnvironFallback(['NM_target', 'NM'], nm)
-   cc = gyp.common.GetEnvironFallback(['CC_target', 'CC'], cc)
-   cxx = gyp.common.GetEnvironFallback(['CXX_target', 'CXX'], cxx)
- 
-   if ar:
-     SetVariable(output, 'CMAKE_AR', ar)
-+  if ranlib:
-+    SetVariable(output, 'CMAKE_RANLIB', ranlib)
-+  if nm:
-+    SetVariable(output, 'CMAKE_NM', nm)
-   if cc:
-     SetVariable(output, 'CMAKE_C_COMPILER', cc)
-   if cxx:
-diff --git a/pylib/gyp/generator/xcode.py b/pylib/gyp/generator/xcode.py
-index 8bc22bed..24bee427 100644
--- a/pylib/gyp/generator/xcode.py
-+++ b/pylib/gyp/generator/xcode.py
-@@ -74,6 +74,12 @@ generator_additional_non_configuration_keys = [
-   'ios_app_extension',
-   'ios_watch_app',
-   'ios_watchkit_extension',
-+
-+  'mac_sandbox', # sandbox support
-+  'mac_sandbox_development_team',
-+
-+  'mac_hardened_runtime', # hardened runtime support
-+
-   'mac_bundle',
-   'mac_bundle_resources',
-   'mac_framework_headers',
-@@ -774,6 +780,39 @@ def GenerateOutput(target_list, target_dicts, data, params):
-     xcode_targets[qualified_target] = xct
-     xcode_target_to_target_dict[xct] = spec
- 
-+    # sandbox and hardened runtime support
-+    is_sandbox = int(spec.get('mac_sandbox', 0))
-+    is_hardened_runtime = int(spec.get('mac_hardened_runtime', 0))
-+    if is_sandbox or is_hardened_runtime:
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes']
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'] = {}
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'][xct] = {}
-+      try:
-+        tmp = pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']
-+      except KeyError:
-+        pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities'] = {}
-+
-+    if is_sandbox:
-+      dev_team = spec.get('mac_sandbox_development_team', '%%ERROR%%')
-+      assert dev_team != '%%ERROR%%', (
-+          'mac_sandbox must be accompanied by mac_sandbox_development_team (target "%s")' %
-+          target_name)
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['DevelopmentTeam'] = dev_team
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.Sandbox'] = {
-+        'enabled': 1,
-+      }
-+
-+    # hardened runtime support
-+    if is_hardened_runtime:
-+      pbxp._properties['attributes']['TargetAttributes'][xct]['SystemCapabilities']['com.apple.HardenedRuntime'] = {
-+        'enabled': 1,
-+      }
-+
-     spec_actions = spec.get('actions', [])
-     spec_rules = spec.get('rules', [])
- 
-@@ -1132,7 +1171,8 @@ exit 1
-         groups = [x for x in groups if not x.endswith('_excluded')]
-       for group in groups:
-         for item in rule.get(group, []):
-          pbxp.AddOrGetFileInRootGroup(item)
-+          concrete_item = ExpandXcodeVariables(item, rule_input_dict)
-+          pbxp.AddOrGetFileInRootGroup(concrete_item)
- 
-     # Add "sources".
-     for source in spec.get('sources', []):
--- a/Telegram/Patches/macold/crashpad.diff
+++ b/Telegram/Patches/macold/crashpad.diff
@@ -1,127 +0,0 @@
-diff --git a/build/crashpad.gypi b/build/crashpad.gypi
-index 027c7b68..4bfdfb5a 100644
--- a/build/crashpad.gypi
-+++ b/build/crashpad.gypi
-@@ -25,5 +25,15 @@
-       4201,  # nonstandard extension used : nameless struct/union.
-       4324,  # structure was padded due to __declspec(align()).
-     ],
-+    'xcode_settings': {
-+      'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-+      'OTHER_LDFLAGS': [
-+        '/usr/local/macold/lib/libc++.a',
-+        '/usr/local/macold/lib/libc++abi.a',
-+      ],
-+    },
-+    'include_dirs': [
-+      '/usr/local/macold/include/c++/v1',
-+    ],
-   },
- }
-diff --git a/client/capture_context_mac_test.cc b/client/capture_context_mac_test.cc
-index 436ac5ad..8e14fb9c 100644
--- a/client/capture_context_mac_test.cc
-+++ b/client/capture_context_mac_test.cc
-@@ -34,11 +34,11 @@ namespace {
- // gtest assertions.
- void SanityCheckContext(const NativeCPUContext& context) {
- #if defined(ARCH_CPU_X86)
-  ASSERT_EQ(x86_THREAD_STATE32, context.tsh.flavor);
-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #elif defined(ARCH_CPU_X86_64)
-  ASSERT_EQ(x86_THREAD_STATE64, context.tsh.flavor);
-  ASSERT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT), context.tsh.count);
-+  ASSERT_EQ(implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64), implicit_cast<thread_state_flavor_t>(context.tsh.flavor));
-+  ASSERT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT), implicit_cast<uint32_t>(context.tsh.count));
- #endif
- 
- #if defined(ARCH_CPU_X86_FAMILY)
-diff --git a/client/simulate_crash_mac.cc b/client/simulate_crash_mac.cc
-index 7e279015..27864388 100644
--- a/client/simulate_crash_mac.cc
-+++ b/client/simulate_crash_mac.cc
-@@ -177,12 +177,12 @@ bool DeliverException(thread_t thread,
- 
- void SimulateCrash(const NativeCPUContext& cpu_context) {
- #if defined(ARCH_CPU_X86)
-  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE32));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE32_COUNT);
- #elif defined(ARCH_CPU_X86_64)
-  DCHECK_EQ(cpu_context.tsh.flavor,
-+  DCHECK_EQ(implicit_cast<thread_state_flavor_t>(cpu_context.tsh.flavor),
-             implicit_cast<thread_state_flavor_t>(x86_THREAD_STATE64));
-   DCHECK_EQ(implicit_cast<mach_msg_type_number_t>(cpu_context.tsh.count),
-             x86_THREAD_STATE64_COUNT);
-diff --git a/client/simulate_crash_mac_test.cc b/client/simulate_crash_mac_test.cc
-index 87c5f845..ca813e4c 100644
--- a/client/simulate_crash_mac_test.cc
-+++ b/client/simulate_crash_mac_test.cc
-@@ -130,12 +130,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_thread_state*>(old_state);
-           switch (state->tsh.flavor) {
-             case x86_THREAD_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE32_COUNT),
-                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             case x86_THREAD_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_THREAD_STATE64_COUNT),
-                        state->tsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_THREAD_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->tsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected tsh.flavor " << state->tsh.flavor;
-@@ -149,12 +149,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_float_state*>(old_state);
-           switch (state->fsh.flavor) {
-             case x86_FLOAT_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE32_COUNT),
-                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             case x86_FLOAT_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_FLOAT_STATE64_COUNT),
-                        state->fsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_FLOAT_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->fsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected fsh.flavor " << state->fsh.flavor;
-@@ -168,12 +168,12 @@ class TestSimulateCrashMac final : public MachMultiprocess,
-               reinterpret_cast<const x86_debug_state*>(old_state);
-           switch (state->dsh.flavor) {
-             case x86_DEBUG_STATE32:
-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE32_COUNT),
-                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE32_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             case x86_DEBUG_STATE64:
-              EXPECT_EQ(implicit_cast<int>(x86_DEBUG_STATE64_COUNT),
-                        state->dsh.count);
-+              EXPECT_EQ(implicit_cast<uint32_t>(x86_DEBUG_STATE64_COUNT),
-+                        implicit_cast<uint32_t>(state->dsh.count));
-               break;
-             default:
-               ADD_FAILURE() << "unexpected dsh.flavor " << state->dsh.flavor;
-diff --git a/crashpad.gyp b/crashpad.gyp
-index 42fe0a26..d8af1bf1 100644
--- a/crashpad.gyp
-+++ b/crashpad.gyp
-@@ -25,7 +25,7 @@
-         'minidump/minidump.gyp:*',
-         'minidump/minidump_test.gyp:*',
-         'snapshot/snapshot.gyp:*',
-        'snapshot/snapshot_test.gyp:*',
-+#        'snapshot/snapshot_test.gyp:*',
-         'test/test.gyp:*',
-         'test/test_test.gyp:*',
-         'tools/tools.gyp:*',
--- a/Telegram/Patches/macold/mini_chromium.diff
+++ b/Telegram/Patches/macold/mini_chromium.diff
@@ -1,28 +0,0 @@
-diff --git a/build/common.gypi b/build/common.gypi
-index 1affc70..0677e4b 100644
--- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -66,6 +66,13 @@
-           'conditions': [
-             ['clang!=0', {
-               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
-+              'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
-+              'OTHER_LDFLAGS': [
-+                '/usr/local/macold/lib/libc++.a',
-+                '/usr/local/macold/lib/libc++abi.a',
-+                '-isysroot/',
-+                '-L/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib/',
-+              ],
- 
-               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
-               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
-@@ -116,6 +123,9 @@
-           ],
- 
-         },
-+        'include_dirs': [
-+          '/usr/local/macold/include/c++/v1',
-+        ],
-       }],
- 
-       ['OS=="linux"', {
--- a/Telegram/Patches/macold/qtbase_5_3_2.diff
+++ b/Telegram/Patches/macold/qtbase_5_3_2.diff
@@ -1,844 +0,0 @@
-diff --git a/configure b/configure
-index cb8d78fd3c..cadb3f0a88 100755
--- a/configure
-+++ b/configure
-@@ -511,7 +511,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
-         exit 2
-     fi
- 
-    if ! /usr/bin/xcrun -find xcrun >/dev/null 2>&1; then
-+    # Patch: Fix Qt for working with Xcode 8.
-+    if ! /usr/bin/xcrun -find xcodebuild >/dev/null 2>&1; then
-         echo >&2
-         echo "   Xcode not set up properly. You may need to confirm the license" >&2
-         echo "   agreement by running /usr/bin/xcodebuild without arguments." >&2
-diff --git a/mkspecs/common/g++-macx.conf b/mkspecs/common/g++-macx.conf
-index 086510dd96..078a5ed1dd 100644
--- a/mkspecs/common/g++-macx.conf
-+++ b/mkspecs/common/g++-macx.conf
-@@ -14,7 +14,13 @@ QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
- QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gdwarf-2
- QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g -gdwarf-2
- 
-QMAKE_LFLAGS_STATIC_LIB += -all_load
-+# Patch: Don't remember :(
-+#QMAKE_LFLAGS_STATIC_LIB += -all_load
-+
-+# Patch: Use C++14 with custom libc++ build.
-+QMAKE_CXXFLAGS_CXX11 = -std=c++1y
-+QMAKE_CXXFLAGS += -nostdinc++ -I/usr/local/macold/include/c++/v1
-+QMAKE_LFLAGS += /usr/local/macold/lib/libc++.a /usr/local/macold/lib/libc++abi.a -isysroot /
- 
- QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
- 
-diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
-index 0cc8cd6dfd..ca9725b779 100644
--- a/mkspecs/features/mac/default_pre.prf
-+++ b/mkspecs/features/mac/default_pre.prf
-@@ -12,7 +12,9 @@ isEmpty(QMAKE_XCODE_DEVELOPER_PATH) {
-         error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.")
- 
-     # Make sure Xcode is set up properly
-    isEmpty($$list($$system("/usr/bin/xcrun -find xcrun 2>/dev/null"))): \
-+
-+    # Patch: Fix Qt for working with Xcode 8.
-+    isEmpty($$list($$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null"))): \
-         error("Xcode not set up properly. You may need to confirm the license agreement by running /usr/bin/xcodebuild.")
- }
- 
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index bb79a139b3..5d595bc3b3 100644
--- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -220,6 +220,10 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-     int blue_scale = 0;
-     int alpha_scale = 0;
- 
-+    // Patch: Backport a fix for bmp reader.
-+    if (!d->isSequential())
-+        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
-+
-     if (bi.biSize >= BMP_WIN4 || (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32))) {
-         if (d->read((char *)&red_mask, sizeof(red_mask)) != sizeof(red_mask))
-             return false;
-@@ -307,8 +311,9 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-     image.setDotsPerMeterX(bi.biXPelsPerMeter);
-     image.setDotsPerMeterY(bi.biYPelsPerMeter);
- 
-    if (!d->isSequential())
-        d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
-+    // Patch: Backport a fix for bmp reader.
-+    //if (!d->isSequential())
-+    //    d->seek(startpos + BMP_FILEHDR_SIZE + (bi.biSize >= BMP_WIN4? BMP_WIN : bi.biSize)); // goto start of colormap
- 
-     if (ncols > 0) {                                // read color table
-         uchar rgb[4];
-diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h
-index ebff9509ab..4300ca4c0f 100644
--- a/src/gui/painting/qpaintengine_p.h
-+++ b/src/gui/painting/qpaintengine_p.h
-@@ -87,8 +87,18 @@ public:
-         if (hasSystemTransform) {
-             if (systemTransform.type() <= QTransform::TxTranslate)
-                 systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy()));
-            else
-+            // Patch: Transform the system clip region back from device pixels to device-independent pixels before
-+            // applying systemTransform, which already has transform from device-independent pixels to device pixels.
-+            else {
-+#ifdef Q_OS_MAC
-+                QTransform scaleTransform;
-+                const qreal invDevicePixelRatio = 1. / pdev->devicePixelRatio();
-+                scaleTransform.scale(invDevicePixelRatio, invDevicePixelRatio);
-+                systemClip = systemTransform.map(scaleTransform.map(systemClip));
-+#else
-                 systemClip = systemTransform.map(systemClip);
-+#endif
-+            }
-         }
- 
-         // Make sure we're inside the viewport.
-diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
-index 4879ae51d7..56cdcbaf01 100644
--- a/src/gui/text/qtextlayout.cpp
-+++ b/src/gui/text/qtextlayout.cpp
-@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
-         while (oldPos < len && !attributes[oldPos].graphemeBoundary)
-             oldPos++;
-     } else {
-+        // Patch: Skip to the end of the current word, not to the start of the next one.
-+        while (oldPos < len && attributes[oldPos].whiteSpace)
-+            oldPos++;
-         if (oldPos < len && d->atWordSeparator(oldPos)) {
-             oldPos++;
-             while (oldPos < len && d->atWordSeparator(oldPos))
-@@ -662,8 +665,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
-             while (oldPos < len && !d->atSpace(oldPos) && !d->atWordSeparator(oldPos))
-                 oldPos++;
-         }
-        while (oldPos < len && d->atSpace(oldPos))
-            oldPos++;
-+        // Patch: Skip to the end of the current word, not to the start of the next one.
-+        //while (oldPos < len && d->atSpace(oldPos))
-+        //    oldPos++;
-     }
- 
-     return oldPos;
-@@ -1602,6 +1606,9 @@ namespace {
-         int currentPosition;
-         glyph_t previousGlyph;
- 
-+        // Patch: Backport a crash fix.
-+        QFontEngine *previousGlyphFontEngine;
-+
-         QFixed minw;
-         QFixed softHyphenWidth;
-         QFixed rightBearing;
-@@ -1634,13 +1641,19 @@ namespace {
-             if (currentPosition > 0 &&
-                 logClusters[currentPosition - 1] < glyphs.numGlyphs) {
-                 previousGlyph = currentGlyph(); // needed to calculate right bearing later
-+
-+                // Patch: Backport a crash fix.
-+                previousGlyphFontEngine = fontEngine;
-             }
-         }
- 
-        inline void adjustRightBearing(glyph_t glyph)
-+        // Patch: Backport a crash fix.
-+        inline void adjustRightBearing(QFontEngine *engine, glyph_t glyph)
-         {
-             qreal rb;
-            fontEngine->getGlyphBearings(glyph, 0, &rb);
-+
-+            // Patch: Backport a crash fix.
-+            engine->getGlyphBearings(glyph, 0, &rb);
-             rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
-         }
- 
-@@ -1648,13 +1661,16 @@ namespace {
-         {
-             if (currentPosition <= 0)
-                 return;
-            adjustRightBearing(currentGlyph());
-+
-+            // Patch: Backport a crash fix.
-+            adjustRightBearing(fontEngine, currentGlyph());
-         }
- 
-         inline void adjustPreviousRightBearing()
-         {
-             if (previousGlyph > 0)
-                adjustRightBearing(previousGlyph);
-+                // Patch: Backport a crash fix.
-+                adjustRightBearing(previousGlyphFontEngine, previousGlyph);
-         }
- 
-         inline void resetRightBearing()
-diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h
-index cbe42c3844..b273db7e78 100644
--- a/src/gui/text/qtextlayout.h
-+++ b/src/gui/text/qtextlayout.h
-@@ -194,6 +194,9 @@ private:
-                                QRectF *brect, int tabstops, int* tabarray, int tabarraylen,
-                                QPainter *painter);
-     QTextEngine *d;
-+
-+    // Patch: Give access to the internal api.
-+    friend class TextBlock;
- };
- 
- 
-diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
-index 360f9722c7..f28f289ef6 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
-+++ b/src/network/access/qhttpnetworkconnection.cpp
-@@ -118,6 +118,8 @@ QHttpNetworkConnectionPrivate::~QHttpNetworkConnectionPrivate()
- {
-     for (int i = 0; i < channelCount; ++i) {
-         if (channels[i].socket) {
-+            // Patch: backport critical bugfix from '4f959b6b30' commit.
-+            QObject::disconnect(channels[i].socket, Q_NULLPTR, &channels[i], Q_NULLPTR);
-             channels[i].socket->close();
-             delete channels[i].socket;
-         }
-diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-index ca7afb7d1b..25ae50008d 100644
--- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-+++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
-@@ -256,6 +256,13 @@ static void getFontDescription(CTFontDescriptorRef font, FontDescription *fd)
- 
-     fd->foundryName = QStringLiteral("CoreText");
-     fd->familyName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontFamilyNameAttribute);
-+
-+    // Patch: Fix open sans semibold loading.
-+    QCFString _displayName = (CFStringRef) CTFontDescriptorCopyAttribute(font, kCTFontDisplayNameAttribute);
-+    if (_displayName == QStringLiteral("Open Sans Semibold")) {
-+        fd->familyName = _displayName;
-+    }
-+
-     fd->styleName = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
-     fd->weight = QFont::Normal;
-     fd->style = QFont::StyleNormal;
-diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-index 6e2c8a2a9a..3cace8abcb 100644
--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
-@@ -717,7 +717,8 @@ void QCoreTextFontEngine::getUnscaledGlyph(glyph_t, QPainterPath *, glyph_metric
- 
- QFixed QCoreTextFontEngine::emSquareSize() const
- {
-    return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont)));
-+    // Patch: Fix build for Xcode 9.3.1.
-+    return QFixed(int(CTFontGetUnitsPerEm(ctfont)));
- }
- 
- QFontEngine *QCoreTextFontEngine::cloneWithSize(qreal pixelSize) const
-diff --git a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-index 92358ecc74..694fee7350 100644
--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm
-@@ -213,7 +213,8 @@ static void cleanupCocoaApplicationDelegate()
-     if (reflectionDelegate) {
-         if ([reflectionDelegate respondsToSelector:@selector(applicationShouldTerminate:)])
-             return [reflectionDelegate applicationShouldTerminate:sender];
-        return NSTerminateNow;
-+        // Patch: Don't terminate if reflectionDelegate does not respond to that selector, just use the default.
-+        //return NSTerminateNow;
-     }
- 
-     if ([self canQuit]) {
-@@ -289,6 +290,11 @@ static void cleanupCocoaApplicationDelegate()
- 
- - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
- {
-+    // Patch: We need to receive this notification in the delegate as well.
-+    if (reflectionDelegate
-+        && [reflectionDelegate respondsToSelector:@selector(applicationDidFinishLaunching:)])
-+        [reflectionDelegate applicationDidFinishLaunching:aNotification];
-+
-     Q_UNUSED(aNotification);
-     inLaunch = false;
-     // qt_release_apple_event_handler();
-@@ -411,7 +417,9 @@ static void cleanupCocoaApplicationDelegate()
- {
-     Q_UNUSED(replyEvent);
-     NSString *urlString = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
-    QWindowSystemInterface::handleFileOpenEvent(QUrl(QCFString::toQString(urlString)));
-+
-+    // Patch: Fix opening of an external url by a protocol handler.
-+    QWindowSystemInterface::handleFileOpenEvent(QUrl::fromNSURL([NSURL URLWithString:urlString]));
- }
- 
- - (void)appleEventQuit:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent
-diff --git a/src/plugins/platforms/cocoa/qcocoacursor.mm b/src/plugins/platforms/cocoa/qcocoacursor.mm
-index b81b9a0b1c..4e59e833b1 100644
--- a/src/plugins/platforms/cocoa/qcocoacursor.mm
-+++ b/src/plugins/platforms/cocoa/qcocoacursor.mm
-@@ -81,7 +81,7 @@ void QCocoaCursor::setPos(const QPoint &position)
-     pos.x = position.x();
-     pos.y = position.y();
- 
-    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, 0);
-+    CGEventRef e = CGEventCreateMouseEvent(0, kCGEventMouseMoved, pos, kCGMouseButtonLeft);
-     CGEventPost(kCGHIDEventTap, e);
-     CFRelease(e);
- }
-diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-index 9850f83dea..b2e1d3dfda 100644
--- a/src/plugins/platforms/cocoa/qcocoahelpers.mm
-+++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm
-@@ -649,9 +649,10 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
-     // Verbatim copy if HIViewDrawCGImage (as shown on Carbon-Dev)
-     OSStatus err = noErr;
- 
-    require_action(inContext != NULL, InvalidContext, err = paramErr);
-    require_action(inBounds != NULL, InvalidBounds, err = paramErr);
-    require_action(inImage != NULL, InvalidImage, err = paramErr);
-+    // Patch: Fix build on latest Xcode.
-+    //require_action(inContext != NULL, InvalidContext, err = paramErr);
-+    //require_action(inBounds != NULL, InvalidBounds, err = paramErr);
-+    //require_action(inImage != NULL, InvalidImage, err = paramErr);
- 
-     CGContextSaveGState( inContext );
-     CGContextTranslateCTM (inContext, 0, inBounds->origin.y + CGRectGetMaxY(*inBounds));
-@@ -660,9 +661,11 @@ OSStatus qt_mac_drawCGImage(CGContextRef inContext, const CGRect *inBounds, CGIm
-     CGContextDrawImage(inContext, *inBounds, inImage);
- 
-     CGContextRestoreGState(inContext);
-InvalidImage:
-InvalidBounds:
-InvalidContext:
-+
-+// Patch: Fix build on latest Xcode.
-+//InvalidImage:
-+//InvalidBounds:
-+//InvalidContext:
-         return err;
- }
- 
-diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-index 9fd05a65ee..dea60720e7 100644
--- a/src/plugins/platforms/cocoa/qcocoaintegration.mm
-+++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm
-@@ -402,14 +402,24 @@ void QCocoaIntegration::updateScreens()
-         }
-         siblings << screen;
-     }
-+
-+    // Patch: Backport crash fix from Qt 5.6.1.
-+    // Set virtual siblings list. All screens in mScreens are siblings, because we ignored the
-+    // mirrors. Note that some of the screens we update the siblings list for here may be deleted
-+    // below, but update anyway to keep the to-be-deleted screens out of the siblings list.
-+    foreach (QCocoaScreen* screen, mScreens)
-+        screen->setVirtualSiblings(siblings);
-+
-     // Now the leftovers in remainingScreens are no longer current, so we can delete them.
-     foreach (QCocoaScreen* screen, remainingScreens) {
-         mScreens.removeOne(screen);
-         delete screen;
-     }
-+
-+    // Patch: Backport crash fix from Qt 5.6.1.
-     // All screens in mScreens are siblings, because we ignored the mirrors.
-    foreach (QCocoaScreen* screen, mScreens)
-        screen->setVirtualSiblings(siblings);
-+    //foreach (QCocoaScreen* screen, mScreens)
-+    //    screen->setVirtualSiblings(siblings);
- }
- 
- QCocoaScreen *QCocoaIntegration::screenAtIndex(int index)
-diff --git a/src/plugins/platforms/cocoa/qcocoakeymapper.mm b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-index e46eaff6be..c62db534a2 100644
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.mm
-@@ -382,6 +382,12 @@ bool QCocoaKeyMapper::updateKeyboard()
-         keyboardInputLocale = QLocale::c();
-         keyboardInputDirection = Qt::LeftToRight;
-     }
-+
-+    // Patch: Backport a fix for layout-independent keyboard shortcuts.
-+    const auto newMode = keyboard_mode;
-+    deleteLayouts();
-+    keyboard_mode = newMode;
-+
-     return true;
- }
- 
-@@ -464,7 +470,8 @@ QList<int> QCocoaKeyMapper::possibleKeys(const QKeyEvent *event) const
-         Qt::KeyboardModifiers neededMods = ModsTbl[i];
-         int key = kbItem->qtKey[i];
-         if (key && key != baseKey && ((keyMods & neededMods) == neededMods)) {
-            ret << int(key + (keyMods & ~neededMods));
-+            // Patch: Backport a fix for layout-independent keyboard shortcuts.
-+            ret << int(key + neededMods);
-         }
-     }
-     return ret;
-diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-index 83c960d931..03ae9696af 100755
--- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-+++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm
-@@ -102,7 +102,10 @@ QT_USE_NAMESPACE
-     QCocoaSystemTrayIcon *systray;
-     NSStatusItem *item;
-     QCocoaMenu *menu;
-    bool menuVisible;
-+
-+    // Patch: Nice macOS tray icon support.
-+    bool menuVisible, iconSelected;
-+
-     QIcon icon;
-     QT_MANGLE_NAMESPACE(QNSImageView) *imageCell;
- }
-@@ -124,6 +127,10 @@ QT_USE_NAMESPACE
-     QT_MANGLE_NAMESPACE(QNSStatusItem) *parent;
- }
- -(id)initWithParent:(QT_MANGLE_NAMESPACE(QNSStatusItem)*)myParent;
-+
-+// Patch: Nice macOS tray icon support.
-+-(void)updateIconSelection;
-+
- -(void)menuTrackingDone:(NSNotification*)notification;
- -(void)mousePressed:(NSEvent *)mouseEvent button:(Qt::MouseButton)mouseButton;
- @end
-@@ -187,6 +194,19 @@ void QCocoaSystemTrayIcon::cleanup()
-     m_sys = 0;
- }
- 
-+// Patch: Nice macOS tray icon support.
-+namespace {
-+
-+qreal getDevicePixelRatio() {
-+    qreal result = 1.0;
-+    foreach (QScreen *screen, QGuiApplication::screens()) {
-+        result = qMax(result, screen->devicePixelRatio());
-+    }
-+    return result;
-+}
-+
-+} // namespace
-+
- void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
- {
-     if (!m_sys)
-@@ -194,13 +214,18 @@ void QCocoaSystemTrayIcon::updateIcon(const QIcon &icon)
- 
-     m_sys->item->icon = icon;
- 
-    const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
-+    // Patch: Nice macOS tray icon support.
-+    //const bool menuVisible = m_sys->item->menu && m_sys->item->menuVisible;
- 
-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-    const short scale = hgt - 4;
-+    const int padding = 0;
-+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
-+    const int maxImageHeight = menuHeight - padding;
-+
-+    const short scale = maxImageHeight * getDevicePixelRatio();
- 
-     QPixmap pm = m_sys->item->icon.pixmap(QSize(scale, scale),
-                                          menuVisible ? QIcon::Selected : QIcon::Normal);
-+                                          // Patch: Nice macOS tray icon support.
-+                                          m_sys->item->iconSelected ? QIcon::Selected : QIcon::Normal);
-     if (pm.isNull()) {
-         pm = QPixmap(scale, scale);
-         pm.fill(Qt::transparent);
-@@ -322,15 +347,16 @@ QT_END_NAMESPACE
-     return self;
- }
- 
--(void)menuTrackingDone:(NSNotification*)notification
-+// Patch: Nice macOS tray icon support.
-+-(void)updateIconSelection
- {
-    Q_UNUSED(notification);
-    down = NO;
-+    const int padding = 0;
-+    const int menuHeight = [[NSStatusBar systemStatusBar] thickness];
-+    const int maxImageHeight = menuHeight - padding;
- 
-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-    const short scale = hgt - 4;
-
-    QPixmap pm = parent->icon.pixmap(QSize(scale, scale), QIcon::Normal);
-+    const short scale = maxImageHeight * getDevicePixelRatio();
-+    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
-+    parent->iconSelected ? QIcon::Selected : QIcon::Normal);
-     if (pm.isNull()) {
-         pm = QPixmap(scale, scale);
-         pm.fill(Qt::transparent);
-@@ -338,9 +364,19 @@ QT_END_NAMESPACE
-     NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
-     [self setImage: nsaltimage];
-     [nsaltimage release];
-+}
-+
-+-(void)menuTrackingDone:(NSNotification*)notification
-+{
-+    Q_UNUSED(notification);
-+    down = NO;
- 
-     parent->menuVisible = false;
- 
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
-+
-     [self setNeedsDisplay:YES];
- }
- 
-@@ -350,18 +386,9 @@ QT_END_NAMESPACE
-     int clickCount = [mouseEvent clickCount];
-     [self setNeedsDisplay:YES];
- 
-    CGFloat hgt = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
-    const short scale = hgt - 4;
-
-    QPixmap pm = parent->icon.pixmap(QSize(scale, scale),
-                                     parent->menuVisible ? QIcon::Selected : QIcon::Normal);
-    if (pm.isNull()) {
-        pm = QPixmap(scale, scale);
-        pm.fill(Qt::transparent);
-    }
-    NSImage *nsaltimage = static_cast<NSImage *>(qt_mac_create_nsimage(pm));
-    [self setImage: nsaltimage];
-    [nsaltimage release];
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = (clickCount != 2) && parent->menu;
-+    [self updateIconSelection];
- 
-     if (clickCount == 2) {
-         [self menuTrackingDone:nil];
-@@ -380,6 +407,10 @@ QT_END_NAMESPACE
- {
-     Q_UNUSED(mouseEvent);
-     [self menuTrackingDone:nil];
-+
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
- }
- 
- - (void)rightMouseDown:(NSEvent *)mouseEvent
-@@ -391,6 +422,10 @@ QT_END_NAMESPACE
- {
-     Q_UNUSED(mouseEvent);
-     [self menuTrackingDone:nil];
-+
-+    // Patch: Nice macOS tray icon support.
-+    parent->iconSelected = false;
-+    [self updateIconSelection];
- }
- 
- - (void)otherMouseDown:(NSEvent *)mouseEvent
-@@ -405,7 +440,8 @@ QT_END_NAMESPACE
- }
- 
- -(void)drawRect:(NSRect)rect {
-    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:down];
-+    // Patch: Nice macOS tray icon support.
-+    [[parent item] drawStatusBarBackgroundInRect:rect withHighlight:parent->menu ? down : NO];
-     [super drawRect:rect];
- }
- @end
-diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
-index 4d0458a4aa..3357a5ef81 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
-+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
-@@ -167,7 +167,8 @@ static bool isMouseEvent(NSEvent *ev)
-     if (!self.window.delegate)
-         return; // Already detached, pending NSAppKitDefined event
- 
-    if (pw && pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
-+    // Patch: Fix events loss if the window was minimized or hidden.
-+    if (pw && pw->frameStrutEventsEnabled() && pw->m_synchedWindowState != Qt::WindowMinimized && pw->m_isExposed && isMouseEvent(theEvent)) {
-         NSPoint loc = [theEvent locationInWindow];
-         NSRect windowFrame = [self.window legacyConvertRectFromScreen:[self.window frame]];
-         NSRect contentFrame = [[self.window contentView] frame];
-@@ -795,6 +796,16 @@ NSUInteger QCocoaWindow::windowStyleMask(Qt::WindowFlags flags)
- {
-     Qt::WindowType type = static_cast<Qt::WindowType>(int(flags & Qt::WindowType_Mask));
-     NSInteger styleMask = NSBorderlessWindowMask;
-+
-+    // Patch: allow creating panels floating on all spaces in macOS.
-+    // If you call "setCollectionBehavior:NSWindowCollectionBehaviorFullScreenAuxiliary" before
-+    // setting the "NSNonactivatingPanelMask" bit in the style mask it won't work after that.
-+    // So we need a way to set that bit before Qt sets collection behavior the way it does.
-+    QVariant nonactivatingPanelMask = window()->property("_td_macNonactivatingPanelMask");
-+    if (nonactivatingPanelMask.isValid() && nonactivatingPanelMask.toBool()) {
-+        styleMask |= NSNonactivatingPanelMask;
-+    }
-+
-     if (flags & Qt::FramelessWindowHint)
-         return styleMask;
-     if ((type & Qt::Popup) == Qt::Popup) {
-@@ -914,6 +925,19 @@ void QCocoaWindow::setWindowFilePath(const QString &filePath)
-     [m_nsWindow setRepresentedFilename: fi.exists() ? QCFString::toNSString(filePath) : @""];
- }
- 
-+// Patch: Nice macOS window icon.
-+namespace {
-+
-+qreal getDevicePixelRatio() {
-+	qreal result = 1.0;
-+	foreach (QScreen *screen, QGuiApplication::screens()) {
-+		result = qMax(result, screen->devicePixelRatio());
-+	}
-+	return result;
-+}
-+
-+} // namespace
-+
- void QCocoaWindow::setWindowIcon(const QIcon &icon)
- {
-     QCocoaAutoReleasePool pool;
-@@ -929,7 +953,10 @@ void QCocoaWindow::setWindowIcon(const QIcon &icon)
-     if (icon.isNull()) {
-         [iconButton setImage:nil];
-     } else {
-        QPixmap pixmap = icon.pixmap(QSize(22, 22));
-+        // Patch: Nice macOS window icon.
-+        CGFloat hgt = 16. * getDevicePixelRatio();
-+        QPixmap pixmap = icon.pixmap(QSize(hgt, hgt));
-+
-         NSImage *image = static_cast<NSImage *>(qt_mac_create_nsimage(pixmap));
-         [iconButton setImage:image];
-         [image release];
-diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm
-index a18ee7ff71..1f91feb0ae 100644
--- a/src/plugins/platforms/cocoa/qnsview.mm
-+++ b/src/plugins/platforms/cocoa/qnsview.mm
-@@ -393,7 +393,9 @@ static NSString *_q_NSWindowDidChangeOcclusionStateNotification = nil;
-         [self notifyWindowStateChanged:newState];
-         // NSWindowDidOrderOnScreenAndFinishAnimatingNotification is private API, and not
-         // emitted in 10.6, so we bring back the old behavior for that case alone.
-        if (newState == Qt::WindowNoState && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6)
-+
-+        // Patch: Fix macOS window show after window was hidden.
-+        if (newState == Qt::WindowNoState/* && QSysInfo::QSysInfo::MacintoshVersion == QSysInfo::MV_10_6*/)
-             m_platformWindow->exposeWindow();
-     } else if ([notificationName isEqualToString: @"NSWindowDidOrderOffScreenNotification"]) {
-         m_platformWindow->obscureWindow();
-@@ -1300,7 +1302,9 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-         if (QSysInfo::QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
-             // On 10.8 and above, MayBegin is likely to happen.  We treat it the same as an actual begin.
-            if (phase == NSEventPhaseMayBegin)
-+
-+            // Patch: Actual begin should be treated as begin as well.
-+            if (phase == NSEventPhaseMayBegin || phase == NSEventPhaseBegan)
-                 ph = Qt::ScrollBegin;
-         } else
- #endif
-@@ -1366,14 +1370,22 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
-     quint32 nativeVirtualKey = [nsevent keyCode];
- 
-     QChar ch = QChar::ReplacementCharacter;
-    int keyCode = Qt::Key_unknown;
-    if ([characters length] != 0) {
-        if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
-            ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
-        else
-            ch = QChar([characters characterAtIndex:0]);
-        keyCode = [self convertKeyCode:ch];
-    }
-+
-+    // Patch: Backport a fix for layout-independent shortcuts.
-+    if ([characters length] != 0) // https://bugreports.qt.io/browse/QTBUG-42584
-+        ch = QChar([characters characterAtIndex:0]);
-+    else if ([charactersIgnoringModifiers length] != 0 && ((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)))
-+        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
-+
-+    int keyCode = [self convertKeyCode:ch];
-+    //int keyCode = Qt::Key_unknown;
-+    //if ([characters length] != 0) {
-+    //    if (((modifiers & Qt::MetaModifier) || (modifiers & Qt::AltModifier)) && ([charactersIgnoringModifiers length] != 0))
-+    //        ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
-+    //    else
-+    //        ch = QChar([characters characterAtIndex:0]);
-+    //    keyCode = [self convertKeyCode:ch];
-+    //}
- 
-     // we will send a key event unless the input method sets m_sendKeyEvent to false
-     m_sendKeyEvent = true;
-@@ -1437,6 +1449,11 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent)
-                 && qtKey == Qt::Key_Period) {
-             [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
-             return YES;
-+
-+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
-+        } else if ([nsevent modifierFlags] & NSControlKeyMask && (qtKey == Qt::Key_Tab || qtKey == Qt::Key_Backtab)) {
-+            [self handleKeyEvent:nsevent eventType:int(QEvent::KeyPress)];
-+            return YES;
-         }
-     }
-     return [super performKeyEquivalent:nsevent];
-diff --git a/src/tools/qlalr/lalr.cpp b/src/tools/qlalr/lalr.cpp
-index c68076477f..e2a7aafa58 100644
--- a/src/tools/qlalr/lalr.cpp
-+++ b/src/tools/qlalr/lalr.cpp
-@@ -246,11 +246,13 @@ void Grammar::buildExtendedGrammar ()
-   non_terminals.insert (accept_symbol);
- }
- 
-struct _Nullable: public std::unary_function<Name, bool>
-+// Patch: Fix building with the new SDK.
-+struct __Nullable: public std::unary_function<Name, bool>
- {
-   Automaton *_M_automaton;
- 
-  _Nullable (Automaton *aut):
-+  // Patch: Fix building with the new SDK.
-+  __Nullable (Automaton *aut):
-     _M_automaton (aut) {}
- 
-   bool operator () (Name name) const
-@@ -308,7 +310,8 @@ void Automaton::buildNullables ()
- 
-       for (RulePointer rule = _M_grammar->rules.begin (); rule != _M_grammar->rules.end (); ++rule)
-         {
-          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (_Nullable (this)));
-+          // Patch: Fix building with the new SDK.
-+          NameList::iterator nn = std::find_if (rule->rhs.begin (), rule->rhs.end (), std::not1 (__Nullable (this)));
- 
-           if (nn == rule->rhs.end ())
-             changed |= nullables.insert (rule->lhs).second;
-@@ -643,7 +646,8 @@ void Automaton::buildIncludesDigraph ()
-                   if (! _M_grammar->isNonTerminal (*A))
-                     continue;
- 
-                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (_Nullable (this)));
-+                  // Patch: Fix building with the new SDK.
-+                  NameList::iterator first_not_nullable = std::find_if (dot, rule->rhs.end (), std::not1 (__Nullable (this)));
-                   if (first_not_nullable != rule->rhs.end ())
-                     continue;
- 
-diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
-index 7396808442..7178aecf80 100644
--- a/src/widgets/kernel/qwidget.cpp
-+++ b/src/widgets/kernel/qwidget.cpp
-@@ -4722,6 +4722,17 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-         return; // Fully transparent.
- 
-     Q_D(QWidget);
-+
-+    // Patch: save and restore dirtyOpaqueChildren field.
-+    //
-+    // Just like in QWidget::grab() this field should be restored
-+    // after the d->render() call, because it will be set to 1 and
-+    // opaqueChildren field will be filled with empty region in
-+    // case the widget is hidden (because all the opaque children
-+    // will be skipped in isVisible() check).
-+    //
-+    const bool oldDirtyOpaqueChildren = d->dirtyOpaqueChildren;
-+
-     const bool inRenderWithPainter = d->extra && d->extra->inRenderWithPainter;
-     const QRegion toBePainted = !inRenderWithPainter ? d->prepareToRender(sourceRegion, renderFlags)
-                                                      : sourceRegion;
-@@ -4743,6 +4754,10 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-     if (!inRenderWithPainter && (opacity < 1.0 || (target->devType() == QInternal::Printer))) {
-         d->render_helper(painter, targetOffset, toBePainted, renderFlags);
-         d->extra->inRenderWithPainter = inRenderWithPainter;
-+
-+        // Patch: save and restore dirtyOpaqueChildren field.
-+        d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
-+
-         return;
-     }
- 
-@@ -4774,6 +4789,9 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset,
-     d->setSharedPainter(oldPainter);
- 
-     d->extra->inRenderWithPainter = inRenderWithPainter;
-+
-+    // Patch: save and restore dirtyOpaqueChildren field.
-+    d->dirtyOpaqueChildren = oldDirtyOpaqueChildren;
- }
- 
- static void sendResizeEvents(QWidget *target)
-@@ -7983,7 +8001,8 @@ bool QWidget::event(QEvent *event)
-     case QEvent::KeyPress: {
-         QKeyEvent *k = (QKeyEvent *)event;
-         bool res = false;
-        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) {  //### Add MetaModifier?
-+        // Patch: Allow us to handle Ctrl+Tab and Ctrl+Backtab in the app.
-+        if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier | Qt::MetaModifier))) {  //### Add MetaModifier?
-             if (k->key() == Qt::Key_Backtab
-                 || (k->key() == Qt::Key_Tab && (k->modifiers() & Qt::ShiftModifier)))
-                 res = focusNextPrevChild(false);
-diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm
-index 0845a5eb02..5735cb6b39 100644
--- a/src/widgets/styles/qmacstyle_mac.mm
-+++ b/src/widgets/styles/qmacstyle_mac.mm
-@@ -3667,9 +3667,11 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
- 
-                 NSBezierPath *pushButtonFocusRingPath;
-                 if (bdi.kind == kThemeBevelButton)
-                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:focusRect];
-+                    // Patch: Fix building with the new SDK.
-+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRect:NSRectFromCGRect(focusRect)];
-                 else
-                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:focusRect xRadius:4 yRadius:4];
-+                    // Patch: Fix building with the new SDK.
-+                    pushButtonFocusRingPath = [NSBezierPath bezierPathWithRoundedRect:NSRectFromCGRect(focusRect) xRadius:4 yRadius:4];
-                 qt_drawFocusRingOnPath(cg, pushButtonFocusRingPath);
-             }
- 
-diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
-index f98aeaf678..00c0734129 100644
--- a/src/widgets/util/qsystemtrayicon_qpa.cpp
-+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
-@@ -99,13 +99,18 @@ void QSystemTrayIconPrivate::updateIcon_sys()
- 
- void QSystemTrayIconPrivate::updateMenu_sys()
- {
-    if (qpa_sys && menu) {
-        if (!menu->platformMenu()) {
-            QPlatformMenu *platformMenu = qpa_sys->createMenu();
-            if (platformMenu)
-                menu->setPlatformMenu(platformMenu);
-+    // Patch: Nice macOS tray icon support.
-+    if (qpa_sys) {
-+        if (menu) {
-+            if (!menu->platformMenu()) {
-+                QPlatformMenu *platformMenu = qpa_sys->createMenu();
-+                if (platformMenu)
-+                    menu->setPlatformMenu(platformMenu);
-+            }
-+            qpa_sys->updateMenu(menu->platformMenu());
-+        } else {
-+            qpa_sys->updateMenu(0);
-         }
-        qpa_sys->updateMenu(menu->platformMenu());
-     }
- }
- 
-diff --git a/src/widgets/widgets/qwidgetlinecontrol.cpp b/src/widgets/widgets/qwidgetlinecontrol.cpp
-index 75f30599be..980f2be1e9 100644
--- a/src/widgets/widgets/qwidgetlinecontrol.cpp
-+++ b/src/widgets/widgets/qwidgetlinecontrol.cpp
-@@ -1867,7 +1867,8 @@ void QWidgetLineControl::processKeyEvent(QKeyEvent* event)
- 
-     if (unknown && !isReadOnly()) {
-         QString t = event->text();
-        if (!t.isEmpty() && t.at(0).isPrint()) {
-+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
-+        if (!t.isEmpty() && (t.at(0).isPrint() || t.at(0).unicode() == 0x200C || t.at(0).unicode() == 0x200D)) {
-             insert(t);
- #ifndef QT_NO_COMPLETER
-             complete(event->key());
-diff --git a/src/widgets/widgets/qwidgettextcontrol.cpp b/src/widgets/widgets/qwidgettextcontrol.cpp
-index 96438a0bdf..b0b7206405 100644
--- a/src/widgets/widgets/qwidgettextcontrol.cpp
-+++ b/src/widgets/widgets/qwidgettextcontrol.cpp
-@@ -1342,7 +1342,8 @@ void QWidgetTextControlPrivate::keyPressEvent(QKeyEvent *e)
- process:
-     {
-         QString text = e->text();
-        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t'))) {
-+        // Patch: Enable ZWJ and ZWNJ characters to be in text input.
-+        if (!text.isEmpty() && (text.at(0).isPrint() || text.at(0) == QLatin1Char('\t') || text.at(0).unicode() == 0x200C || text.at(0).unicode() == 0x200D)) {
-             if (overwriteMode
-                 // no need to call deleteChar() if we have a selection, insertText
-                 // does it already
--- a/Telegram/Patches/macold/qtimageformats_5_3_2.diff
+++ b/Telegram/Patches/macold/qtimageformats_5_3_2.diff
@@ -1,47 +0,0 @@
-diff --git a/src/3rdparty/libwebp/src/dec/vp8l.c b/src/3rdparty/libwebp/src/dec/vp8l.c
-index ea0254d..953ff01 100644
--- a/src/3rdparty/libwebp/src/dec/vp8l.c
-+++ b/src/3rdparty/libwebp/src/dec/vp8l.c
-@@ -12,7 +12,7 @@
- // Authors: Vikas Arora (vikaas.arora@gmail.com)
- //          Jyrki Alakuijala (jyrki@google.com)
- 
-#include <stdio.h>
-+// Patch: Backport of a crash fix.
- #include <stdlib.h>
- #include "./alphai.h"
- #include "./vp8li.h"
-@@ -740,6 +740,10 @@ static int DecodeAlphaData(VP8LDecoder* const dec, uint8_t* const data,
-   const int len_code_limit = NUM_LITERAL_CODES + NUM_LENGTH_CODES;
-   const int mask = hdr->huffman_mask_;
-   assert(htree_group != NULL);
-+
-+  // Patch: Backport of a crash fix.
-+  assert(pos < end);
-+
-   assert(last_row <= height);
-   assert(Is8bOptimizable(hdr));
- 
-@@ -830,6 +834,10 @@ static int DecodeImageData(VP8LDecoder* const dec, uint32_t* const data,
-       (hdr->color_cache_size_ > 0) ? &hdr->color_cache_ : NULL;
-   const int mask = hdr->huffman_mask_;
-   assert(htree_group != NULL);
-+
-+  // Patch: Backport of a crash fix.
-+  assert(src < src_end);
-+
-   assert(src_last <= src_end);
- 
-   while (!br->eos_ && src < src_last) {
-@@ -1294,6 +1302,11 @@ int VP8LDecodeAlphaImageStream(ALPHDecoder* const alph_dec, int last_row) {
-   assert(dec->action_ == READ_DATA);
-   assert(last_row <= dec->height_);
- 
-+  // Patch: Backport of a crash fix.
-+  if (dec->last_pixel_ == dec->width_ * dec->height_) {
-+    return 1; // done
-+  }
-+
-   // Decode (with special row processing).
-   return alph_dec->use_8b_decode ?
-       DecodeAlphaData(dec, (uint8_t*)dec->pixels_, dec->width_, dec->height_,
--- a/Telegram/Patches/mini_chromium.diff
+++ b/Telegram/Patches/mini_chromium.diff
@@ -1,52 +0,0 @@
-diff --git a/base/mac/scoped_nsobject.h b/base/mac/scoped_nsobject.h
-index 2e157a4..5a306a1 100644
--- a/base/mac/scoped_nsobject.h
-+++ b/base/mac/scoped_nsobject.h
-@@ -11,6 +11,7 @@
- 
- #include "base/compiler_specific.h"
- #include "base/mac/scoped_typeref.h"
-+#include "base/template_util.h"
- 
- namespace base {
- 
-@@ -55,7 +56,7 @@ class scoped_nsobject : public scoped_nsprotocol<NST*> {
-  public:
-   using scoped_nsprotocol<NST*>::scoped_nsprotocol;
- 
-  static_assert(std::is_same<NST, NSAutoreleasePool>::value == false,
-+  static_assert(is_same<NST, NSAutoreleasePool>::value == false,
-                 "Use ScopedNSAutoreleasePool instead");
- };
- 
-diff --git a/base/macros.h b/base/macros.h
-index 5d96783..096704c 100644
--- a/base/macros.h
-+++ b/base/macros.h
-@@ -42,8 +42,9 @@ char (&ArraySizeHelper(const T (&array)[N]))[N];
- 
- template <typename Dest, typename Source>
- inline Dest bit_cast(const Source& source) {
-+#if __cplusplus >= 201103L
-   static_assert(sizeof(Dest) == sizeof(Source), "sizes must be equal");
-
-+#endif
-   Dest dest;
-   memcpy(&dest, &source, sizeof(dest));
-   return dest;
-diff --git a/build/common.gypi b/build/common.gypi
-index 1affc70..6e8f292 100644
--- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -66,6 +66,11 @@
-           'conditions': [
-             ['clang!=0', {
-               'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',  # -std=c++11
-+              'conditions': [
-+                ['mac_deployment_target=="10.8"', {
-+                  'CLANG_CXX_LIBRARY': 'libc++',  # force -stdlib=libc++ for 10.8
-+                }]
-+              ],
- 
-               # Don't link in libarclite_macosx.a, see http://crbug.com/156530.
-               'CLANG_LINK_OBJC_RUNTIME': 'NO',      # -fno-objc-link-runtime
--- a/Telegram/Patches/openal.diff
+++ b/Telegram/Patches/openal.diff
@@ -1,22 +0,0 @@
-diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
-index 9d8f8e9..8c8e44a 100644
--- a/Alc/backends/winmm.c
-+++ b/Alc/backends/winmm.c
-@@ -219,7 +219,7 @@ FORCE_ALIGN static int ALCwinmmPlayback_mixerProc(void *arg)
-     SetRTPriority();
-     althrd_setname(althrd_current(), MIXER_THREAD_NAME);
- 
-    while(GetMessage(&msg, NULL, 0, 0))
-+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
-     {
-         if(msg.message != WOM_DONE)
-             continue;
-@@ -504,7 +504,7 @@ static int ALCwinmmCapture_captureProc(void *arg)
- 
-     althrd_setname(althrd_current(), RECORD_THREAD_NAME);
- 
-    while(GetMessage(&msg, NULL, 0, 0))
-+    if (!self->killNow) while(GetMessage(&msg, NULL, 0, 0))
-     {
-         if(msg.message != WIM_DATA)
-             continue;
--- a/Telegram/Patches/qtbase_5_6_2.diff
+++ b/Telegram/Patches/qtbase_5_6_2.diff
--- a/Telegram/Resources/art/background.jpg
+++ b/Telegram/Resources/art/background.jpg
--- a/Telegram/Resources/art/bg.jpg
+++ b/Telegram/Resources/art/bg.jpg
--- a/Telegram/Resources/art/favicon.ico
+++ b/Telegram/Resources/art/favicon.ico
--- a/Telegram/Resources/art/icon128.png
+++ b/Telegram/Resources/art/icon128.png
--- a/Telegram/Resources/art/icon128@2x.png
+++ b/Telegram/Resources/art/icon128@2x.png
--- a/Telegram/Resources/art/icon16.png
+++ b/Telegram/Resources/art/icon16.png
--- a/Telegram/Resources/art/icon16@2x.png
+++ b/Telegram/Resources/art/icon16@2x.png
--- a/Telegram/Resources/art/icon256.ico
+++ b/Telegram/Resources/art/icon256.ico
--- a/Telegram/Resources/art/icon256.png
+++ b/Telegram/Resources/art/icon256.png
--- a/Telegram/Resources/art/icon256@2x.png
+++ b/Telegram/Resources/art/icon256@2x.png
--- a/Telegram/Resources/art/icon32.png
+++ b/Telegram/Resources/art/icon32.png
--- a/Telegram/Resources/art/icon32@2x.png
+++ b/Telegram/Resources/art/icon32@2x.png
--- a/Telegram/Resources/art/icon48.png
+++ b/Telegram/Resources/art/icon48.png
--- a/Telegram/Resources/art/icon48@2x.png
+++ b/Telegram/Resources/art/icon48@2x.png
--- a/Telegram/Resources/art/icon512.png
+++ b/Telegram/Resources/art/icon512.png
--- a/Telegram/Resources/art/icon512@2x.png
+++ b/Telegram/Resources/art/icon512@2x.png
--- a/Telegram/Resources/art/icon64.png
+++ b/Telegram/Resources/art/icon64.png
--- a/Telegram/Resources/art/icon64@2x.png
+++ b/Telegram/Resources/art/icon64@2x.png
--- a/Telegram/Resources/art/icon_green.png
+++ b/Telegram/Resources/art/icon_green.png
--- a/Telegram/Resources/art/iconbig_green.png
+++ b/Telegram/Resources/art/iconbig_green.png
--- a/Telegram/Resources/art/logo_256.png
+++ b/Telegram/Resources/art/logo_256.png
--- a/Telegram/Resources/art/logo_256_no_margin.png
+++ b/Telegram/Resources/art/logo_256_no_margin.png
--- a/Telegram/Resources/icons/calls/video_mini_invited.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited.png
--- a/Telegram/Resources/icons/calls/video_mini_invited@2x.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited@2x.png
--- a/Telegram/Resources/icons/calls/video_mini_invited@3x.png
+++ b/Telegram/Resources/icons/calls/video_mini_invited@3x.png
--- a/Telegram/Resources/icons/chat/input_autodelete_30d.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d.png
--- a/Telegram/Resources/icons/chat/input_autodelete_30d@2x.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d@2x.png
--- a/Telegram/Resources/icons/chat/input_autodelete_30d@3x.png
+++ b/Telegram/Resources/icons/chat/input_autodelete_30d@3x.png
--- a/Telegram/Resources/icons/info_media_gif.png
+++ b/Telegram/Resources/icons/info_media_gif.png
--- a/Telegram/Resources/icons/info_media_gif@2x.png
+++ b/Telegram/Resources/icons/info_media_gif@2x.png
--- a/Telegram/Resources/icons/info_media_gif@3x.png
+++ b/Telegram/Resources/icons/info_media_gif@3x.png
--- a/Telegram/Resources/langs/download.sh
+++ b/Telegram/Resources/langs/download.sh
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-FullExecPath=$PWD
-pushd `dirname $0` > /dev/null
-FullScriptPath=`pwd`
-popd > /dev/null
-
-if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
-  echo ""
-  echo "This script is for building the production version of Telegram Desktop."
-  echo ""
-  echo "For building custom versions please visit the build instructions page at:"
-  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
-  exit
-fi
-
-Error () {
-  cd $FullExecPath
-  echo "$1"
-  exit 1
-}
-
-cd $FullScriptPath/../../../../
-while IFS='' read -r line || [[ -n "$line" ]]; do
-  tx pull -f -l $line --minimum-perc=100
-done < tdesktop/Telegram/Resources/langs/list
-cd translations/telegram-desktop.langstrings/
-for file in *.strings; do
-  iconv -f "UTF-16LE" -t "UTF-8" "$file" > "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp"
-  awk '{ if (NR==1) sub(/^\xef\xbb\xbf/,""); sub(/
-/,""); print }' "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp" > "../../tdesktop/Telegram/Resources/langs/lang_$file"
-  rm "../../tdesktop/Telegram/Resources/langs/lang_$file.tmp"
-done
-
--- a/Telegram/Resources/langs/lang.strings
+++ b/Telegram/Resources/langs/lang.strings
@@ -82,6 +82,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 "lng_box_ok" = "OK";
 "lng_box_done" = "Done";
+"lng_box_yes" = "Yes";
+"lng_box_no" = "No";

 "lng_cancel" = "Cancel";
 "lng_continue" = "Continue";
@@ -596,6 +598,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_remove" = "Remove cloud password";
 "lng_cloud_password_set" = "Enable two-step verification";
 "lng_cloud_password_edit" = "Change cloud password";
+"lng_cloud_password_reset_in" = "Reset password in";
+"lng_cloud_password_reset_ready" = "Reset password";
+"lng_cloud_password_reset_cancel" = "Cancel password reset";
 "lng_cloud_password_enter_old" = "Enter current password";
 "lng_cloud_password_enter_first" = "Enter a password";
 "lng_cloud_password_enter_new" = "Enter new password";
@@ -618,6 +623,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_cloud_password_passport_losing" = "Warning! All data saved in your Telegram Passport will be lost!";
 "lng_cloud_password_resend" = "Resend code";
 "lng_cloud_password_resent" = "Code was resent.";
+"lng_cloud_password_reset_title" = "Reset password";
+"lng_cloud_password_reset_no_email" = "Since you didn't provide a recovery email when setting up your password, your remaining options are either to remember your password or wait 7 days until your password is reset.";
+"lng_cloud_password_reset_with_email" = "If you don't have access to your recovery email, your remaining options are either to remember your password or wait 7 days until your password resets.";
+"lng_cloud_password_reset_ok" = "Reset";
+"lng_cloud_password_reset_cancel_title" = "Cancel reset";
+"lng_cloud_password_reset_cancel_sure" = "Cancel the password reset process? If you request a new reset later, it will take another 7 days.";
+"lng_cloud_password_reset_later" = "You recently requested a password reset that was cancelled. Please wait {duration} before making a new request.";

 "lng_connection_auto_connecting" = "Default (connecting...)";
 "lng_connection_auto" = "Default ({transport} used)";
@@ -862,6 +874,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_photos#one" = "{count} photo";
 "lng_profile_photos#other" = "{count} photos";
 "lng_profile_photos_header" = "Photos";
+"lng_profile_gifs#one" = "{count} GIF";
+"lng_profile_gifs#other" = "{count} GIFs";
+"lng_profile_gifs_header" = "GIFs";
 "lng_profile_videos#one" = "{count} video";
 "lng_profile_videos#other" = "{count} videos";
 "lng_profile_videos_header" = "Videos";
@@ -904,6 +919,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_info_add_as_contact" = "Add to contacts";
 "lng_profile_shared_media" = "Shared media";
 "lng_media_type_photos" = "Photos";
+"lng_media_type_gifs" = "GIFs";
 "lng_media_type_videos" = "Videos";
 "lng_media_type_songs" = "Audio files";
 "lng_media_type_files" = "Files";
@@ -923,6 +939,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_profile_export_channel" = "Export channel history";
 "lng_media_selected_photo#one" = "{count} Photo";
 "lng_media_selected_photo#other" = "{count} Photos";
+"lng_media_selected_gif#one" = "{count} GIF";
+"lng_media_selected_gif#other" = "{count} GIFs";
 "lng_media_selected_video#one" = "{count} Video";
 "lng_media_selected_video#other" = "{count} Videos";
 "lng_media_selected_song#one" = "{count} Audio file";
@@ -936,6 +954,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_media_selected_link#one" = "{count} Shared link";
 "lng_media_selected_link#other" = "{count} Shared links";
 "lng_media_photo_empty" = "No photos here yet";
+"lng_media_gif_empty" = "No GIFs here yet";
 "lng_media_video_empty" = "No videos here yet";
 "lng_media_song_empty" = "No music files here yet";
 "lng_media_file_empty" = "No files here yet";
@@ -998,8 +1017,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 "lng_manage_messages_ttl_title" = "Auto-delete messages";
 "lng_manage_messages_ttl_never" = "Off";
-"lng_manage_messages_ttl_after1" = "24 hours";
-"lng_manage_messages_ttl_after2" = "7 days";
+"lng_manage_messages_ttl_after1" = "1 day";
+"lng_manage_messages_ttl_after2" = "1 week";
+"lng_manage_messages_ttl_after3" = "1 month";

 "lng_ttl_edit_about" = "Automatically delete new messages after a certain period of time for you and {user}.";
 "lng_ttl_edit_about_group" = "Automatically delete new messages sent in this chat after a certain period of time.";
@@ -1008,8 +1028,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_ttl_about_tooltip" = "New messages in this chat will be automatically deleted in {duration}.";
 "lng_ttl_about_tooltip_channel" = "New messages in this chat will be automatically deleted in {duration}.";
 "lng_ttl_about_tooltip_off" = "Auto-delete is now disabled.";
-"lng_ttl_about_duration1" = "24 hours";
-"lng_ttl_about_duration2" = "7 days";
+"lng_ttl_about_duration1" = "1 day";
+"lng_ttl_about_duration2" = "1 week";
+"lng_ttl_about_duration3" = "1 month";

 "lng_report_title" = "Report channel";
 "lng_report_group_title" = "Report group";
@@ -1494,6 +1515,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_saved_forward_here" = "Forward messages here for quick access";

 "lng_scheduled_messages" = "Scheduled Messages";
+"lng_scheduled_messages_empty" = "No scheduled messages here yet...";
 "lng_reminder_messages" = "Reminders";
 "lng_scheduled_date" = "Scheduled for {date}";
 "lng_scheduled_date_until_online" = "Scheduled until online";
@@ -2001,6 +2023,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 "lng_call_start_video" = "Start Video";
 "lng_call_stop_video" = "Stop Video";
+"lng_call_screencast" = "Screencast";
 "lng_call_end_call" = "End Call";
 "lng_call_mute_audio" = "Mute";
 "lng_call_unmute_audio" = "Unmute";
@@ -2080,6 +2103,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_noise_suppression" = "Enable Noise Suppression";
 "lng_group_call_limit#one" = "Video is only available\nfor the first {count} member";
 "lng_group_call_limit#other" = "Video is only available\nfor the first {count} members";
+"lng_group_call_over_limit#one" = "The voice chat is over {count} member.\nNew participants only have access to audio stream.";
+"lng_group_call_over_limit#other" = "The voice chat is over {count} members.\nNew participants only have access to audio stream.";
 "lng_group_call_video_paused" = "Video is paused";
 "lng_group_call_share_speaker" = "Users with this link can speak";
 "lng_group_call_copy_speaker_link" = "Copy Speaker Link";
--- a/Telegram/Resources/langs/list
+++ b/Telegram/Resources/langs/list
@@ -1 +0,0 @@
-de,es,it,ko,nl,pt_BR
--- a/Telegram/Resources/langs/upload.sh
+++ b/Telegram/Resources/langs/upload.sh
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-set -e
-FullExecPath=$PWD
-pushd `dirname $0` > /dev/null
-FullScriptPath=`pwd`
-popd > /dev/null
-
-if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then
-  echo ""
-  echo "This script is for building the production version of Telegram Desktop."
-  echo ""
-  echo "For building custom versions please visit the build instructions page at:"
-  echo "https://github.com/telegramdesktop/tdesktop/#build-instructions"
-  exit
-fi
-
-Error () {
-  cd $FullExecPath
-  echo "$1"
-  exit 1
-}
-
-cd $FullScriptPath/../../../../
-while IFS='' read -r line || [[ -n "$line" ]]; do
-  tx pull -f -l $line
-done < tdesktop/Telegram/Resources/langs/list
-tx push -s
-
-cd $FullExecPath
--- a/Telegram/Resources/qrc/telegram/telegram.qrc
+++ b/Telegram/Resources/qrc/telegram/telegram.qrc
@@ -42,7 +42,7 @@
    <file alias="js/script.js">../../export_html/js/script.js</file>
  </qresource>
  <qresource prefix="/gui">
-    <file alias="art/bg.jpg">../../art/bg.jpg</file>
+    <file alias="art/background.jpg">../../art/background.jpg</file>
    <file alias="art/bg_initial.jpg">../../art/bg_initial.jpg</file>
    <file alias="art/logo_256.png">../../art/logo_256.png</file>
    <file alias="art/logo_256_no_margin.png">../../art/logo_256_no_margin.png</file>
--- a/Telegram/Resources/uwp/AppX/AppxManifest.xml
+++ b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
  <Identity Name="TelegramMessengerLLP.TelegramDesktop"
    ProcessorArchitecture="ARCHITECTURE"
    Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="2.8.8.0" />
+    Version="2.9.0.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 2,8,8,0
- PRODUCTVERSION 2,8,8,0
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -62,10 +62,10 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "Telegram FZ-LLC"
            VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "2.8.8.0"
+            VALUE "FileVersion", "2.9.0.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.8.0"
+            VALUE "ProductVersion", "2.9.0.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 2,8,8,0
- PRODUCTVERSION 2,8,8,0
+ FILEVERSION 2,9,0,0
+ PRODUCTVERSION 2,9,0,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", "2.8.8.0"
+            VALUE "FileVersion", "2.9.0.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.8.0"
+            VALUE "ProductVersion", "2.9.0.0"
        END
    END
    BLOCK "VarFileInfo"
--- a/Telegram/SourceFiles/_other/packer.cpp
+++ b/Telegram/SourceFiles/_other/packer.cpp
@@ -160,8 +160,7 @@ int main(int argc, char *argv[])

 	QString remove;
 	int version = 0;
-	bool targetosx = false;
-	bool targetwin64 = false;
+	[[maybe_unused]] bool targetwin64 = false;
 	QFileInfoList files;
 	for (int i = 0; i < argc; ++i) {
 		if (string("-path") == argv[i] && i + 1 < argc) {
@@ -170,7 +169,6 @@ int main(int argc, char *argv[])
 			files.push_back(info);
 			if (remove.isEmpty()) remove = info.canonicalPath() + "/";
 		} else if (string("-target") == argv[i] && i + 1 < argc) {
-			targetosx = (string("osx") == argv[i + 1]);
 			targetwin64 = (string("win64") == argv[i + 1]);
 		} else if (string("-version") == argv[i] && i + 1 < argc) {
 			version = QString(argv[i + 1]).toInt();
@@ -496,7 +494,7 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_WIN
 	QString outName((targetwin64 ? QString("tx64upd%1") : QString("tupdate%1")).arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_MAC
-	QString outName((targetosx ? QString("tosxupd%1") : QString("tmacupd%1")).arg(AlphaVersion ? AlphaVersion : version));
+	QString outName(QString("tmacupd%1").arg(AlphaVersion ? AlphaVersion : version));
 #elif defined Q_OS_UNIX
 #ifndef _LP64
 	QString outName(QString("tlinux32upd%1").arg(AlphaVersion ? AlphaVersion : version));
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -40,22 +40,22 @@ namespace {
 void InnerFillMessagePostFlags(
 		const Api::SendOptions &options,
 		not_null<PeerData*> peer,
-		MTPDmessage::Flags &flags) {
+		MessageFlags &flags) {
 	const auto anonymousPost = peer->amAnonymous();
 	if (!anonymousPost) {
-		flags |= MTPDmessage::Flag::f_from_id;
+		flags |= MessageFlag::HasFromId;
 		return;
 	} else if (peer->asMegagroup()) {
 		return;
 	}
-	flags |= MTPDmessage::Flag::f_post;
+	flags |= MessageFlag::Post;
 	// Don't display views and author of a new post when it's scheduled.
 	if (options.scheduled) {
 		return;
 	}
-	flags |= MTPDmessage::Flag::f_views;
+	flags |= MessageFlag::HasViews;
 	if (peer->asChannel()->addsSignature()) {
-		flags |= MTPDmessage::Flag::f_post_author;
+		flags |= MessageFlag::HasPostAuthor;
 	}
 }

@@ -79,11 +79,10 @@ void SendExistingMedia(
 		session->data().nextLocalMessageId());
 	const auto randomId = openssl::RandomValue<uint64>();

-	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
-	auto clientFlags = NewMessageClientFlags();
+	auto flags = NewMessageFlags(peer);
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to;
+		flags |= MessageFlag::HasReplyInfo;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
 	const auto anonymousPost = peer->amAnonymous();
@@ -111,19 +110,19 @@ void SendExistingMedia(
 	const auto captionText = caption.text;

 	if (message.action.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}

 	session->data().registerMessageRandomId(randomId, newId);

+	const auto viaBotId = UserId();
 	history->addNewLocalMessage(
 		newId.msg,
 		flags,
-		clientFlags,
-		0,
+		viaBotId,
 		replyTo,
 		HistoryItem::NewMessageDate(message.action.options.scheduled),
 		messageFromId,
@@ -253,11 +252,10 @@ bool SendDice(Api::MessageToSend &message) {
 	const auto randomId = openssl::RandomValue<uint64>();

 	auto &histories = history->owner().histories();
-	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
-	auto clientFlags = NewMessageClientFlags();
+	auto flags = NewMessageFlags(peer);
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
 	if (message.action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to;
+		flags |= MessageFlag::HasReplyInfo;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
 	const auto replyHeader = NewMessageReplyHeader(message.action);
@@ -272,42 +270,26 @@ bool SendDice(Api::MessageToSend &message) {
 	const auto replyTo = message.action.replyTo;

 	if (message.action.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_schedule_date;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}

 	session->data().registerMessageRandomId(randomId, newId);

-	const auto views = 1;
-	const auto forwards = 0;
-	history->addNewMessage(
-		MTP_message(
-			MTP_flags(flags),
-			MTP_int(newId.msg),
-			peerToMTP(messageFromId),
-			peerToMTP(history->peer->id),
-			MTPMessageFwdHeader(),
-			MTPint(), // via_bot_id
-			replyHeader,
-			MTP_int(HistoryItem::NewMessageDate(
-				message.action.options.scheduled)),
-			MTP_string(),
-			MTP_messageMediaDice(MTP_int(0), MTP_string(emoji)),
-			MTPReplyMarkup(),
-			MTP_vector<MTPMessageEntity>(),
-			MTP_int(views),
-			MTP_int(forwards),
-			MTPMessageReplies(),
-			MTPint(), // edit_date
-			MTP_string(messagePostAuthor),
-			MTPlong(),
-			//MTPMessageReactions(),
-			MTPVector<MTPRestrictionReason>(),
-			MTPint()), // ttl_period
-		clientFlags,
-		NewMessageType::Unread);
+	const auto viaBotId = UserId();
+	history->addNewLocalMessage(
+		newId.msg,
+		flags,
+		viaBotId,
+		message.action.replyTo,
+		HistoryItem::NewMessageDate(message.action.options.scheduled),
+		messageFromId,
+		messagePostAuthor,
+		TextWithEntities(),
+		MTP_messageMediaDice(MTP_int(0), MTP_string(emoji)),
+		MTPReplyMarkup());

 	const auto requestType = Data::Histories::RequestType::Send;
 	histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
@@ -338,14 +320,15 @@ bool SendDice(Api::MessageToSend &message) {
 void FillMessagePostFlags(
 		const Api::SendAction &action,
 		not_null<PeerData*> peer,
-		MTPDmessage::Flags &flags) {
+		MessageFlags &flags) {
 	InnerFillMessagePostFlags(action.options, peer, flags);
 }

 void SendConfirmedFile(
 		not_null<Main::Session*> session,
 		const std::shared_ptr<FileLoadResult> &file) {
-	const auto isEditing = file->to.replaceMediaOf != 0;
+	const auto isEditing = (file->type != SendMediaType::Audio)
+		&& (file->to.replaceMediaOf != 0);
 	const auto channelId = peerToChannel(file->to.peer);

 	const auto newId = FullMsgId(
@@ -396,29 +379,24 @@ void SendConfirmedFile(
 		}
 	}

-	auto flags = (isEditing ? MTPDmessage::Flags() : NewMessageFlags(peer))
-		| MTPDmessage::Flag::f_entities
-		| MTPDmessage::Flag::f_media;
-	auto clientFlags = NewMessageClientFlags();
+	auto flags = isEditing ? MessageFlags() : NewMessageFlags(peer);
 	if (file->to.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to;
+		flags |= MessageFlag::HasReplyInfo;
 	}
 	const auto replyHeader = NewMessageReplyHeader(action);
 	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = ShouldSendSilent(peer, file->to.options);
-	Api::FillMessagePostFlags(action, peer, flags);
+	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
-		flags |= MTPDmessage::Flag::f_silent;
-	}
-	if (groupId) {
-		flags |= MTPDmessage::Flag::f_grouped_id;
+		flags |= MessageFlag::Silent;
 	}
 	if (file->to.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
+
 		// Scheduled messages have no the 'edited' badge.
-		flags |= MTPDmessage::Flag::f_edit_hide;
+		flags |= MessageFlag::HideEdited;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}

 	const auto messageFromId = anonymousPost ? 0 : session->userPeerId();
@@ -426,17 +404,37 @@ void SendConfirmedFile(
 		? session->user()->name
 		: QString();

-	const auto views = 1;
-	const auto forwards = 0;
-	if (file->type == SendMediaType::Photo) {
-		const auto photoFlags = MTPDmessageMediaPhoto::Flag::f_photo | 0;
-		const auto photo = MTP_messageMediaPhoto(
-			MTP_flags(photoFlags),
-			file->photo,
-			MTPint());
+	const auto media = [&] {
+		if (file->type == SendMediaType::Photo) {
+			return MTP_messageMediaPhoto(
+				MTP_flags(MTPDmessageMediaPhoto::Flag::f_photo),
+				file->photo,
+				MTPint());
+		} else if (file->type == SendMediaType::File) {
+			return MTP_messageMediaDocument(
+				MTP_flags(MTPDmessageMediaDocument::Flag::f_document),
+				file->document,
+				MTPint());
+		} else if (file->type == SendMediaType::Audio) {
+			return MTP_messageMediaDocument(
+				MTP_flags(MTPDmessageMediaDocument::Flag::f_document),
+				file->document,
+				MTPint());
+		} else {
+			Unexpected("Type in sendFilesConfirmed.");
+		}
+	}();

-		const auto mtpMessage = MTP_message(
-			MTP_flags(flags),
+	if (itemToEdit) {
+		itemToEdit->savePreviousMedia();
+		itemToEdit->applyEdition(MTP_message(
+			MTP_flags(MTPDmessage::Flag::f_media
+				| ((flags & MessageFlag::HideEdited)
+					? MTPDmessage::Flag::f_edit_hide
+					: MTPDmessage::Flag())
+				| (localEntities.v.isEmpty()
+					? MTPDmessage::Flag()
+					: MTPDmessage::Flag::f_entities)),
 			MTP_int(newId.msg),
 			peerToMTP(messageFromId),
 			peerToMTP(file->to.peer),
@@ -445,105 +443,32 @@ void SendConfirmedFile(
 			replyHeader,
 			MTP_int(HistoryItem::NewMessageDate(file->to.options.scheduled)),
 			MTP_string(caption.text),
-			photo,
+			media,
 			MTPReplyMarkup(),
 			localEntities,
-			MTP_int(views),
-			MTP_int(forwards),
+			MTPint(), // views
+			MTPint(), // forwards
 			MTPMessageReplies(),
 			MTPint(), // edit_date
 			MTP_string(messagePostAuthor),
 			MTP_long(groupId),
 			//MTPMessageReactions(),
 			MTPVector<MTPRestrictionReason>(),
-			MTPint()); // ttl_period
-
-		if (itemToEdit) {
-			itemToEdit->savePreviousMedia();
-			itemToEdit->applyEdition(mtpMessage.c_message());
-		} else {
-			history->addNewMessage(
-				mtpMessage,
-				clientFlags,
-				NewMessageType::Unread);
-		}
-	} else if (file->type == SendMediaType::File) {
-		const auto documentFlags = MTPDmessageMediaDocument::Flag::f_document | 0;
-		const auto document = MTP_messageMediaDocument(
-			MTP_flags(documentFlags),
-			file->document,
-			MTPint());
-
-		const auto mtpMessage = MTP_message(
-			MTP_flags(flags),
-			MTP_int(newId.msg),
-			peerToMTP(messageFromId),
-			peerToMTP(file->to.peer),
-			MTPMessageFwdHeader(),
-			MTPint(),
-			replyHeader,
-			MTP_int(HistoryItem::NewMessageDate(file->to.options.scheduled)),
-			MTP_string(caption.text),
-			document,
-			MTPReplyMarkup(),
-			localEntities,
-			MTP_int(views),
-			MTP_int(forwards),
-			MTPMessageReplies(),
-			MTPint(), // edit_date
-			MTP_string(messagePostAuthor),
-			MTP_long(groupId),
-			//MTPMessageReactions(),
-			MTPVector<MTPRestrictionReason>(),
-			MTPint()); // ttl_period
-
-		if (itemToEdit) {
-			itemToEdit->savePreviousMedia();
-			itemToEdit->applyEdition(mtpMessage.c_message());
-		} else {
-			history->addNewMessage(
-				mtpMessage,
-				clientFlags,
-				NewMessageType::Unread);
-		}
-	} else if (file->type == SendMediaType::Audio) {
-		if (!peer->isChannel() || peer->isMegagroup()) {
-			flags |= MTPDmessage::Flag::f_media_unread;
-		}
-		const auto documentFlags = MTPDmessageMediaDocument::Flag::f_document | 0;
-		const auto document = MTP_messageMediaDocument(
-			MTP_flags(documentFlags),
-			file->document,
-			MTPint());
-		history->addNewMessage(
-			MTP_message(
-				MTP_flags(flags),
-				MTP_int(newId.msg),
-				peerToMTP(messageFromId),
-				peerToMTP(file->to.peer),
-				MTPMessageFwdHeader(),
-				MTPint(),
-				replyHeader,
-				MTP_int(
-					HistoryItem::NewMessageDate(file->to.options.scheduled)),
-				MTP_string(caption.text),
-				document,
-				MTPReplyMarkup(),
-				localEntities,
-				MTP_int(views),
-				MTP_int(forwards),
-				MTPMessageReplies(),
-				MTPint(), // edit_date
-				MTP_string(messagePostAuthor),
-				MTP_long(groupId),
-				//MTPMessageReactions(),
-				MTPVector<MTPRestrictionReason>(),
-				MTPint()), // ttl_period
-			clientFlags,
-			NewMessageType::Unread);
-		// Voices can't be edited.
+			MTPint()).c_message());
 	} else {
-		Unexpected("Type in sendFilesConfirmed.");
+		const auto viaBotId = UserId();
+		history->addNewLocalMessage(
+			newId.msg,
+			flags,
+			viaBotId,
+			file->to.replyTo,
+			HistoryItem::NewMessageDate(file->to.options.scheduled),
+			messageFromId,
+			messagePostAuthor,
+			caption,
+			media,
+			MTPReplyMarkup(),
+			groupId);
 	}

 	if (isEditing) {
--- a/Telegram/SourceFiles/api/api_sending.h
+++ b/Telegram/SourceFiles/api/api_sending.h
@@ -30,7 +30,7 @@ bool SendDice(Api::MessageToSend &message);
 void FillMessagePostFlags(
 	const SendAction &action,
 	not_null<PeerData*> peer,
-	MTPDmessage::Flags &flags);
+	MessageFlags &flags);

 void SendConfirmedFile(
 	not_null<Main::Session*> session,
--- a/Telegram/SourceFiles/api/api_updates.cpp
+++ b/Telegram/SourceFiles/api/api_updates.cpp
@@ -41,7 +41,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/window_controller.h"
 #include "boxes/confirm_box.h"
 #include "apiwrap.h"
-#include "app.h" // App::formatPhone
+#include "ui/text/format_values.h" // Ui::FormatPhone
+#include "app.h" // App::quitting

 namespace Api {
 namespace {
@@ -1054,7 +1055,7 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				//MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty())),
-			MTPDmessage_ClientFlags(),
+			MessageFlags(),
 			NewMessageType::Unread);
 	} break;

@@ -1085,7 +1086,7 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				//MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty())),
-			MTPDmessage_ClientFlags(),
+			MessageFlags(),
 			NewMessageType::Unread);
 	} break;

@@ -1114,7 +1115,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		if (needToAdd) {
 			_session->data().addNewMessage(
 				d.vmessage(),
-				MTPDmessage_ClientFlags(),
+				MessageFlags(),
 				NewMessageType::Unread);
 		}
 	} break;
@@ -1208,7 +1209,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		if (needToAdd) {
 			_session->data().addNewMessage(
 				d.vmessage(),
-				MTPDmessage_ClientFlags(),
+				MessageFlags(),
 				NewMessageType::Unread);
 		}
 	} break;
@@ -1844,7 +1845,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 						|| user->isSelf()
 						|| user->phone().isEmpty())
 						? QString()
-						: App::formatPhone(user->phone())),
+						: Ui::FormatPhone(user->phone())),
 					user->username);

 				session().changes().peerUpdated(
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -3783,18 +3783,17 @@ void ApiWrap::forwardMessages(
 	const auto anonymousPost = peer->amAnonymous();
 	const auto silentPost = ShouldSendSilent(peer, action.options);

-	auto flags = MTPDmessage::Flags(0);
-	auto clientFlags = MTPDmessage_ClientFlags();
+	auto flags = MessageFlags();
 	auto sendFlags = MTPmessages_ForwardMessages::Flags(0);
 	FillMessagePostFlags(action, peer, flags);
 	if (silentPost) {
 		sendFlags |= MTPmessages_ForwardMessages::Flag::f_silent;
 	}
 	if (action.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_ForwardMessages::Flag::f_schedule_date;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}

 	auto forwardFrom = items.front()->history()->peer;
@@ -3861,7 +3860,6 @@ void ApiWrap::forwardMessages(
 				history->addNewLocalMessage(
 					newId.msg,
 					flags,
-					clientFlags,
 					HistoryItem::NewMessageDate(action.options.scheduled),
 					messageFromId,
 					messagePostAuthor,
@@ -3926,61 +3924,44 @@ void ApiWrap::sendSharedContact(
 		_session->data().nextLocalMessageId());
 	const auto anonymousPost = peer->amAnonymous();

-	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
-	auto clientFlags = NewMessageClientFlags();
+	auto flags = NewMessageFlags(peer);
 	if (action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to;
+		flags |= MessageFlag::HasReplyInfo;
 	}
 	const auto replyHeader = NewMessageReplyHeader(action);
 	FillMessagePostFlags(action, peer, flags);
 	if (action.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}
 	const auto messageFromId = anonymousPost ? 0 : _session->userPeerId();
 	const auto messagePostAuthor = peer->isBroadcast()
 		? _session->user()->name
 		: QString();
-	const auto vcard = QString();
-	const auto views = 1;
-	const auto forwards = 0;
-	const auto item = history->addNewMessage(
-		MTP_message(
-			MTP_flags(flags),
-			MTP_int(newId.msg),
-			peerToMTP(messageFromId),
-			peerToMTP(peer->id),
-			MTPMessageFwdHeader(),
-			MTPint(), // via_bot_id
-			replyHeader,
-			MTP_int(HistoryItem::NewMessageDate(action.options.scheduled)),
-			MTP_string(),
-			MTP_messageMediaContact(
-				MTP_string(phone),
-				MTP_string(firstName),
-				MTP_string(lastName),
-				MTP_string(vcard),
-				MTP_int(userId.bare)), // #TODO ids
-			MTPReplyMarkup(),
-			MTPVector<MTPMessageEntity>(),
-			MTP_int(views),
-			MTP_int(forwards),
-			MTPMessageReplies(),
-			MTPint(), // edit_date
-			MTP_string(messagePostAuthor),
-			MTPlong(),
-			//MTPMessageReactions(),
-			MTPVector<MTPRestrictionReason>(),
-			MTPint()), // ttl_period
-		clientFlags,
-		NewMessageType::Unread);
+	const auto viaBotId = UserId();
+	const auto item = history->addNewLocalMessage(
+		newId.msg,
+		flags,
+		viaBotId,
+		action.replyTo,
+		HistoryItem::NewMessageDate(action.options.scheduled),
+		messageFromId,
+		messagePostAuthor,
+		TextWithEntities(),
+		MTP_messageMediaContact(
+			MTP_string(phone),
+			MTP_string(firstName),
+			MTP_string(lastName),
+			MTP_string(), // vcard
+			MTP_int(userId.bare)), // #TODO ids
+		MTPReplyMarkup());

 	const auto media = MTP_inputMediaContact(
 		MTP_string(phone),
 		MTP_string(firstName),
 		MTP_string(lastName),
-		MTP_string(vcard));
+		MTP_string()); // vcard
 	sendMedia(item, media, action.options);

 	_session->data().sendHistoryChangeNotifications();
@@ -4181,11 +4162,10 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		_session->data().registerMessageSentData(randomId, peer->id, sending.text);

 		MTPstring msgText(MTP_string(sending.text));
-		auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_entities;
-		auto clientFlags = NewMessageClientFlags();
+		auto flags = NewMessageFlags(peer);
 		auto sendFlags = MTPmessages_SendMessage::Flags(0);
 		if (action.replyTo) {
-			flags |= MTPDmessage::Flag::f_reply_to;
+			flags |= MessageFlag::HasReplyInfo;
 			sendFlags |= MTPmessages_SendMessage::Flag::f_reply_to_msg_id;
 		}
 		const auto replyHeader = NewMessageReplyHeader(action);
@@ -4198,7 +4178,6 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 				MTP_webPagePending(
 					MTP_long(page->id),
 					MTP_int(page->pendingTill)));
-			flags |= MTPDmessage::Flag::f_media;
 		}
 		const auto anonymousPost = peer->amAnonymous();
 		const auto silentPost = ShouldSendSilent(peer, action.options);
@@ -4206,10 +4185,7 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 		if (silentPost) {
 			sendFlags |= MTPmessages_SendMessage::Flag::f_silent;
 		}
-		auto localEntities = Api::EntitiesToMTP(
-			_session,
-			sending.entities);
-		auto sentEntities = Api::EntitiesToMTP(
+		const auto sentEntities = Api::EntitiesToMTP(
 			_session,
 			sending.entities,
 			Api::ConvertOption::SkipLocal);
@@ -4227,39 +4203,23 @@ void ApiWrap::sendMessage(MessageToSend &&message) {
 			? _session->user()->name
 			: QString();
 		if (action.options.scheduled) {
-			flags |= MTPDmessage::Flag::f_from_scheduled;
+			flags |= MessageFlag::IsOrWasScheduled;
 			sendFlags |= MTPmessages_SendMessage::Flag::f_schedule_date;
 		} else {
-			clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+			flags |= MessageFlag::LocalHistoryEntry;
 		}
-		const auto views = 1;
-		const auto forwards = 0;
-		lastMessage = history->addNewMessage(
-			MTP_message(
-				MTP_flags(flags),
-				MTP_int(newId.msg),
-				peerToMTP(messageFromId),
-				peerToMTP(peer->id),
-				MTPMessageFwdHeader(),
-				MTPint(), // via_bot_id
-				replyHeader,
-				MTP_int(
-					HistoryItem::NewMessageDate(action.options.scheduled)),
-				msgText,
-				media,
-				MTPReplyMarkup(),
-				localEntities,
-				MTP_int(views),
-				MTP_int(forwards),
-				MTPMessageReplies(),
-				MTPint(), // edit_date
-				MTP_string(messagePostAuthor),
-				MTPlong(),
-				//MTPMessageReactions(),
-				MTPVector<MTPRestrictionReason>(),
-				MTPint()), // ttl_period
-			clientFlags,
-			NewMessageType::Unread);
+		const auto viaBotId = UserId();
+		lastMessage = history->addNewLocalMessage(
+			newId.msg,
+			flags,
+			viaBotId,
+			action.replyTo,
+			HistoryItem::NewMessageDate(action.options.scheduled),
+			messageFromId,
+			messagePostAuthor,
+			sending,
+			media,
+			MTPReplyMarkup());
 		histories.sendRequest(history, requestType, [=](Fn<void()> finish) {
 			history->sendRequestId = request(MTPmessages_SendMessage(
 				MTP_flags(sendFlags),
@@ -4346,11 +4306,10 @@ void ApiWrap::sendInlineResult(
 		_session->data().nextLocalMessageId());
 	const auto randomId = openssl::RandomValue<uint64>();

-	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
-	auto clientFlags = NewMessageClientFlags();
+	auto flags = NewMessageFlags(peer);
 	auto sendFlags = MTPmessages_SendInlineBotResult::Flag::f_clear_draft | 0;
 	if (action.replyTo) {
-		flags |= MTPDmessage::Flag::f_reply_to;
+		flags |= MessageFlag::HasReplyInfo;
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_reply_to_msg_id;
 	}
 	const auto anonymousPost = peer->amAnonymous();
@@ -4360,13 +4319,13 @@ void ApiWrap::sendInlineResult(
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_silent;
 	}
 	if (bot) {
-		flags |= MTPDmessage::Flag::f_via_bot_id;
+		flags |= MessageFlag::HasViaBot;
 	}
 	if (action.options.scheduled) {
-		flags |= MTPDmessage::Flag::f_from_scheduled;
+		flags |= MessageFlag::IsOrWasScheduled;
 		sendFlags |= MTPmessages_SendInlineBotResult::Flag::f_schedule_date;
 	} else {
-		clientFlags |= MTPDmessage_ClientFlag::f_local_history_entry;
+		flags |= MessageFlag::LocalHistoryEntry;
 	}

 	const auto messageFromId = anonymousPost ? 0 : _session->userPeerId();
@@ -4379,10 +4338,9 @@ void ApiWrap::sendInlineResult(
 	data->addToHistory(
 		history,
 		flags,
-		clientFlags,
 		newId.msg,
 		messageFromId,
-		MTP_int(HistoryItem::NewMessageDate(action.options.scheduled)),
+		HistoryItem::NewMessageDate(action.options.scheduled),
 		bot ? peerToUser(bot->id) : 0,
 		action.replyTo,
 		messagePostAuthor);
@@ -4806,6 +4764,23 @@ void ApiWrap::reloadPasswordState() {
 	}).send();
 }

+void ApiWrap::applyPendingReset(const MTPaccount_ResetPasswordResult &data) {
+	if (!_passwordState) {
+		reloadPasswordState();
+		return;
+	}
+	data.match([&](const MTPDaccount_resetPasswordOk &data) {
+		reloadPasswordState();
+	}, [&](const MTPDaccount_resetPasswordRequestedWait &data) {
+		const auto until = data.vuntil_date().v;
+		if (_passwordState->pendingResetDate != until) {
+			_passwordState->pendingResetDate = until;
+			_passwordStateChanges.fire_copy(*_passwordState);
+		}
+	}, [&](const MTPDaccount_resetPasswordFailedWait &data) {
+	});
+}
+
 void ApiWrap::clearUnconfirmedPassword() {
 	_passwordRequestId = request(MTPaccount_CancelPasswordEmail(
 	)).done([=](const MTPBool &result) {
--- a/Telegram/SourceFiles/apiwrap.h
+++ b/Telegram/SourceFiles/apiwrap.h
@@ -434,6 +434,7 @@ public:
 	void clearPeerPhoto(not_null<PhotoData*> photo);

 	void reloadPasswordState();
+	void applyPendingReset(const MTPaccount_ResetPasswordResult &data);
 	void clearUnconfirmedPassword();
 	rpl::producer<Core::CloudPasswordState> passwordState() const;
 	std::optional<Core::CloudPasswordState> passwordStateCurrent() const;
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -38,7 +38,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "apiwrap.h"
-#include "numbers.h"
 #include "main/main_session.h"
 #include "styles/style_boxes.h"
 #include "styles/style_overview.h"
@@ -70,32 +69,6 @@ HistoryView::Element *hoveredItem = nullptr,

 namespace App {

-	QString formatPhone(QString phone) {
-		if (phone.isEmpty()) return QString();
-		if (phone.at(0) == '0') return phone;
-
-		QString number = phone;
-		for (const QChar *ch = phone.constData(), *e = ch + phone.size(); ch != e; ++ch) {
-			if (ch->unicode() < '0' || ch->unicode() > '9') {
-				number = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
-			}
-		}
-		QVector<int> groups = phoneNumberParse(number);
-		if (groups.isEmpty()) return '+' + number;
-
-		QString result;
-		result.reserve(number.size() + groups.size() + 1);
-		result.append('+');
-		int32 sum = 0;
-		for (int32 i = 0, l = groups.size(); i < l; ++i) {
-			result.append(number.midRef(sum, groups.at(i)));
-			sum += groups.at(i);
-			if (sum < number.size()) result.append(' ');
-		}
-		if (sum < number.size()) result.append(number.midRef(sum));
-		return result;
-	}
-
 	void initMedia() {
 		Ui::StartCachedCorners();
 	}
--- a/Telegram/SourceFiles/app.h
+++ b/Telegram/SourceFiles/app.h
@@ -14,8 +14,6 @@ class Element;
 } // namespace HistoryView

 namespace App {
-	QString formatPhone(QString phone);
-
 	void hoveredItem(HistoryView::Element *item);
 	HistoryView::Element *hoveredItem();
 	void pressedItem(HistoryView::Element *item);
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@@ -93,8 +93,6 @@ void AboutBox::showVersionHistory() {
 			url += qsl("win/%1.zip");
 		} else if (Platform::IsWindows64Bit()) {
 			url += qsl("win64/%1.zip");
-		} else if (Platform::IsOSXBuild()) {
-			url += qsl("osx/%1.zip");
 		} else if (Platform::IsMac()) {
 			url += qsl("mac/%1.zip");
 		} else if (Platform::IsLinux32Bit()) {
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.cpp
@@ -239,8 +239,10 @@ void BackgroundBox::Inner::sortPapers() {
 		return std::make_tuple(
 			data.id() == current,
 			night ? data.isDark() : !data.isDark(),
-			!data.isDefault() && !data.isLocal(),
-			!data.isDefault() && data.isLocal());
+			Data::IsDefaultWallPaper(data),
+			!data.isDefault() && !Data::IsLegacy1DefaultWallPaper(data),
+			Data::IsLegacy2DefaultWallPaper(data),
+			Data::IsLegacy1DefaultWallPaper(data));
 	});
 	if (!_papers.empty() && _papers.front().data.id() == current) {
 		_papers.front().data = _papers.front().data.withParamsFrom(
@@ -366,6 +368,7 @@ void BackgroundBox::Inner::paintPaper(
 		_check->paint(p, checkLeft, checkTop, width());
 	} else if (Data::IsCloudWallPaper(paper.data)
 		&& !Data::IsDefaultWallPaper(paper.data)
+		&& !Data::IsLegacy2DefaultWallPaper(paper.data)
 		&& !v::is_null(over)
 		&& (&paper == &_papers[getSelectionIndex(over)])) {
 		const auto deleteSelected = v::is<DeleteSelected>(over);
@@ -395,6 +398,7 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		} else if (result >= _papers.size()) {
 			return Selection();
 		}
+		auto &data = _papers[result].data;
 		const auto deleteLeft = (column + 1) * (width + skip)
 			- st::stickerPanDeleteIconBg.width();
 		const auto deleteBottom = row * (height + skip) + skip
@@ -402,9 +406,10 @@ void BackgroundBox::Inner::mouseMoveEvent(QMouseEvent *e) {
 		const auto currentId = Window::Theme::Background()->id();
 		const auto inDelete = (x >= deleteLeft)
 			&& (y < deleteBottom)
-			&& Data::IsCloudWallPaper(_papers[result].data)
-			&& !Data::IsDefaultWallPaper(_papers[result].data)
-			&& (currentId != _papers[result].data.id());
+			&& Data::IsCloudWallPaper(data)
+			&& !Data::IsDefaultWallPaper(data)
+			&& !Data::IsLegacy2DefaultWallPaper(data)
+			&& (currentId != data.id());
 		return (result >= _papers.size())
 			? Selection()
 			: inDelete
--- a/Telegram/SourceFiles/boxes/background_preview_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_preview_box.cpp
@@ -286,24 +286,25 @@ AdminLog::OwnedItem GenerateTextItem(
 		bool out) {
 	Expects(history->peer->isUser());

-	using Flag = MTPDmessage::Flag;
 	static auto id = ServerMaxMsgId + (ServerMaxMsgId / 3);
-	const auto flags = Flag::f_entities
-		| Flag::f_from_id
-		| (out ? Flag::f_out : Flag(0));
-	const auto clientFlags = MTPDmessage_ClientFlag::f_fake_history_item;
-	const auto replyTo = 0;
-	const auto viaBotId = UserId(0);
+	const auto flags = MessageFlag::FakeHistoryItem
+		| MessageFlag::HasFromId
+		| (out ? MessageFlag::Outgoing : MessageFlag(0));
+	const auto replyTo = MsgId();
+	const auto viaBotId = UserId();
+	const auto groupedId = uint64();
 	const auto item = history->makeMessage(
 		++id,
 		flags,
-		clientFlags,
 		replyTo,
 		viaBotId,
 		base::unixtime::now(),
 		out ? history->session().userId() : peerToUser(history->peer->id),
 		QString(),
-		TextWithEntities{ TextUtilities::Clean(text) });
+		TextWithEntities{ TextUtilities::Clean(text) },
+		MTP_messageMediaEmpty(),
+		MTPReplyMarkup(),
+		groupedId);
 	return AdminLog::OwnedItem(delegate, item);
 }

@@ -622,6 +623,7 @@ void BackgroundPreviewBox::paintDate(Painter &p) {
 	if (!date || !_serviceBg) {
 		return;
 	}
+	auto hq = PainterHighQualityEnabler(p);
 	const auto text = date->text;
 	const auto bubbleHeight = st::msgServicePadding.top() + st::msgServiceFont->height + st::msgServicePadding.bottom();
 	const auto bubbleTop = st::msgServiceMargin.top();
@@ -758,7 +760,7 @@ void BackgroundPreviewBox::checkLoadedDocument() {
 	};
 	_generating = Data::ReadImageAsync(
 		_media.get(),
-		Window::Theme::ProcessBackgroundImage,
+		Window::Theme::PreprocessBackgroundImage,
 		generateCallback);
 }

--- a/Telegram/SourceFiles/boxes/change_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/input_fields.h"
 #include "ui/wrap/fade_wrap.h"
 #include "ui/toast/toast.h"
+#include "ui/text/format_values.h" // Ui::FormatPhone
 #include "ui/text/text_utilities.h"
 #include "ui/special_fields.h"
 #include "boxes/confirm_phone_box.h"
@@ -21,7 +22,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_user.h"
 #include "mtproto/sender.h"
 #include "apiwrap.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"

@@ -235,7 +235,7 @@ void ChangePhoneBox::EnterPhone::sendPhoneFail(const MTP::Error &error, const QS
 			tr::lng_change_phone_occupied(
 				tr::now,
 				lt_phone,
-				App::formatPhone(phoneNumber)),
+				Ui::FormatPhone(phoneNumber)),
 			tr::lng_box_ok(tr::now)));
 	} else {
 		showError(Lang::Hard::ServerError());
@@ -271,7 +271,7 @@ void ChangePhoneBox::EnterCode::prepare() {
 	auto descriptionText = tr::lng_change_phone_code_description(
 		tr::now,
 		lt_phone,
-		Ui::Text::Bold(App::formatPhone(_phone)),
+		Ui::Text::Bold(Ui::FormatPhone(_phone)),
 		Ui::Text::WithEntities);
 	auto description = object_ptr<Ui::FlatLabel>(this, rpl::single(descriptionText), st::changePhoneLabel);
 	description->moveToLeft(st::boxPadding.left(), 0);
--- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
+#include "ui/text/format_values.h" // Ui::FormatPhone
 #include "ui/text/text_utilities.h"
 #include "core/click_handler_types.h" // UrlClickHandler
 #include "base/qthelp_url.h" // qthelp::url_encode
@@ -18,7 +19,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "main/main_session.h"
 #include "mainwidget.h"
 #include "numbers.h"
-#include "app.h"
 #include "lang/lang_keys.h"
 #include "mtproto/facade.h"
 #include "styles/style_layers.h"
@@ -296,7 +296,7 @@ void ConfirmPhoneBox::prepare() {
 		this,
 		tr::lng_confirm_phone_about(
 			lt_phone,
-			rpl::single(Ui::Text::Bold(App::formatPhone(_phone))),
+			rpl::single(Ui::Text::Bold(Ui::FormatPhone(_phone))),
 			Ui::Text::WithEntities),
 		st::confirmPhoneAboutLabel);

@@ -347,7 +347,7 @@ void ConfirmPhoneBox::sendCode() {

 void ConfirmPhoneBox::confirmDone(const MTPBool &result) {
 	_sendCodeRequestId = 0;
-	Ui::show(Box<InformBox>(tr::lng_confirm_phone_success(tr::now, lt_phone, App::formatPhone(_phone))));
+	Ui::show(Box<InformBox>(tr::lng_confirm_phone_success(tr::now, lt_phone, Ui::FormatPhone(_phone))));
 }

 void ConfirmPhoneBox::confirmFail(const MTP::Error &error) {
--- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp
@@ -101,6 +101,11 @@ Ui::AlbumType ComputeAlbumType(not_null<HistoryItem*> item) {
 	return Ui::AlbumType();
 }

+bool CanBeCompressed(Ui::AlbumType type) {
+	return (type == Ui::AlbumType::None)
+		|| (type == Ui::AlbumType::PhotoVideo);
+}
+
 } // namespace

 EditCaptionBox::EditCaptionBox(
@@ -170,7 +175,7 @@ void EditCaptionBox::rebuildPreview() {
 		const auto photo = media->photo();
 		const auto document = media->document();
 		if (photo || document->isVideoFile() || document->isAnimation()) {
-			_isPhoto = true;
+			_isPhoto = (photo != nullptr);
 			const auto media = Ui::CreateChild<Ui::ItemSingleMediaPreview>(
 				this,
 				gifPaused,
@@ -230,6 +235,8 @@ void EditCaptionBox::rebuildPreview() {
 	_scroll->setOwnedWidget(
 		object_ptr<Ui::RpWidget>::fromRaw(_content.get()));

+	_previewRebuilds.fire({});
+
 	captionResized();
 }

@@ -302,10 +309,11 @@ void EditCaptionBox::setupShadows() {
 }

 void EditCaptionBox::setupControls() {
-	auto hintLabelToggleOn = _isPhoto.value(
-	) | rpl::map([=](bool value) {
+	auto hintLabelToggleOn = _previewRebuilds.events_starting_with(
+		rpl::empty_value()
+	) | rpl::map([=] {
 		return _controller->session().settings().photoEditorHintShown()
-			? value
+			? _isPhoto
 			: false;
 	});

@@ -327,9 +335,12 @@ void EditCaptionBox::setupControls() {
 			st::defaultBoxCheckbox),
 		st::editMediaCheckboxMargins)
 	)->toggleOn(
-		_isPhoto.value(
-		) | rpl::map([=](bool value) {
-			return value && (_albumType == Ui::AlbumType::None);
+		_previewRebuilds.events_starting_with(
+			rpl::empty_value()
+		) | rpl::map([=] {
+			return _isPhoto
+				&& CanBeCompressed(_albumType)
+				&& !_preparedList.files.empty();
 		}),
 		anim::type::instant
 	)->entity()->checkedChanges(
@@ -610,6 +621,7 @@ void EditCaptionBox::resizeEvent(QResizeEvent *e) {
 	_emojiToggle->update();

 	if (!_controls->isHidden()) {
+		_controls->resizeToWidth(width());
 		_controls->moveToLeft(
 			st::boxPhotoPadding.left(),
 			bottom - _controls->heightNoMargins());
@@ -661,7 +673,7 @@ void EditCaptionBox::save() {

 		_controller->session().api().editMedia(
 			std::move(_preparedList),
-			(!_asFile && _isPhoto.current())
+			(!_asFile && _isPhoto && CanBeCompressed(_albumType))
 				? SendMediaType::Photo
 				: SendMediaType::File,
 			_field->getTextWithAppliedMarkdown(),
--- a/Telegram/SourceFiles/boxes/edit_caption_box.h
+++ b/Telegram/SourceFiles/boxes/edit_caption_box.h
@@ -74,14 +74,14 @@ private:

 	const not_null<Window::SessionController*> _controller;
 	const not_null<HistoryItem*> _historyItem;
-	const bool _isAllowedEditMedia = false;
+	const bool _isAllowedEditMedia;
 	const Ui::AlbumType _albumType;

 	const base::unique_qptr<Ui::VerticalLayout> _controls;
 	const base::unique_qptr<Ui::ScrollArea> _scroll;
 	const base::unique_qptr<Ui::InputField> _field;
 	const base::unique_qptr<Ui::EmojiButton> _emojiToggle;
-	const base::unique_qptr<Ui::FadeShadow> _topShadow,_bottomShadow;
+	const base::unique_qptr<Ui::FadeShadow> _topShadow, _bottomShadow;

 	base::unique_qptr<Ui::AbstractSinglePreview> _content;
 	base::unique_qptr<ChatHelpers::TabbedPanel> _emojiPanel;
@@ -93,15 +93,16 @@ private:

 	mtpRequestId _saveRequestId = 0;

+	bool _isPhoto = false;
 	bool _asFile = false;

 	QString _error;

-	rpl::variable<bool> _isPhoto = false;
 	rpl::variable<int> _footerHeight = 0;

 	rpl::event_stream<> _editMediaClicks;
 	rpl::event_stream<> _photoEditorOpens;
+	rpl::event_stream<> _previewRebuilds;
 	rpl::event_stream<int> _contentHeight;

 };
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@@ -115,12 +115,12 @@ private:
 	const Rows::Row &rowBySelection(Selection selected) const;
 	std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		Selection selected);
-	const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
+	[[maybe_unused]] const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		Selection selected) const;
 	std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		not_null<Row*> row,
 		Selection selected);
-	const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
+	[[maybe_unused]] const std::unique_ptr<Ui::RippleAnimation> &rippleBySelection(
 		not_null<const Row*> row,
 		Selection selected) const;
 	void addRipple(Selection selected, QPoint position);
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "lang/lang_keys.h"
 #include "boxes/confirm_box.h"
 #include "boxes/confirm_phone_box.h"
+#include "base/unixtime.h"
 #include "mainwindow.h"
 #include "apiwrap.h"
 #include "main/main_session.h"
@@ -95,6 +96,56 @@ void TransferPasswordError(
 	}
 }

+void StartPendingReset(
+		not_null<Main::Session*> session,
+		not_null<Ui::BoxContent*> context,
+		Fn<void()> close) {
+	const auto weak = Ui::MakeWeak(context.get());
+	session->api().request(MTPaccount_ResetPassword(
+	)).done([=](const MTPaccount_ResetPasswordResult &result) {
+		session->api().applyPendingReset(result);
+		result.match([&](const MTPDaccount_resetPasswordOk &data) {
+		}, [&](const MTPDaccount_resetPasswordRequestedWait &data) {
+		}, [&](const MTPDaccount_resetPasswordFailedWait &data) {
+			constexpr auto kMinute = 60;
+			constexpr auto kHour = 3600;
+			constexpr auto kDay = 86400;
+			const auto left = std::max(
+				data.vretry_date().v - base::unixtime::now(),
+				kMinute);
+			const auto days = (left / kDay);
+			const auto hours = (left / kHour);
+			const auto minutes = (left / kMinute);
+			const auto duration = days
+				? tr::lng_group_call_duration_days(tr::now, lt_count, days)
+				: hours
+				? tr::lng_group_call_duration_hours(tr::now, lt_count, hours)
+				: tr::lng_group_call_duration_minutes(
+					tr::now,
+					lt_count,
+					minutes);
+			if (const auto strong = weak.data()) {
+				strong->getDelegate()->show(Box<InformBox>(
+					tr::lng_cloud_password_reset_later(
+						tr::now,
+						lt_duration,
+						duration)));
+			}
+		});
+		if (const auto strong = weak.data()) {
+			strong->closeBox();
+		}
+		close();
+	}).fail([=](const MTP::Error &error) {
+		if (const auto strong = weak.data()) {
+			strong->getDelegate()->show(
+				Box<InformBox>("Error: " + error.type()));
+			strong->closeBox();
+		}
+		close();
+	}).send();
+}
+
 } // namespace

 PasscodeBox::CloudFields PasscodeBox::CloudFields::From(
@@ -106,6 +157,7 @@ PasscodeBox::CloudFields PasscodeBox::CloudFields::From(
 	result.hasRecovery = current.hasRecovery;
 	result.notEmptyPassport = current.notEmptyPassport;
 	result.hint = current.hint;
+	result.pendingResetDate = current.pendingResetDate;
 	return result;
 }

@@ -145,7 +197,8 @@ PasscodeBox::PasscodeBox(
 , _reenterPasscode(this, st::defaultInputField, tr::lng_cloud_password_confirm_new())
 , _passwordHint(this, st::defaultInputField, fields.curRequest ? tr::lng_cloud_password_change_hint() : tr::lng_cloud_password_hint())
 , _recoverEmail(this, st::defaultInputField, tr::lng_cloud_password_email())
-, _recover(this, tr::lng_signin_recover(tr::now)) {
+, _recover(this, tr::lng_signin_recover(tr::now))
+, _showRecoverLink(_cloudFields.hasRecovery || !_cloudFields.pendingResetDate) {
 	Expects(!_turningOff || _cloudFields.curRequest);

 	if (!_cloudFields.hint.isEmpty()) {
@@ -203,14 +256,14 @@ void PasscodeBox::prepare() {
 			: _cloudPwd
 			? tr::lng_cloud_password_remove()
 			: tr::lng_passcode_remove());
-		setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_cloudFields.hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
+		setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_showRecoverLink && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
 	} else {
 		if (currentlyHave()) {
 			_oldPasscode->show();
 			setTitle(_cloudPwd
 				? tr::lng_cloud_password_change()
 				: tr::lng_passcode_change());
-			setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_cloudFields.hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + _newPasscode->height() + st::passcodeLittleSkip + _reenterPasscode->height() + st::passcodeSkip + (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
+			setDimensions(st::boxWidth, st::passcodePadding.top() + _oldPasscode->height() + st::passcodeTextLine + ((_showRecoverLink && !_hintText.isEmpty()) ? st::passcodeTextLine : 0) + _newPasscode->height() + st::passcodeLittleSkip + _reenterPasscode->height() + st::passcodeSkip + (_cloudPwd ? _passwordHint->height() + st::passcodeLittleSkip : 0) + st::passcodeAboutSkip + _aboutHeight + st::passcodePadding.bottom());
 		} else {
 			_oldPasscode->hide();
 			setTitle(_cloudPwd
@@ -237,7 +290,9 @@ void PasscodeBox::prepare() {

 	const auto has = currentlyHave();
 	_oldPasscode->setVisible(onlyCheck || has);
-	_recover->setVisible((onlyCheck || has) && _cloudPwd && _cloudFields.hasRecovery);
+	_recover->setVisible((onlyCheck || has)
+		&& _cloudPwd
+		&& _showRecoverLink);
 	_newPasscode->setVisible(!onlyCheck);
 	_reenterPasscode->setVisible(!onlyCheck);
 	_passwordHint->setVisible(!onlyCheck && _cloudPwd);
@@ -285,7 +340,7 @@ void PasscodeBox::paintEvent(QPaintEvent *e) {
 	Painter p(this);

 	int32 w = st::boxWidth - st::boxPadding.left() * 1.5;
-	int32 abouty = (_passwordHint->isHidden() ? ((_reenterPasscode->isHidden() ? (_oldPasscode->y() + (_cloudFields.hasRecovery && !_hintText.isEmpty() ? st::passcodeTextLine : 0)) : _reenterPasscode->y()) + st::passcodeSkip) : _passwordHint->y()) + _oldPasscode->height() + st::passcodeLittleSkip + st::passcodeAboutSkip;
+	int32 abouty = (_passwordHint->isHidden() ? ((_reenterPasscode->isHidden() ? (_oldPasscode->y() + (_showRecoverLink && !_hintText.isEmpty() ? st::passcodeTextLine : 0)) : _reenterPasscode->y()) + st::passcodeSkip) : _passwordHint->y()) + _oldPasscode->height() + st::passcodeLittleSkip + st::passcodeAboutSkip;
 	p.setPen(st::boxTextFg);
 	_about.drawLeft(p, st::boxPadding.left(), abouty, w, width());

@@ -317,7 +372,7 @@ void PasscodeBox::resizeEvent(QResizeEvent *e) {
 	_oldPasscode->resize(w, _oldPasscode->height());
 	_oldPasscode->moveToLeft(st::boxPadding.left(), st::passcodePadding.top());
 	_newPasscode->resize(w, _newPasscode->height());
-	_newPasscode->moveToLeft(st::boxPadding.left(), _oldPasscode->y() + ((_turningOff || has) ? (_oldPasscode->height() + st::passcodeTextLine + ((_cloudFields.hasRecovery && !_hintText.isEmpty()) ? st::passcodeTextLine : 0)) : 0));
+	_newPasscode->moveToLeft(st::boxPadding.left(), _oldPasscode->y() + ((_turningOff || has) ? (_oldPasscode->height() + st::passcodeTextLine + ((_showRecoverLink && !_hintText.isEmpty()) ? st::passcodeTextLine : 0)) : 0));
 	_reenterPasscode->resize(w, _reenterPasscode->height());
 	_reenterPasscode->moveToLeft(st::boxPadding.left(), _newPasscode->y() + _newPasscode->height() + st::passcodeLittleSkip);
 	_passwordHint->resize(w, _passwordHint->height());
@@ -379,7 +434,7 @@ void PasscodeBox::setPasswordFail(const QString &type) {
 		_oldPasscode->setFocus();
 		_oldPasscode->showError();
 		_oldError = tr::lng_flood_error(tr::now);
-		if (_cloudFields.hasRecovery && _hintText.isEmpty()) {
+		if (_showRecoverLink && _hintText.isEmpty()) {
 			_recover->hide();
 		}
 		update();
@@ -913,7 +968,7 @@ void PasscodeBox::badOldPasscode() {
 	_oldError = _cloudPwd
 		? tr::lng_cloud_password_wrong(tr::now)
 		: tr::lng_passcode_wrong(tr::now);
-	if (_cloudFields.hasRecovery && _hintText.isEmpty()) {
+	if (_showRecoverLink && _hintText.isEmpty()) {
 		_recover->hide();
 	}
 	update();
@@ -922,7 +977,7 @@ void PasscodeBox::badOldPasscode() {
 void PasscodeBox::oldChanged() {
 	if (!_oldError.isEmpty()) {
 		_oldError = QString();
-		if (_cloudFields.hasRecovery && _hintText.isEmpty()) {
+		if (_showRecoverLink && _hintText.isEmpty()) {
 			_recover->show();
 		}
 		update();
@@ -944,7 +999,21 @@ void PasscodeBox::emailChanged() {
 }

 void PasscodeBox::recoverByEmail() {
-	if (_pattern.isEmpty()) {
+	if (!_cloudFields.hasRecovery) {
+		const auto session = _session;
+		const auto confirmBox = std::make_shared<QPointer<BoxContent>>();
+		const auto reset = crl::guard(this, [=] {
+			StartPendingReset(session, this, [=] {
+				if (const auto box = *confirmBox) {
+					box->closeBox();
+				}
+			});
+		});
+		*confirmBox = getDelegate()->show(Box<ConfirmBox>(
+			tr::lng_cloud_password_reset_no_email(tr::now),
+			tr::lng_cloud_password_reset_ok(tr::now),
+			reset));
+	} else if (_pattern.isEmpty()) {
 		_pattern = "-";
 		_api.request(MTPauth_RequestPasswordRecovery(
 		)).done([=](const MTPauth_PasswordRecovery &result) {
@@ -964,10 +1033,13 @@ void PasscodeBox::recoverExpired() {
 void PasscodeBox::recover() {
 	if (_pattern == "-") return;

+	const auto weak = Ui::MakeWeak(this);
 	const auto box = getDelegate()->show(Box<RecoverBox>(
 		_session,
 		_pattern,
-		_cloudFields.notEmptyPassport));
+		_cloudFields.notEmptyPassport,
+		_cloudFields.pendingResetDate != 0,
+		[weak] { if (weak) { weak->closeBox(); } }));

 	box->passwordCleared(
 	) | rpl::map_to(
@@ -996,11 +1068,37 @@ RecoverBox::RecoverBox(
 	QWidget*,
 	not_null<Main::Session*> session,
 	const QString &pattern,
-	bool notEmptyPassport)
+	bool notEmptyPassport,
+	bool hasPendingReset,
+	Fn<void()> closeParent)
 : _api(&session->mtp())
 , _pattern(st::normalFont->elided(tr::lng_signin_recover_hint(tr::now, lt_recover_email, pattern), st::boxWidth - st::boxPadding.left() * 1.5))
 , _notEmptyPassport(notEmptyPassport)
-, _recoverCode(this, st::defaultInputField, tr::lng_signin_code()) {
+, _recoverCode(this, st::defaultInputField, tr::lng_signin_code())
+, _noEmailAccess(this, tr::lng_signin_try_password(tr::now))
+, _closeParent(std::move(closeParent)) {
+	if (hasPendingReset) {
+		_noEmailAccess.destroy();
+	} else {
+		_noEmailAccess->setClickedCallback([=] {
+			const auto confirmBox = std::make_shared<QPointer<BoxContent>>();
+			const auto reset = crl::guard(this, [=] {
+				const auto closeParent = _closeParent;
+				StartPendingReset(session, this, [=] {
+					if (closeParent) {
+						closeParent();
+					}
+					if (const auto box = *confirmBox) {
+						box->closeBox();
+					}
+				});
+			});
+			*confirmBox = getDelegate()->show(Box<ConfirmBox>(
+				tr::lng_cloud_password_reset_with_email(tr::now),
+				tr::lng_cloud_password_reset_ok(tr::now),
+				reset));
+		});
+	}
 }

 rpl::producer<> RecoverBox::passwordCleared() const {
@@ -1017,7 +1115,13 @@ void RecoverBox::prepare() {
 	addButton(tr::lng_passcode_submit(), [=] { submit(); });
 	addButton(tr::lng_cancel(), [=] { closeBox(); });

-	setDimensions(st::boxWidth, st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine + _recoverCode->height() + st::passcodeTextLine);
+	setDimensions(
+		st::boxWidth,
+		(st::passcodePadding.top()
+			+ st::passcodePadding.bottom()
+			+ st::passcodeTextLine
+			+ _recoverCode->height()
+			+ st::passcodeTextLine));

 	connect(_recoverCode, &Ui::InputField::changed, [=] { codeChanged(); });
 	connect(_recoverCode, &Ui::InputField::submitted, [=] { submit(); });
@@ -1044,6 +1148,9 @@ void RecoverBox::resizeEvent(QResizeEvent *e) {

 	_recoverCode->resize(st::boxWidth - st::boxPadding.left() - st::boxPadding.right(), _recoverCode->height());
 	_recoverCode->moveToLeft(st::boxPadding.left(), st::passcodePadding.top() + st::passcodePadding.bottom() + st::passcodeTextLine);
+	if (_noEmailAccess) {
+		_noEmailAccess->moveToLeft(st::boxPadding.left(), _recoverCode->y() + _recoverCode->height() + (st::passcodeTextLine - _noEmailAccess->height()) / 2);
+	}
 }

 void RecoverBox::setInnerFocus() {
@@ -1085,11 +1192,18 @@ void RecoverBox::submit() {
 	}
 }

-void RecoverBox::codeChanged() {
-	_error = QString();
+void RecoverBox::setError(const QString &error) {
+	_error = error;
+	if (_noEmailAccess) {
+		_noEmailAccess->setVisible(error.isEmpty());
+	}
 	update();
 }

+void RecoverBox::codeChanged() {
+	setError(QString());
+}
+
 void RecoverBox::codeSubmitDone(const MTPauth_Authorization &result) {
 	_submitRequest = 0;

@@ -1102,8 +1216,7 @@ void RecoverBox::codeSubmitDone(const MTPauth_Authorization &result) {
 void RecoverBox::codeSubmitFail(const MTP::Error &error) {
 	if (MTP::IsFloodError(error)) {
 		_submitRequest = 0;
-		_error = tr::lng_flood_error(tr::now);
-		update();
+		setError(tr::lng_flood_error(tr::now));
 		_recoverCode->showError();
 		return;
 	}
@@ -1121,18 +1234,14 @@ void RecoverBox::codeSubmitFail(const MTP::Error &error) {
 		_recoveryExpired.fire({});
 		closeBox();
 	} else if (err == qstr("CODE_INVALID")) {
-		_error = tr::lng_signin_wrong_code(tr::now);
-		update();
+		setError(tr::lng_signin_wrong_code(tr::now));
 		_recoverCode->selectAll();
 		_recoverCode->setFocus();
 		_recoverCode->showError();
 	} else {
-		if (Logs::DebugEnabled()) { // internal server error
-			_error = err + ": " + error.description();
-		} else {
-			_error = Lang::Hard::ServerError();
-		}
-		update();
+		setError(Logs::DebugEnabled() // internal server error
+			? (err + ": " + error.description())
+			: Lang::Hard::ServerError());
 		_recoverCode->setFocus();
 	}
 }
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@@ -39,6 +39,7 @@ public:
 		QString hint;
 		Core::SecureSecretAlgo newSecureSecretAlgo;
 		bool turningOff = false;
+		TimeId pendingResetDate = 0;

 		// Check cloud password for some action.
 		Fn<void(const Core::CloudPasswordResult &)> customCheckCallback;
@@ -157,6 +158,7 @@ private:
 	object_ptr<Ui::InputField> _passwordHint;
 	object_ptr<Ui::InputField> _recoverEmail;
 	object_ptr<Ui::LinkButton> _recover;
+	bool _showRecoverLink = false;

 	QString _oldError, _newError, _emailError;

@@ -172,7 +174,9 @@ public:
 		QWidget*,
 		not_null<Main::Session*> session,
 		const QString &pattern,
-		bool notEmptyPassport);
+		bool notEmptyPassport,
+		bool hasPendingReset,
+		Fn<void()> closeParent = nullptr);

 	rpl::producer<> passwordCleared() const;
 	rpl::producer<> recoveryExpired() const;
@@ -192,6 +196,7 @@ private:
 	void codeChanged();
 	void codeSubmitDone(const MTPauth_Authorization &result);
 	void codeSubmitFail(const MTP::Error &error);
+	void setError(const QString &error);

 	MTP::Sender _api;
 	mtpRequestId _submitRequest = 0;
@@ -200,6 +205,8 @@ private:
 	bool _notEmptyPassport = false;

 	object_ptr<Ui::InputField> _recoverCode;
+	object_ptr<Ui::LinkButton> _noEmailAccess;
+	Fn<void()> _closeParent;

 	QString _error;

--- a/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_contact_box.cpp
@@ -12,6 +12,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/wrap/vertical_layout.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/input_fields.h"
+#include "ui/text/format_values.h" // Ui::FormatPhone
 #include "ui/text/text_utilities.h"
 #include "info/profile/info_profile_cover.h"
 #include "lang/lang_keys.h"
@@ -19,7 +20,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/toast/toast.h"
 #include "main/main_session.h"
 #include "apiwrap.h"
-#include "app.h"
 #include "styles/style_layers.h"
 #include "styles/style_boxes.h"
 #include "styles/style_info.h"
@@ -145,7 +145,7 @@ void Controller::setupCover() {
 			_window,
 			(_phone.isEmpty()
 				? tr::lng_contact_mobile_hidden()
-				: rpl::single(App::formatPhone(_phone)))),
+				: rpl::single(Ui::FormatPhone(_phone)))),
 		style::margins())->setAttribute(Qt::WA_TransparentForMouseEvents);
 }

--- a/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
+++ b/Telegram/SourceFiles/boxes/peers/edit_peer_type_box.cpp
@@ -129,9 +129,6 @@ private:
 		const QString &text,
 		rpl::producer<QString> about);

-	bool inviteLinkShown();
-	QString inviteLinkText();
-
 	not_null<PeerData*> _peer;
 	bool _linkOnly = false;

@@ -308,15 +305,6 @@ QString Controller::getUsernameInput() {
 	return _controls.usernameInput->getLastText().trimmed();
 }

-QString Controller::inviteLinkText() {
-	if (const auto channel = _peer->asChannel()) {
-		return channel->inviteLink();
-	} else if (const auto chat = _peer->asChat()) {
-		return chat->inviteLink();
-	}
-	return QString();
-}
-
 object_ptr<Ui::RpWidget> Controller::createUsernameEdit() {
 	Expects(_wrap != nullptr);

@@ -583,11 +571,6 @@ object_ptr<Ui::RpWidget> Controller::createInviteLinkBlock() {
 	return result;
 }

-bool Controller::inviteLinkShown() {
-	return !_controls.privacy
-		|| (_controls.privacy->value() == Privacy::NoUsername);
-}
-
 } // namespace

 EditPeerTypeBox::EditPeerTypeBox(
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@@ -761,7 +761,6 @@ void StickerSetBox::Inner::visibleTopBottomUpdated(

 void StickerSetBox::Inner::setupLottie(int index) {
 	auto &element = _elements[index];
-	const auto document = element.document;

 	element.animated = ChatHelpers::LottieAnimationFromDocument(
 		getLottiePlayer(),
--- a/Telegram/SourceFiles/calls/calls.style
+++ b/Telegram/SourceFiles/calls/calls.style
@@ -173,6 +173,24 @@ callCameraUnmute: CallButton(callMicrophoneUnmute) {
 		}
 	}
 }
+callScreencastOn: CallButton(callMicrophoneMute) {
+	button: IconButton(callButton) {
+		icon: icon {{ "calls/calls_present", callIconFg }};
+		iconPosition: point(-1px, 22px);
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: callMuteRipple;
+		}
+	}
+}
+callScreencastOff: CallButton(callMicrophoneUnmute) {
+	button: IconButton(callButton) {
+		icon: icon {{ "calls/calls_present", callIconFgActive }};
+		iconPosition: point(-1px, 22px);
+		ripple: RippleAnimation(defaultRippleAnimation) {
+			color: callIconActiveRipple;
+		}
+	}
+}
 callBottomShadowSize: 124px;

 CallMuteButton {
@@ -724,6 +742,12 @@ groupCallTitleLabel: FlatLabel(groupCallSubtitleLabel) {
 		linkFontOver: font(semibold 14px);
 	}
 }
+groupCallVideoLimitLabel: FlatLabel(defaultFlatLabel) {
+	align: align(top);
+	textFg: groupCallMemberNotJoinedStatus;
+	style: semiboldTextStyle;
+	minWidth: 96px;
+}
 groupCallAddButtonPosition: point(10px, 7px);
 groupCallMembersWidthMax: 480px;
 groupCallRecordingMark: 6px;
@@ -1215,6 +1239,7 @@ groupCallNarrowColoredCrossLine: CrossLineAnimation(groupCallNarrowInactiveCross
 groupCallNarrowRaisedHand: icon {{ "calls/video_mini_speak", groupCallMemberInactiveStatus }};
 groupCallNarrowCameraIcon: icon {{ "calls/video_mini_video", groupCallMemberNotJoinedStatus }};
 groupCallNarrowScreenIcon: icon {{ "calls/video_mini_screencast", groupCallMemberNotJoinedStatus }};
+groupCallNarrowInvitedIcon: icon {{ "calls/video_mini_invited", groupCallMemberNotJoinedStatus }};
 groupCallNarrowIconPosition: point(-4px, 2px);
 groupCallNarrowIconSkip: 15px;
 groupCallOutline: 2px;
--- a/Telegram/SourceFiles/calls/calls_box_controller.cpp
+++ b/Telegram/SourceFiles/calls/calls_box_controller.cpp
@@ -398,7 +398,7 @@ void BoxController::receivedCalls(const QVector<MTPMessage> &result) {
 		if (const auto peer = session().data().peerLoaded(peerId)) {
 			const auto item = session().data().addNewMessage(
 				message,
-				MTPDmessage_ClientFlags(),
+				MessageFlags(),
 				NewMessageType::Existing);
 			insertRow(item, InsertWay::Append);
 		} else {
--- a/Telegram/SourceFiles/calls/calls_call.cpp
+++ b/Telegram/SourceFiles/calls/calls_call.cpp
@@ -290,16 +290,8 @@ void Call::startIncoming() {
 	}).send();
 }

-void Call::switchVideoOutgoing() {
-	const auto video = _videoOutgoing->state() == Webrtc::VideoState::Active;
-	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
-		videoOutgoing()->setState(StartVideoState(!video));
-	}), true);
-
-}
-
 void Call::answer() {
-	const auto video = _videoOutgoing->state() == Webrtc::VideoState::Active;
+	const auto video = isSharingVideo();
 	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
 		actuallyAnswer();
 	}), video);
@@ -366,7 +358,9 @@ void Call::setupOutgoingVideo() {
 	}
 	_videoOutgoing->stateValue(
 	) | rpl::start_with_next([=](Webrtc::VideoState state) {
-		if (state != Webrtc::VideoState::Inactive && !hasDevices()) {
+		if (state != Webrtc::VideoState::Inactive
+			&& !hasDevices()
+			&& !_videoCaptureIsScreencast) {
 			_errors.fire({ ErrorType::NoCamera });
 			_videoOutgoing->setState(Webrtc::VideoState::Inactive);
 		} else if (_state.current() != State::Established
@@ -383,7 +377,8 @@ void Call::setupOutgoingVideo() {
 			// Paused not supported right now.
 			Assert(state == Webrtc::VideoState::Active);
 			if (!_videoCapture) {
-				_videoCapture = _delegate->callGetVideoCapture();
+				_videoCapture = _delegate->callGetVideoCapture(
+					_videoCaptureDeviceId);
 				_videoCapture->setOutput(_videoOutgoing->sink());
 			}
 			if (_instance) {
@@ -986,9 +981,12 @@ void Call::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	}
 }

-void Call::setCurrentVideoDevice(const QString &deviceId) {
-	if (_videoCapture) {
-		_videoCapture->switchToDevice(deviceId.toStdString());
+void Call::setCurrentCameraDevice(const QString &deviceId) {
+	if (!_videoCaptureIsScreencast) {
+		_videoCaptureDeviceId = deviceId;
+		if (_videoCapture) {
+			_videoCapture->switchToDevice(deviceId.toStdString());
+		}
 	}
 }

@@ -1008,6 +1006,71 @@ void Call::setAudioDuckingEnabled(bool enabled) {
 	}
 }

+bool Call::isSharingVideo() const {
+	return (_videoOutgoing->state() != Webrtc::VideoState::Inactive);
+}
+
+bool Call::isSharingCamera() const {
+	return !_videoCaptureIsScreencast && isSharingVideo();
+}
+
+bool Call::isSharingScreen() const {
+	return _videoCaptureIsScreencast && isSharingVideo();
+}
+
+QString Call::cameraSharingDeviceId() const {
+	return isSharingCamera() ? _videoCaptureDeviceId : QString();
+}
+
+QString Call::screenSharingDeviceId() const {
+	return isSharingScreen() ? _videoCaptureDeviceId : QString();
+}
+
+void Call::toggleCameraSharing(bool enabled) {
+	if (isSharingCamera() == enabled) {
+		return;
+	} else if (!enabled) {
+		if (_videoCapture) {
+			_videoCapture->setState(tgcalls::VideoState::Inactive);
+		}
+		_videoOutgoing->setState(Webrtc::VideoState::Inactive);
+		_videoCaptureDeviceId = QString();
+		return;
+	}
+	_delegate->callRequestPermissionsOrFail(crl::guard(this, [=] {
+		toggleScreenSharing(std::nullopt);
+		const auto deviceId = Core::App().settings().callVideoInputDeviceId();
+		_videoCaptureDeviceId = deviceId;
+		if (_videoCapture) {
+			_videoCapture->switchToDevice(deviceId.toStdString());
+		}
+		_videoOutgoing->setState(Webrtc::VideoState::Active);
+	}), true);
+}
+
+void Call::toggleScreenSharing(std::optional<QString> uniqueId) {
+	if (!uniqueId) {
+		if (isSharingScreen()) {
+			if (_videoCapture) {
+				_videoCapture->setState(tgcalls::VideoState::Inactive);
+			}
+			_videoOutgoing->setState(Webrtc::VideoState::Inactive);
+		}
+		_videoCaptureDeviceId = QString();
+		_videoCaptureIsScreencast = false;
+		return;
+	} else if (screenSharingDeviceId() == *uniqueId) {
+		return;
+	}
+	toggleCameraSharing(false);
+	_videoCaptureIsScreencast = true;
+	_videoCaptureDeviceId = *uniqueId;
+	if (_videoCapture) {
+		_videoCapture->switchToDevice(uniqueId->toStdString());
+	}
+	_videoOutgoing->setState(Webrtc::VideoState::Active);
+}
+
 void Call::finish(FinishType type, const MTPPhoneCallDiscardReason &reason) {
 	Expects(type != FinishType::None);

--- a/Telegram/SourceFiles/calls/calls_call.h
+++ b/Telegram/SourceFiles/calls/calls_call.h
@@ -77,7 +77,7 @@ public:
 			Fn<void()> onSuccess,
 			bool video) = 0;

-		virtual auto callGetVideoCapture()
+		virtual auto callGetVideoCapture(const QString &deviceId)
 			-> std::shared_ptr<tgcalls::VideoCaptureInterface> = 0;

 		virtual ~Delegate() = default;
@@ -174,7 +174,6 @@ public:
 	crl::time getDurationMs() const;
 	float64 getWaitingSoundPeakValue() const;

-	void switchVideoOutgoing();
 	void answer();
 	void hangup();
 	void redial();
@@ -185,10 +184,22 @@ public:
 	QString getDebugLog() const;

 	void setCurrentAudioDevice(bool input, const QString &deviceId);
-	void setCurrentVideoDevice(const QString &deviceId);
 	//void setAudioVolume(bool input, float level);
 	void setAudioDuckingEnabled(bool enabled);

+	void setCurrentCameraDevice(const QString &deviceId);
+	[[nodiscard]] QString videoDeviceId() const {
+		return _videoCaptureDeviceId;
+	}
+
+	[[nodiscard]] bool isSharingVideo() const;
+	[[nodiscard]] bool isSharingCamera() const;
+	[[nodiscard]] bool isSharingScreen() const;
+	[[nodiscard]] QString cameraSharingDeviceId() const;
+	[[nodiscard]] QString screenSharingDeviceId() const;
+	void toggleCameraSharing(bool enabled);
+	void toggleScreenSharing(std::optional<QString> uniqueId);
+
 	[[nodiscard]] rpl::lifetime &lifetime() {
 		return _lifetime;
 	}
@@ -268,6 +279,8 @@ private:

 	std::unique_ptr<tgcalls::Instance> _instance;
 	std::shared_ptr<tgcalls::VideoCaptureInterface> _videoCapture;
+	QString _videoCaptureDeviceId;
+	bool _videoCaptureIsScreencast = false;
 	const std::unique_ptr<Webrtc::VideoTrack> _videoIncoming;
 	const std::unique_ptr<Webrtc::VideoTrack> _videoOutgoing;

--- a/Telegram/SourceFiles/calls/calls_instance.cpp
+++ b/Telegram/SourceFiles/calls/calls_instance.cpp
@@ -64,7 +64,7 @@ public:
 		Fn<void()> onSuccess,
 		bool video) override;
 	void callPlaySound(CallSound sound) override;
-	auto callGetVideoCapture()
+	auto callGetVideoCapture(const QString &deviceId)
 		-> std::shared_ptr<tgcalls::VideoCaptureInterface> override;

 	void groupCallFinished(not_null<GroupCall*> call) override;
@@ -123,9 +123,9 @@ void Instance::Delegate::callPlaySound(CallSound sound) {
 	}());
 }

-auto Instance::Delegate::callGetVideoCapture()
+auto Instance::Delegate::callGetVideoCapture(const QString &deviceId)
 -> std::shared_ptr<tgcalls::VideoCaptureInterface> {
-	return _instance->getVideoCapture();
+	return _instance->getVideoCapture(deviceId);
 }

 void Instance::Delegate::groupCallFinished(not_null<GroupCall*> call) {
@@ -699,18 +699,22 @@ void Instance::requestPermissionOrFail(Platform::PermissionType type, Fn<void()>
 }

 std::shared_ptr<tgcalls::VideoCaptureInterface> Instance::getVideoCapture(
-		QString deviceId) {
-	if (deviceId.isEmpty()) {
-		deviceId = Core::App().settings().callVideoInputDeviceId();
-	}
+		std::optional<QString> deviceId) {
 	if (auto result = _videoCapture.lock()) {
-		result->switchToDevice(deviceId.toStdString());
+		if (deviceId) {
+			result->switchToDevice((deviceId->isEmpty()
+				? Core::App().settings().callVideoInputDeviceId()
+				: *deviceId).toStdString());
+		}
 		return result;
 	}
+	const auto startDeviceId = (deviceId && !deviceId->isEmpty())
+		? *deviceId
+		: Core::App().settings().callVideoInputDeviceId();
 	auto result = std::shared_ptr<tgcalls::VideoCaptureInterface>(
 		tgcalls::VideoCaptureInterface::Create(
 			tgcalls::StaticThreads::getThreads(),
-			deviceId.toStdString()));
+			startDeviceId.toStdString()));
 	_videoCapture = result;
 	return result;
 }
--- a/Telegram/SourceFiles/calls/calls_instance.h
+++ b/Telegram/SourceFiles/calls/calls_instance.h
@@ -75,7 +75,8 @@ public:
 	bool activateCurrentCall(const QString &joinHash = QString());
 	bool minimizeCurrentActiveCall();
 	bool closeCurrentActiveCall();
-	[[nodiscard]] auto getVideoCapture(QString deviceId = QString())
+	[[nodiscard]] auto getVideoCapture(
+		std::optional<QString> deviceId = std::nullopt)
 		-> std::shared_ptr<tgcalls::VideoCaptureInterface>;
 	void requestPermissionsOrFail(Fn<void()> onSuccess, bool video = true);

--- a/Telegram/SourceFiles/calls/calls_panel.cpp
+++ b/Telegram/SourceFiles/calls/calls_panel.cpp
@@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_photo_media.h"
 #include "data/data_cloud_file.h"
 #include "data/data_changes.h"
+#include "calls/group/calls_group_common.h"
 #include "calls/calls_emoji_fingerprint.h"
 #include "calls/calls_signal_bars.h"
 #include "calls/calls_userpic.h"
@@ -24,7 +25,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
 #include "ui/widgets/shadow.h"
-#include "ui/widgets/window.h"
+#include "ui/widgets/rp_window.h"
+#include "ui/layers/layer_manager.h"
+#include "ui/layers/generic_box.h"
 #include "ui/image/image.h"
 #include "ui/text/format_values.h"
 #include "ui/wrap/fade_wrap.h"
@@ -44,6 +47,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "window/main_window.h"
 #include "app.h"
 #include "webrtc/webrtc_video_track.h"
+#include "webrtc/webrtc_media_devices.h"
 #include "styles/style_calls.h"
 #include "styles/style_chat.h"

@@ -57,6 +61,7 @@ namespace Calls {
 Panel::Panel(not_null<Call*> call)
 : _call(call)
 , _user(call->user())
+, _layerBg(std::make_unique<Ui::LayerManager>(widget()))
 #ifndef Q_OS_MAC
 , _controls(std::make_unique<Ui::Platform::TitleControls>(
 	widget(),
@@ -67,6 +72,7 @@ Panel::Panel(not_null<Call*> call)
 , _answerHangupRedial(widget(), st::callAnswer, &st::callHangup)
 , _decline(widget(), object_ptr<Ui::CallButton>(widget(), st::callHangup))
 , _cancel(widget(), object_ptr<Ui::CallButton>(widget(), st::callCancel))
+, _screencast(widget(), st::callScreencastOn, &st::callScreencastOff)
 , _camera(widget(), st::callCameraMute, &st::callCameraUnmute)
 , _mute(widget(), st::callMicrophoneMute, &st::callMicrophoneUnmute)
 , _name(widget(), st::callName)
@@ -116,9 +122,7 @@ void Panel::replaceCall(not_null<Call*> call) {
 void Panel::initWindow() {
 	window()->setAttribute(Qt::WA_OpaquePaintEvent);
 	window()->setAttribute(Qt::WA_NoSystemBackground);
-	window()->setWindowIcon(
-		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
-	window()->setTitle(u" "_q);
+	window()->setTitle(_user->name);
 	window()->setTitleStyle(st::callTitle);

 	window()->events(
@@ -207,9 +211,28 @@ void Panel::initControls() {
 			_call->setMuted(!_call->muted());
 		}
 	});
+	_screencast->setClickedCallback([=] {
+		if (!_call) {
+			return;
+		} else if (!Webrtc::DesktopCaptureAllowed()) {
+			if (auto box = Group::ScreenSharingPrivacyRequestBox()) {
+				_layerBg->showBox(std::move(box));
+			}
+		} else if (const auto source = Webrtc::UniqueDesktopCaptureSource()) {
+			if (_call->isSharingScreen()) {
+				_call->toggleScreenSharing(std::nullopt);
+			} else {
+				chooseSourceAccepted(*source, false);
+			}
+		} else {
+			Group::Ui::DesktopCapture::ChooseSource(this);
+		}
+	});
 	_camera->setClickedCallback([=] {
-		if (_call) {
-			_call->switchVideoOutgoing();
+		if (!_call) {
+			return;
+		} else {
+			_call->toggleCameraSharing(!_call->isSharingCamera());
 		}
 	});

@@ -220,7 +243,8 @@ void Panel::initControls() {
 	});
 	_updateOuterRippleTimer.setCallback([this] {
 		if (_call) {
-			_answerHangupRedial->setOuterValue(_call->getWaitingSoundPeakValue());
+			_answerHangupRedial->setOuterValue(
+				_call->getWaitingSoundPeakValue());
 		} else {
 			_answerHangupRedial->setOuterValue(0.);
 			_updateOuterRippleTimer.cancel();
@@ -262,6 +286,40 @@ void Panel::setIncomingSize(QSize size) {
 	showControls();
 }

+QWidget *Panel::chooseSourceParent() {
+	return window().get();
+}
+
+QString Panel::chooseSourceActiveDeviceId() {
+	return _call->screenSharingDeviceId();
+}
+
+bool Panel::chooseSourceActiveWithAudio() {
+	return false;// _call->screenSharingWithAudio();
+}
+
+bool Panel::chooseSourceWithAudioSupported() {
+//#ifdef Q_OS_WIN
+//	return true;
+//#else // Q_OS_WIN
+	return false;
+//#endif // Q_OS_WIN
+}
+
+rpl::lifetime &Panel::chooseSourceInstanceLifetime() {
+	return lifetime();
+}
+
+void Panel::chooseSourceAccepted(
+		const QString &deviceId,
+		bool withAudio) {
+	_call->toggleScreenSharing(deviceId/*, withAudio*/);
+}
+
+void Panel::chooseSourceStop() {
+	_call->toggleScreenSharing(std::nullopt);
+}
+
 void Panel::refreshIncomingGeometry() {
 	Expects(_call != nullptr);
 	Expects(_incoming != nullptr);
@@ -334,12 +392,19 @@ void Panel::reinitWithCall(Call *call) {
 	}, _callLifetime);

 	_call->videoOutgoing()->stateValue(
-	) | rpl::start_with_next([=](Webrtc::VideoState state) {
-		const auto active = (state == Webrtc::VideoState::Active);
-		_camera->setProgress(active ? 0. : 1.);
-		_camera->setText(active
-			? tr::lng_call_stop_video()
-			: tr::lng_call_start_video());
+	) | rpl::start_with_next([=] {
+		{
+			const auto active = _call->isSharingCamera();
+			_camera->setProgress(active ? 0. : 1.);
+			_camera->setText(active
+				? tr::lng_call_stop_video()
+				: tr::lng_call_start_video());
+		}
+		{
+			const auto active = _call->isSharingScreen();
+			_screencast->setProgress(active ? 0. : 1.);
+			_screencast->setText(tr::lng_call_screencast());
+		}
 	}, _callLifetime);

 	_call->stateValue(
@@ -648,9 +713,11 @@ void Panel::updateControlsGeometry() {
 		updateOutgoingVideoBubbleGeometry();
 	}

-	auto bothWidth = _answerHangupRedial->width() + st::callCancel.button.width;
-	_decline->moveToLeft((widget()->width() - bothWidth) / 2, _buttonsTop);
-	_cancel->moveToLeft((widget()->width() - bothWidth) / 2, _buttonsTop);
+	auto threeWidth = _answerHangupRedial->width()
+		+ st::callCancel.button.width
+		- _screencast->width();
+	_decline->moveToLeft((widget()->width() - threeWidth) / 2, _buttonsTop);
+	_cancel->moveToLeft((widget()->width() - threeWidth) / 2, _buttonsTop);

 	updateHangupGeometry();
 }
@@ -672,16 +739,19 @@ void Panel::updateOutgoingVideoBubbleGeometry() {
 }

 void Panel::updateHangupGeometry() {
-	auto singleWidth = _answerHangupRedial->width();
-	auto bothWidth = singleWidth + st::callCancel.button.width;
-	auto rightFrom = (widget()->width() - bothWidth) / 2;
-	auto rightTo = (widget()->width() - singleWidth) / 2;
+	auto twoWidth = _answerHangupRedial->width() + _screencast->width();
+	auto threeWidth = twoWidth + st::callCancel.button.width;
+	auto rightFrom = (widget()->width() - threeWidth) / 2;
+	auto rightTo = (widget()->width() - twoWidth) / 2;
 	auto hangupProgress = _hangupShownProgress.value(_hangupShown ? 1. : 0.);
 	auto hangupRight = anim::interpolate(rightFrom, rightTo, hangupProgress);
 	_answerHangupRedial->moveToRight(hangupRight, _buttonsTop);
 	_answerHangupRedial->setProgress(hangupProgress);
 	_mute->moveToRight(hangupRight - _mute->width(), _buttonsTop);
-	_camera->moveToLeft(hangupRight - _mute->width(), _buttonsTop);
+	_screencast->moveToLeft(hangupRight - _mute->width(), _buttonsTop);
+	_camera->moveToLeft(
+		hangupRight - _mute->width() + _screencast->width(),
+		_buttonsTop);
 }

 void Panel::updateStatusGeometry() {
@@ -711,7 +781,7 @@ void Panel::handleClose() {
 	}
 }

-not_null<Ui::Window*> Panel::window() const {
+not_null<Ui::RpWindow*> Panel::window() const {
 	return _window.window();
 }

--- a/Telegram/SourceFiles/calls/calls_panel.h
+++ b/Telegram/SourceFiles/calls/calls_panel.h
@@ -11,6 +11,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "base/timer.h"
 #include "base/object_ptr.h"
 #include "calls/calls_call.h"
+#include "calls/group/ui/desktop_capture_choose_source.h"
 #include "ui/effects/animations.h"
 #include "ui/gl/gl_window.h"
 #include "ui/rp_widget.h"
@@ -25,12 +26,13 @@ class CloudImageView;
 namespace Ui {
 class IconButton;
 class CallButton;
+class LayerManager;
 class FlatLabel;
 template <typename Widget>
 class FadeWrap;
 template <typename Widget>
 class PaddingWrap;
-class Window;
+class RpWindow;
 namespace GL {
 enum class Backend;
 } // namespace GL
@@ -50,7 +52,7 @@ class Userpic;
 class SignalBars;
 class VideoBubble;

-class Panel final {
+class Panel final : private Group::Ui::DesktopCapture::ChooseSourceDelegate {
 public:
 	Panel(not_null<Call*> call);
 	~Panel();
@@ -61,7 +63,17 @@ public:
 	void replaceCall(not_null<Call*> call);
 	void closeBeforeDestroy();

-	rpl::lifetime &lifetime();
+	QWidget *chooseSourceParent() override;
+	QString chooseSourceActiveDeviceId() override;
+	bool chooseSourceActiveWithAudio() override;
+	bool chooseSourceWithAudioSupported() override;
+	rpl::lifetime &chooseSourceInstanceLifetime() override;
+	void chooseSourceAccepted(
+		const QString &deviceId,
+		bool withAudio) override;
+	void chooseSourceStop() override;
+
+	[[nodiscard]] rpl::lifetime &lifetime();

 private:
 	class Incoming;
@@ -73,7 +85,7 @@ private:
 		Redial,
 	};

-	[[nodiscard]] not_null<Ui::Window*> window() const;
+	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
 	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;

 	void paint(QRect clip);
@@ -110,6 +122,7 @@ private:
 	not_null<UserData*> _user;

 	Ui::GL::Window _window;
+	const std::unique_ptr<Ui::LayerManager> _layerBg;
 	std::unique_ptr<Incoming> _incoming;

 #ifndef Q_OS_MAC
@@ -128,6 +141,7 @@ private:
 	bool _outgoingPreviewInBody = false;
 	std::optional<AnswerHangupRedialState> _answerHangupRedialState;
 	Ui::Animations::Simple _hangupShownProgress;
+	object_ptr<Ui::CallButton> _screencast;
 	object_ptr<Ui::CallButton> _camera;
 	object_ptr<Ui::CallButton> _mute;
 	object_ptr<Ui::FlatLabel> _name;
--- a/Telegram/SourceFiles/calls/calls_video_incoming.cpp
+++ b/Telegram/SourceFiles/calls/calls_video_incoming.cpp
@@ -223,7 +223,6 @@ void Panel::Incoming::RendererGL::paint(
 		Assert(data.format == Webrtc::FrameFormat::YUV420);
 		Assert(!data.yuv420->size.isEmpty());
 		const auto yuv = data.yuv420;
-		const auto format = Ui::GL::CurrentSingleComponentFormat();

 		f.glActiveTexture(GL_TEXTURE0);
 		_textures.bind(f, 1);
@@ -231,8 +230,8 @@ void Panel::Incoming::RendererGL::paint(
 			f.glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->size,
 				_lumaSize,
 				yuv->y.stride,
@@ -244,8 +243,8 @@ void Panel::Incoming::RendererGL::paint(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				_chromaSize,
 				yuv->u.stride,
@@ -256,8 +255,8 @@ void Panel::Incoming::RendererGL::paint(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				_chromaSize,
 				yuv->v.stride,
--- a/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_choose_join_as.cpp
@@ -335,7 +335,6 @@ void ChooseJoinAsProcess::start(
 	}, _request->lifetime);

 	const auto finish = [=](JoinInfo info) {
-		const auto peer = _request->peer;
 		const auto done = std::move(_request->done);
 		const auto box = _request->box;
 		_request = nullptr;
--- a/Telegram/SourceFiles/calls/group/calls_group_call.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.cpp
@@ -3049,10 +3049,6 @@ void GroupCall::setCurrentAudioDevice(bool input, const QString &deviceId) {
 	}
 }

-void GroupCall::setCurrentVideoDevice(const QString &deviceId) {
-	_mediaDevices->switchToVideoInput(deviceId);
-}
-
 void GroupCall::toggleMute(const Group::MuteRequest &data) {
 	if (data.locallyOnly) {
 		applyParticipantLocally(data.peer, data.mute, std::nullopt);
--- a/Telegram/SourceFiles/calls/group/calls_group_call.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_call.h
@@ -370,7 +370,6 @@ public:
 	}

 	void setCurrentAudioDevice(bool input, const QString &deviceId);
-	void setCurrentVideoDevice(const QString &deviceId);
 	[[nodiscard]] bool isSharingScreen() const;
 	[[nodiscard]] rpl::producer<bool> isSharingScreenValue() const;
 	[[nodiscard]] bool isScreenPaused() const;
--- a/Telegram/SourceFiles/calls/group/calls_group_common.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.cpp
@@ -0,0 +1,53 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#include "calls/group/calls_group_common.h"
+
+#include "base/platform/base_platform_info.h"
+#include "ui/widgets/labels.h"
+#include "ui/layers/generic_box.h"
+#include "ui/text/text_utilities.h"
+#include "lang/lang_keys.h"
+#include "styles/style_layers.h"
+#include "styles/style_calls.h"
+
+namespace Calls::Group {
+
+object_ptr<Ui::GenericBox> ScreenSharingPrivacyRequestBox() {
+#ifdef Q_OS_MAC
+	if (!Platform::IsMac10_15OrGreater()) {
+		return { nullptr };
+	}
+	return Box([=](not_null<Ui::GenericBox*> box) {
+		box->addRow(
+			object_ptr<Ui::FlatLabel>(
+				box.get(),
+				rpl::combine(
+					tr::lng_group_call_mac_screencast_access(),
+					tr::lng_group_call_mac_recording()
+				) | rpl::map([](QString a, QString b) {
+					auto result = Ui::Text::RichLangValue(a);
+					result.append("\n\n").append(Ui::Text::RichLangValue(b));
+					return result;
+				}),
+				st::groupCallBoxLabel),
+			style::margins(
+				st::boxRowPadding.left(),
+				st::boxPadding.top(),
+				st::boxRowPadding.right(),
+				st::boxPadding.bottom()));
+		box->addButton(tr::lng_group_call_mac_settings(), [=] {
+			Platform::OpenDesktopCapturePrivacySettings();
+		});
+		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
+	});
+#else // Q_OS_MAC
+	return { nullptr };
+#endif // Q_OS_MAC
+}
+
+} // namespace Calls::Group
--- a/Telegram/SourceFiles/calls/group/calls_group_common.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_common.h
@@ -7,8 +7,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #pragma once

+#include "base/object_ptr.h"
+
 class UserData;

+namespace Ui {
+class GenericBox;
+} // namespace Ui
+
 namespace Calls::Group {

 constexpr auto kDefaultVolume = 10000;
@@ -78,4 +84,6 @@ constexpr inline bool is_flag_type(StickedTooltip) {
 }
 using StickedTooltips = base::flags<StickedTooltip>;

+[[nodiscard]] object_ptr<Ui::GenericBox> ScreenSharingPrivacyRequestBox();
+
 } // namespace Calls::Group
--- a/Telegram/SourceFiles/calls/group/calls_group_members.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.cpp
@@ -46,9 +46,16 @@ constexpr auto kUserpicBlurRadius = 8;

 using Row = MembersRow;

+[[nodiscard]] int VideoParticipantsLimit(not_null<Main::Session*> session) {
+	return int(session->account().appConfig().get<double>(
+		"groupcall_video_participants_max",
+		30.));
+}
+
 void SetupVideoPlaceholder(
 		not_null<Ui::RpWidget*> widget,
-		not_null<PeerData*> chat) {
+		not_null<PeerData*> chat,
+		int limit) {
 	struct State {
 		QImage blurred;
 		QImage rounded;
@@ -128,9 +135,6 @@ void SetupVideoPlaceholder(
 			size.width());

 		const auto skip = st::groupCallVideoLargeSkip;
-		const auto limit = chat->session().account().appConfig().get<double>(
-			"groupcall_video_participants_max",
-			30.);
 		p.setPen(st::groupCallVideoTextFg);
 		const auto text = QRect(
 			skip,
@@ -145,6 +149,22 @@ void SetupVideoPlaceholder(
 	}, widget->lifetime());
 }

+void SetupVideoAboutLimit(
+		not_null<Ui::RpWidget*> widget,
+		not_null<Main::Session*> session,
+		int limit) {
+	const auto label = Ui::CreateChild<Ui::FlatLabel>(
+		widget.get(),
+		tr::lng_group_call_over_limit(lt_count, rpl::single(limit * 1.)),
+		st::groupCallVideoLimitLabel);
+	widget->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		label->resizeToWidth(width);
+		label->moveToLeft(0, st::normalFont->height / 3);
+		widget->resize(width, label->height() + st::normalFont->height);
+	}, label->lifetime());
+}
+
 } // namespace

 class Members::Controller final
@@ -1036,12 +1056,16 @@ void Members::Controller::rowPaintIcon(
 		return;
 	}
 	const auto narrow = (state.style == MembersRowStyle::Narrow);
-	if (!narrow && state.invited) {
-		st::groupCallMemberInvited.paintInCenter(
-			p,
-			QRect(
-				rect.topLeft() + st::groupCallMemberInvitedPosition,
-				st::groupCallMemberInvited.size()));
+	if (state.invited) {
+		if (narrow) {
+			st::groupCallNarrowInvitedIcon.paintInCenter(p, rect);
+		} else {
+			st::groupCallMemberInvited.paintInCenter(
+				p,
+				QRect(
+					rect.topLeft() + st::groupCallMemberInvitedPosition,
+					st::groupCallMemberInvited.size()));
+		}
 		return;
 	}
 	const auto video = (state.style == MembersRowStyle::Video);
@@ -1171,21 +1195,6 @@ int Members::Controller::rowPaintStatusIcon(
 			: state.raisedHand
 			? st::groupCallMemberInactiveStatus->c
 			: iconColor;
-		const auto color = (state.speaking == 1. && !state.mutedByMe)
-			? st::groupCallMemberActiveStatus->c
-			: (state.speaking == 0.
-				? (state.active == 1.
-					? st::groupCallMemberNotJoinedStatus->c
-					: (state.active == 0.
-						? (state.muted == 1.
-							? (state.raisedHand
-								? st::groupCallMemberInactiveStatus->c
-								: st::groupCallMemberNotJoinedStatus->c)
-							: (state.muted == 0.
-								? st::groupCallMemberNotJoinedStatus->c
-								: other))
-						: other))
-				: other);
 		if (camera) {
 			st::groupCallNarrowCameraIcon.paint(p, x, y, outerWidth, other);
 			x += st::groupCallNarrowCameraIcon.width();
@@ -1616,6 +1625,7 @@ Members::Members(
 	object_ptr<Ui::VerticalLayout>(_scroll.data())))
 , _videoWrap(_layout->add(object_ptr<Ui::RpWidget>(_layout.get())))
 , _videoPlaceholder(std::make_unique<Ui::RpWidget>(_videoWrap.get()))
+, _videoAboutLimit(std::make_unique<Ui::RpWidget>(_videoWrap.get()))
 , _viewport(
 	std::make_unique<Viewport>(
 		_videoWrap.get(),
@@ -1853,6 +1863,7 @@ void Members::trackViewportGeometry() {
 	_scroll->scrollTopValue(
 	) | rpl::skip(1) | rpl::start_with_next(move, _viewport->lifetime());

+	const auto videoLimit = VideoParticipantsLimit(&_call->peer()->session());
 	rpl::combine(
 		_layout->widthValue(),
 		_call->hasNotShownVideoValue()
@@ -1861,15 +1872,52 @@ void Members::trackViewportGeometry() {
 		_videoPlaceholder->setGeometry(0, 0, width, height);
 	}, _videoPlaceholder->lifetime());

-	SetupVideoPlaceholder(_videoPlaceholder.get(), _call->peer());
+	SetupVideoPlaceholder(_videoPlaceholder.get(), _call->peer(), videoLimit);
+
+	_layout->widthValue(
+	) | rpl::start_with_next([=](int width) {
+		_videoAboutLimit->resizeToWidth(width);
+	}, _videoAboutLimit->lifetime());
+
+	using namespace rpl::mappers;
+	auto aboutLimitRelevant = fullCountValue(
+	) | rpl::map(
+		_1 > videoLimit
+	) | rpl::distinct_until_changed();
+	auto aboutLimitShown = rpl::combine(
+		std::move(aboutLimitRelevant),
+		_call->canManageValue(),
+		_1 && _2);
+
+	SetupVideoAboutLimit(
+		_videoAboutLimit.get(),
+		&_call->peer()->session(),
+		videoLimit);

 	rpl::combine(
 		_videoPlaceholder->heightValue(),
-		_viewport->fullHeightValue()
-	) | rpl::start_with_next([=](int placeholder, int viewport) {
+		_viewport->fullHeightValue(),
+		_videoAboutLimit->heightValue(),
+		std::move(aboutLimitShown)
+	) | rpl::start_with_next([=](
+			int placeholder,
+			int viewport,
+			int aboutLimit,
+			bool aboutLimitShown) {
+		if (placeholder > 0 || viewport <= 0 || !aboutLimitShown) {
+			aboutLimitShown = false;
+		}
+
+		// This call may update _videoAboutLimit->height() :(
+		_videoAboutLimit->setVisible(aboutLimitShown);
+
+		_videoAboutLimit->move(0, viewport);
 		_videoWrap->resize(
 			_videoWrap->width(),
-			std::max(placeholder, viewport));
+			std::max(
+				placeholder,
+				(viewport
+					+ (aboutLimitShown ? _videoAboutLimit->height() : 0))));
 		if (viewport > 0) {
 			move();
 			resize();
--- a/Telegram/SourceFiles/calls/group/calls_group_members.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_members.h
@@ -102,6 +102,7 @@ private:
 	not_null<Ui::VerticalLayout*> _layout;
 	const not_null<Ui::RpWidget*> _videoWrap;
 	const std::unique_ptr<Ui::RpWidget> _videoPlaceholder;
+	const std::unique_ptr<Ui::RpWidget> _videoAboutLimit;
 	std::unique_ptr<Viewport> _viewport;
 	rpl::variable<Ui::RpWidget*> _addMemberButton = nullptr;
 	RpWidget *_topSkip = nullptr;
--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp
@@ -25,7 +25,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/tooltip.h"
-#include "ui/widgets/window.h"
+#include "ui/widgets/rp_window.h"
 #include "ui/chat/group_call_bar.h"
 #include "ui/layers/layer_manager.h"
 #include "ui/layers/generic_box.h"
@@ -70,10 +70,6 @@ constexpr auto kRecordingOpacity = 0.6;
 constexpr auto kStartNoConfirmation = TimeId(10);
 constexpr auto kControlsBackgroundOpacity = 0.8;
 constexpr auto kOverrideActiveColorBgAlpha = 172;
-constexpr auto kMicrophoneTooltipAfterLoudCount = 3;
-constexpr auto kDropLoudAfterQuietCount = 5;
-constexpr auto kMicrophoneTooltipLevelThreshold = 0.2;
-constexpr auto kMicrophoneTooltipCheckInterval = crl::time(500);

 } // namespace

@@ -87,49 +83,6 @@ struct Panel::ControlsBackgroundNarrow {
 	Ui::RpWidget blocker;
 };

-class Panel::MicLevelTester final {
-public:
-	explicit MicLevelTester(Fn<void()> show);
-
-	[[nodiscard]] bool showTooltip() const;
-
-private:
-	void check();
-
-	Fn<void()> _show;
-	base::Timer _timer;
-	Webrtc::AudioInputTester _tester;
-	int _loudCount = 0;
-	int _quietCount = 0;
-
-};
-
-Panel::MicLevelTester::MicLevelTester(Fn<void()> show)
-: _show(std::move(show))
-, _timer([=] { check(); })
-, _tester(
-		Core::App().settings().callAudioBackend(),
-		Core::App().settings().callInputDeviceId()) {
-	_timer.callEach(kMicrophoneTooltipCheckInterval);
-}
-
-bool Panel::MicLevelTester::showTooltip() const {
-	return (_loudCount >= kMicrophoneTooltipAfterLoudCount);
-}
-
-void Panel::MicLevelTester::check() {
-	const auto level = _tester.getAndResetLevel();
-	if (level >= kMicrophoneTooltipLevelThreshold) {
-		_quietCount = 0;
-		if (++_loudCount >= kMicrophoneTooltipAfterLoudCount) {
-			_show();
-		}
-	} else if (_loudCount > 0 && ++_quietCount >= kDropLoudAfterQuietCount) {
-		_quietCount = 0;
-		_loudCount = 0;
-	}
-}
-
 Panel::Panel(not_null<GroupCall*> call)
 : _call(call)
 , _peer(call->peer())
@@ -289,8 +242,6 @@ void Panel::chooseSourceStop() {
 void Panel::initWindow() {
 	window()->setAttribute(Qt::WA_OpaquePaintEvent);
 	window()->setAttribute(Qt::WA_NoSystemBackground);
-	window()->setWindowIcon(
-		QIcon(QPixmap::fromImage(Image::Empty()->original(), Qt::ColorOnly)));
 	window()->setTitleStyle(st::groupCallTitle);

 	subscribeToPeerChanges();
@@ -1157,35 +1108,9 @@ void Panel::refreshTopButton() {
 }

 void Panel::screenSharingPrivacyRequest() {
-#ifdef Q_OS_MAC
-	if (!Platform::IsMac10_15OrGreater()) {
-		return;
+	if (auto box = ScreenSharingPrivacyRequestBox()) {
+		_layerBg->showBox(std::move(box));
 	}
-	const auto requestInputMonitoring = Platform::IsMac10_15OrGreater();
-	_layerBg->showBox(Box([=](not_null<Ui::GenericBox*> box) {
-		box->addRow(
-			object_ptr<Ui::FlatLabel>(
-				box.get(),
-				rpl::combine(
-					tr::lng_group_call_mac_screencast_access(),
-					tr::lng_group_call_mac_recording()
-				) | rpl::map([](QString a, QString b) {
-					auto result = Ui::Text::RichLangValue(a);
-					result.append("\n\n").append(Ui::Text::RichLangValue(b));
-					return result;
-				}),
-				st::groupCallBoxLabel),
-			style::margins(
-				st::boxRowPadding.left(),
-				st::boxPadding.top(),
-				st::boxRowPadding.right(),
-				st::boxPadding.bottom()));
-		box->addButton(tr::lng_group_call_mac_settings(), [=] {
-			Platform::OpenDesktopCapturePrivacySettings();
-		});
-		box->addButton(tr::lng_cancel(), [=] { box->closeBox(); });
-	}));
-#endif // Q_OS_MAC
 }

 void Panel::chooseShareScreenSource() {
@@ -2223,7 +2148,7 @@ bool Panel::handleClose() {
 	return false;
 }

-not_null<Ui::Window*> Panel::window() const {
+not_null<Ui::RpWindow*> Panel::window() const {
 	return _window.window();
 }

--- a/Telegram/SourceFiles/calls/group/calls_group_panel.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.h
@@ -63,6 +63,7 @@ class Members;
 class Viewport;
 enum class PanelMode;
 enum class StickedTooltip;
+class MicLevelTester;

 class Panel final : private Ui::DesktopCapture::ChooseSourceDelegate {
 public:
@@ -94,9 +95,8 @@ private:
 		Activated,
 		Discarded,
 	};
-	class MicLevelTester;

-	[[nodiscard]] not_null<Ui::Window*> window() const;
+	[[nodiscard]] not_null<Ui::RpWindow*> window() const;
 	[[nodiscard]] not_null<Ui::RpWidget*> widget() const;

 	[[nodiscard]] PanelMode mode() const;
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.cpp
@@ -53,6 +53,10 @@ namespace Calls::Group {
 namespace {

 constexpr auto kDelaysCount = 201;
+constexpr auto kMicrophoneTooltipAfterLoudCount = 3;
+constexpr auto kDropLoudAfterQuietCount = 5;
+constexpr auto kMicrophoneTooltipLevelThreshold = 0.2;
+constexpr auto kMicrophoneTooltipCheckInterval = crl::time(500);

 #ifdef Q_OS_MAC
 constexpr auto kCheckAccessibilityInterval = crl::time(500);
@@ -735,4 +739,31 @@ std::pair<Fn<void()>, rpl::lifetime> ShareInviteLinkAction(
 	return { std::move(callback), std::move(lifetime) };
 }

+MicLevelTester::MicLevelTester(Fn<void()> show)
+: _show(std::move(show))
+, _timer([=] { check(); })
+, _tester(
+	std::make_unique<Webrtc::AudioInputTester>(
+		Core::App().settings().callAudioBackend(),
+		Core::App().settings().callInputDeviceId())) {
+	_timer.callEach(kMicrophoneTooltipCheckInterval);
+}
+
+bool MicLevelTester::showTooltip() const {
+	return (_loudCount >= kMicrophoneTooltipAfterLoudCount);
+}
+
+void MicLevelTester::check() {
+	const auto level = _tester->getAndResetLevel();
+	if (level >= kMicrophoneTooltipLevelThreshold) {
+		_quietCount = 0;
+		if (++_loudCount >= kMicrophoneTooltipAfterLoudCount) {
+			_show();
+		}
+	} else if (_loudCount > 0 && ++_quietCount >= kDropLoudAfterQuietCount) {
+		_quietCount = 0;
+		_loudCount = 0;
+	}
+}
+
 } // namespace Calls::Group
--- a/Telegram/SourceFiles/calls/group/calls_group_settings.h
+++ b/Telegram/SourceFiles/calls/group/calls_group_settings.h
@@ -9,6 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 #include "ui/layers/generic_box.h"

+namespace Webrtc {
+class AudioInputTester;
+} // namespace Webrtc
+
 namespace Calls {
 class GroupCall;
 } // namespace Calls
@@ -24,4 +28,21 @@ void SettingsBox(
 	Fn<void(object_ptr<Ui::BoxContent>)> showBox,
 	Fn<void(QString)> showToast);

+class MicLevelTester final {
+public:
+	explicit MicLevelTester(Fn<void()> show);
+
+	[[nodiscard]] bool showTooltip() const;
+
+private:
+	void check();
+
+	Fn<void()> _show;
+	base::Timer _timer;
+	std::unique_ptr<Webrtc::AudioInputTester> _tester;
+	int _loudCount = 0;
+	int _quietCount = 0;
+
+};
+
 } // namespace Calls::Group
--- a/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_viewport_opengl.cpp
@@ -985,7 +985,6 @@ void Viewport::RendererGL::bindFrame(
 		program.argb32->setUniformValue("s_texture", GLint(0));
 	} else {
 		const auto yuv = data.yuv420;
-		const auto format = Ui::GL::CurrentSingleComponentFormat();
 		program.yuv420->bind();
 		f.glActiveTexture(GL_TEXTURE0);
 		tileData.textures.bind(f, 0);
@@ -993,8 +992,8 @@ void Viewport::RendererGL::bindFrame(
 			f.glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->size,
 				tileData.textureSize,
 				yuv->y.stride,
@@ -1007,8 +1006,8 @@ void Viewport::RendererGL::bindFrame(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				tileData.textureChromaSize,
 				yuv->u.stride,
@@ -1019,8 +1018,8 @@ void Viewport::RendererGL::bindFrame(
 		if (upload) {
 			uploadTexture(
 				f,
-				format,
-				format,
+				GL_ALPHA,
+				GL_ALPHA,
 				yuv->chromaSize,
 				tileData.textureChromaSize,
 				yuv->v.stride,
@@ -1365,19 +1364,33 @@ void Viewport::RendererGL::validateNoiseTexture(
 	if (_noiseTexture.created()) {
 		return;
 	}
-	const auto format = Ui::GL::CurrentSingleComponentFormat();
 	_noiseTexture.ensureCreated(f, GL_NEAREST, GL_REPEAT);
 	_noiseTexture.bind(f, 0);
+
+	// Rendering to GL_ALPHA is not supported.
 	f.glTexImage2D(
 		GL_TEXTURE_2D,
 		0,
-		format,
+		GL_R8,
 		kNoiseTextureSize,
 		kNoiseTextureSize,
 		0,
-		format,
+		GL_RED,
 		GL_UNSIGNED_BYTE,
 		nullptr);
+	if (f.glGetError() != GL_NO_ERROR) {
+		// Direct3D 9 doesn't support GL_R8 textures.
+		f.glTexImage2D(
+			GL_TEXTURE_2D,
+			0,
+			GL_RGB,
+			kNoiseTextureSize,
+			kNoiseTextureSize,
+			0,
+			GL_RGB,
+			GL_UNSIGNED_BYTE,
+			nullptr);
+	}

 	_noiseFramebuffer.ensureCreated(f);
 	_noiseFramebuffer.bind(f, 0);
@@ -1459,5 +1472,4 @@ void Viewport::RendererGL::validatePausedAnimation(
 		st::fadeWrapDuration);
 }

-
 } // namespace Calls::Group
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
John Preston	2d223b3a2d	Version 2.9: Add jemalloc submodule.	2021-07-30 21:26:05 +03:00
John Preston	f3ab01604c	Version 2.9: Fix build on Linux.	2021-07-30 21:03:49 +03:00
John Preston	66bcc20f58	Fix requesting screencast rights on macOS.	2021-07-30 20:45:00 +03:00
John Preston	d69a1d3cd9	Version 2.9: Updated changelog.	2021-07-30 18:21:54 +03:00
John Preston	ccc5aeb8f7	Version 2.9. - Reset your Two-Step Verification password even if you forgot your old password and don't have a recovery email. - To do this, you must be logged into your account. The reset takes 7 days and can be cancelled from any of your devices.	2021-07-30 17:35:30 +03:00
John Preston	5899d60363	Remove some legacy langs scripts.	2021-07-30 16:11:42 +03:00
John Preston	4f89216db0	Disable noise suppression by default.	2021-07-30 16:11:13 +03:00
John Preston	bd78bac4bf	Warn admins about many voice chat participants.	2021-07-30 16:06:27 +03:00
John Preston	b2e829904f	Add support for 1 month self-destruct messages.	2021-07-30 16:05:13 +03:00
John Preston	256546071b	Add ability to reset cloud password in 7 days.	2021-07-30 14:32:49 +03:00
John Preston	c100055fac	Allow sharing screen or window in one-on-one calls.	2021-07-30 00:40:25 +03:00
John Preston	ae30366cbf	Fix window move by title on macOS.	2021-07-29 15:30:22 +03:00
John Preston	663c99cc2d	Fix build on macOS.	2021-07-29 15:30:22 +03:00
Ilya Fedin	d986e70a89	Fix global menu on 64-bit systems with X11 When Wayland support for global menu was added (`0b86feeeb5`), X11 support was broken since QWindow::winId returns WId what is a quintptr that expands to uint32 on 32-bit and to uint64 on 64-bit, while AppMenu d-bus service accepts only uint32.	2021-07-28 23:41:36 +03:00
Ilya Fedin	1ebf27bfa1	Switch MainWindow to Ui::RpWindow	2021-07-28 18:05:39 +03:00
John Preston	4ef2d3b957	Fix crash in mosaic layout.	2021-07-28 17:34:39 +03:00
John Preston	868c494299	Extract Mosaic::Layout::AbstractMosaicLayout.	2021-07-28 17:00:46 +03:00
John Preston	4a86b172d4	Rename Ui::Window to Ui::RpWindow.	2021-07-28 16:24:11 +03:00
Ilya Fedin	f71ce9afdf	Fix dark titlebar on Windows 10 17763	2021-07-28 16:01:50 +03:00
John Preston	c170a86189	Fix build on Windows.	2021-07-28 15:59:42 +03:00
John Preston	116a768fde	Don't use MTP* for Message flags.	2021-07-28 15:28:17 +03:00
John Preston	22e77bf3af	Don't use MTP* for ReplyMarkup flags.	2021-07-28 15:16:23 +03:00
John Preston	bbbcd37b8f	Provide latency values to AEC.	2021-07-28 15:16:23 +03:00
John Preston	bc707320f8	Add 'invited' icon in narrow voice chat members list.	2021-07-28 15:16:23 +03:00
23rd	000911ecfa	Updated section icon for shared GIFs.	2021-07-27 20:40:44 +03:00
23rd	479611f6df	Removed ui_getPeerForMouseAction.	2021-07-27 02:50:08 +03:00
23rd	dcc8a64d37	Removed App::sendBotCommand.	2021-07-27 02:50:08 +03:00
23rd	a030907598	Refactored sending bot commands.	2021-07-27 02:50:08 +03:00
23rd	34cac3092f	Moved utils for sending bot commands to separated file.	2021-07-27 02:50:08 +03:00
23rd	05f1caf944	Removed App::searchByHashtag from facades.	2021-07-27 02:18:49 +03:00
23rd	93bcd90fd4	Provided more context for click handlers.	2021-07-27 02:18:49 +03:00
23rd	7c8b1cd5b1	Disabled forced session switching when closing PiP. Regression was introduced in `7decf68122`.	2021-07-26 18:54:58 +03:00
23rd	82165bec5e	Replaced MainWidget::replyToItem with history element delegate.	2021-07-26 17:39:18 +03:00
23rd	65aecf16a6	Removed App::wnd() from HistoryView::Message.	2021-07-26 17:38:52 +03:00
23rd	ca83b8a8c6	Removed App::wnd() from HistoryView::Contact.	2021-07-26 17:38:52 +03:00
23rd	024bb5e54f	Moved App::formatPhone to td_ui.	2021-07-26 17:38:51 +03:00
23rd	a14f2144e1	Removed layout.cpp/h.	2021-07-26 17:38:51 +03:00
23rd	c6071d1148	Moved generic document preview info to separated file.	2021-07-26 17:38:51 +03:00
23rd	6e2f8eb9a7	Moved text selection utils to td_ui.	2021-07-26 17:38:51 +03:00
23rd	793f748d2e	Replaced overview and inline mosaic layouts with new mosaic layout.	2021-07-26 17:38:51 +03:00
23rd	bb404a38d3	Merged mosaic layouts from overview and inline to td_ui generic class.	2021-07-26 17:38:51 +03:00
23rd	c82006c6f8	Moved position info from ItemBases to AbstractLayoutItem.	2021-07-26 17:38:51 +03:00
23rd	2256482ae0	Moved layout utils to td_ui.	2021-07-26 17:38:51 +03:00
23rd	d11e756381	Detached abstract part of LayoutItemBase and moved to td_ui.	2021-07-26 17:38:51 +03:00
John Preston	a128c16f59	Define 'KHRONOS_STATIC' globally.	2021-07-26 16:23:41 +03:00
John Preston	48207102ce	Beta version 2.8.13. - Fix crash in messages animation. - Save GIFs from context menu in channel comments.	2021-07-23 23:22:08 +03:00
23rd	2d354f8777	Added ability to save GIFs from context menu in sections. Fixed #8739.	2021-07-23 22:05:23 +03:00
John Preston	b27dc4ef8d	Fix crash in messages animation.	2021-07-23 21:41:43 +03:00
John Preston	99505b4ee2	Beta version 2.8.12: Fix build on Linux.	2021-07-23 20:42:24 +03:00
John Preston	245909e381	Beta version 2.8.12: Prune icon cache on Linux.	2021-07-23 19:39:31 +03:00
John Preston	0a545589ce	Beta version 2.8.12: Fix build on macOS.	2021-07-23 19:36:47 +03:00
John Preston	4ec764bb57	Beta version 2.8.12. - Change the default chat background. - Add GIFs overview section in chats. - Add a simple new messages animation. - Use modern Telegram application icon. - Use Direct3D 11 by default on Windows. - Fix Direct3D acceleration on basic Windows 7 setup.	2021-07-23 15:46:25 +03:00
23rd	9b6ab6e137	Fixed date badge in Shared GIFs section.	2021-07-23 15:42:17 +03:00
23rd	73bb1382b1	Replaced MatrixRowShift with layout utils.	2021-07-23 15:42:17 +03:00
23rd	a153059b38	Added ability to unload not visible GIFs as heavy parts in overview.	2021-07-23 15:42:17 +03:00
23rd	039ffd3d34	Copied layout items mosaic drawing for overview layout.	2021-07-23 15:42:17 +03:00
23rd	abdd2fa99b	Added ability to force open media viewer from overview layout.	2021-07-23 15:42:17 +03:00
23rd	b366c27a0c	Added to Overview::Layout::Delegate ability to request repaint item.	2021-07-23 15:42:17 +03:00
23rd	1fa71b6569	Copied GIF Layout from inline bots results to overview.	2021-07-23 15:42:17 +03:00
23rd	81c39af122	Replaced mosaic drawing in InlineBots::Layout::Inner.	2021-07-23 15:42:17 +03:00
23rd	9699aeb1cd	Slightly simplified ChatHelpers::GifsListWidget.	2021-07-23 15:42:17 +03:00
23rd	85ce179f58	Added layout utils file.	2021-07-23 15:42:17 +03:00
23rd	c4d8d52aed	Replaced mosaic drawing in ChatHelpers::GifsListWidget.	2021-07-23 15:42:17 +03:00
23rd	812f5d4311	Modernized code style of InlineBots::Bots::MosaicLayout.	2021-07-23 15:42:17 +03:00
23rd	34d2d7bcba	Moved layout items mosaic drawing to separate file.	2021-07-23 15:42:17 +03:00
c0re100	842a89d2c7	Add GIFs shared media section	2021-07-23 15:42:17 +03:00
John Preston	565877630f	Dither default background to avoid color banding.	2021-07-23 15:42:17 +03:00
John Preston	8f478b86ee	Change default wallpaper.	2021-07-23 15:42:17 +03:00
John Preston	9943f8a093	Use custom 'gpu_driver_bug_list.json'.	2021-07-23 15:42:17 +03:00
John Preston	c0f8e68f5d	Don't use CurrentSingleComponentFormat. Fix noise in voice chat blur in OpenGL ES (ANGLE).	2021-07-23 15:42:16 +03:00
John Preston	92d9ebc9f3	Fix Direct3D 11 ANGLE backend colors issue.	2021-07-23 15:42:16 +03:00
John Preston	530aae4bdb	Fix crash in inline bots results.	2021-07-23 15:42:16 +03:00
23rd	e1ff230547	Added info for empty section of scheduled messages.	2021-07-23 15:42:16 +03:00
23rd	95a896004f	Added bubble widget for empty list info in modern history view list.	2021-07-23 15:42:16 +03:00
John Preston	87ca2c891a	Update Windows taskbar icon in new version.	2021-07-20 20:21:21 +03:00
John Preston	3a26644fa2	Fix new messages animation in sections.	2021-07-20 20:21:20 +03:00
John Preston	7e11966766	Fix d3dcompiler_47.dll loading on 64 bit build.	2021-07-20 20:21:20 +03:00
John Preston	c1c4314e52	Pack compiler to portable / store version.	2021-07-20 19:30:17 +03:00
23rd	a6dbcdad54	Disabled auto-closing section of scheduled messages after 'Send Now'.	2021-07-20 19:30:00 +03:00
23rd	3dc73417e9	Fixed some bugs in EditCaptionBox. Fixed checkbox display in some cases. Fixed editing of album items. Regression was introduced in `7e83088a84`.	2021-07-20 19:30:00 +03:00
John Preston	1ce66e5198	Pack and deploy d3dcompiler_47.dll.	2021-07-20 17:10:23 +03:00
Christian Hesse	6e90d6ae53	Add loading of custom shipped d3dcompiler_47.dll.	2021-07-20 15:41:49 +03:00
John Preston	5910c0ae30	Fix build on Windows.	2021-07-20 14:28:18 +03:00
23rd	2de0b79b4e	Fixed overlapping emoji suggestions in Replies section.	2021-07-20 12:20:31 +03:00
23rd	cba0ebce6e	Fixed size of animated preview in boxes.	2021-07-20 12:20:30 +03:00
John Preston	773912f586	Apply local / server comment updates together.	2021-07-20 12:20:22 +03:00
John Preston	c789349b24	Support add item animation in ListWidget (sections).	2021-07-20 12:20:22 +03:00
John Preston	7bbc4b7191	Add basic new messages animation.	2021-07-20 12:20:22 +03:00
John Preston	551732738b	Update app icon.	2021-07-20 12:19:56 +03:00
Ilya Fedin	c5867e2293	Fix build with clang	2021-07-20 10:34:03 +03:00
Ilya Fedin	46d5fc1fa0	Allow to build with generators other than Xcode on mac	2021-07-20 10:27:40 +03:00
Christian Hesse	b922839490	re-compress preview image The preview image takes some time to load, just re-compressing it can save about 13% of data without changing the result.	2021-07-20 10:26:35 +03:00
Ilya Fedin	4b82a56270	Remove old instructions & patches they referred to (& rename instructions to the actual state) Old instruction names were from the time when tdesktop used GYP that had MSVC, XCode and CMake backends. But tdesktop uses CMake now, so these names are no longer correct.	2021-07-20 09:50:57 +03:00
Christian Hesse	b2c762e974	Set (group) call window icon.	2021-07-20 00:15:04 +04:00
Ilya Fedin	0a4b8fc7f6	Always use QLibrary for gtk to avoid confusing dynamic linker	2021-07-19 22:57:07 +03:00
Ilya Fedin	087fbe89ce	Add additional checks to NotificationData::setImage	2021-07-19 22:56:38 +03:00
Ilya Fedin	3e8912a53f	Remove reference to non-existing linux_mpris_support from CMakeFiles.txt	2021-07-19 22:56:14 +03:00
Ilya Fedin	dc81f9eeaf	Remove SetWatchingMediaKeys Since SPMediaKeyTap has been removed on Mac, Linux is the only platform where this function is implemented, but that's not really needed due to MPRIS support, so SetWatchingMediaKeys can be dropped entirely	2021-07-19 22:56:14 +03:00
Ilya Fedin	49fed41dfa	Use RegisterUrlScheme from lib_base	2021-07-19 22:55:57 +03:00
Ilya Fedin	9b1d967967	Move NotificationServiceWatcher to notifications manager	2021-07-19 22:39:38 +03:00
Pavel Moiseenko	4ea065fdf1	Specify name of app in list of installed apps	2021-07-19 22:33:25 +03:00
Ilya Fedin	a094fa42a0	Update submodules	2021-07-19 22:31:27 +03:00
Ilya Fedin	6f151f20e9	Add support for DESKTOP_APP_DISABLE_WEBKITGTK Co-authored-by: mid-kid <esteve.varela@gmail.com>	2021-07-19 22:31:27 +03:00
Ilya Fedin	ae70dfb1f4	Return after throwing access denied error	2021-07-19 22:31:27 +03:00
Ilya Fedin	d9ea4f31ca	Add SYSTEM flag to target_include_directories where appropriate	2021-07-19 22:31:27 +03:00
Ilya Fedin	ba9b72e038	Fix -Wunused-variable warnings with gcc	2021-07-19 22:31:27 +03:00
Christian Hesse	3d1a049405	window title for call window Having an empty window title brings different issues, for example: * invisible on task bar * invisible in task switcher * apply properties by match * ... So let's use the contact user name for window title. Fixes #10243	2021-07-19 19:26:32 +03:00
Mahdi Jafari	df9e9a9d75	Fix applying of patches in Dockerfile.	2021-07-19 19:02:18 +03:00
John Preston	77d8c7ce01	Version 2.8.11. - Check shader compilation / linking before using ANGLE. It fails on default Windows 7 installations.	2021-07-17 12:47:10 +03:00
John Preston	de0897343b	Version 2.8.10: Fix media loading.	2021-07-16 20:15:44 +03:00
John Preston	e27399baa6	Pinpoint patches revision, including Dockerfile.	2021-07-16 19:38:54 +03:00
John Preston	42eb74d07a	Version 2.8.9: Fix GIF caption edit.	2021-07-16 10:10:58 +03:00
John Preston	aee991f598	Version 2.8.9. - Fix version on Windows without SetDefaultDllDirectories. - Fix fonts on Linux.	2021-07-16 09:41:52 +03:00
John Preston	96c3dc4161	Fix Windows version without SetDefaultDllDirectories.	2021-07-16 09:39:52 +03:00
John Preston	77586a1297	Fix font styles on Linux.	2021-07-16 09:27:26 +03:00