Beta version 2.9.11.

- Resolve (again) a video playback crash in 32 bit Windows version.
Remove (incorrect) checks for double casts.
2021-08-24 18:12:26 +03:00 · 2021-08-24 18:11:47 +03:00 · 2021-08-24 17:43:31 +03:00 · 2021-08-24 12:42:58 +03:00 · 2021-08-24 12:42:27 +03:00 · 2021-08-23 20:34:38 +03:00
771 changed files with 23338 additions and 20881 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/**'
@@ -65,8 +63,6 @@ jobs:
          - "DESKTOP_APP_DISABLE_X11_INTEGRATION"
          - "DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION"
          - "DESKTOP_APP_DISABLE_GTK_INTEGRATION"
-          - "LIBTGVOIP_DISABLE_ALSA"
-          - "LIBTGVOIP_DISABLE_PULSEAUDIO"

    env:
      UPLOAD_ARTIFACT: "false"
@@ -93,6 +89,9 @@ jobs:
          DEFINE=""
          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 -D DESKTOP_APP_DISABLE_WEBKITGTK=ON"
+            fi
            echo Define from matrix: $DEFINE
            echo "ARTIFACT_NAME=Telegram_${{ matrix.defines }}" >> $GITHUB_ENV
          else
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -2,7 +2,7 @@ name: 'Lock Threads'

 on:
  schedule:
-    - cron: '0 * * * *'
+    - cron: '0 0 * * *'

 jobs:
  lock:
--- 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:
@@ -451,10 +449,11 @@ jobs:

          git clone git://code.qt.io/qt/qt5.git qt_$QT
          cd qt_$QT
-          perl init-repository --module-subset=qtbase,qtimageformats
+          perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
          git checkout v5.15.2
          git submodule update qtbase
          git submodule update qtimageformats
+          git submodule update qtsvg
          cd qtbase
          find ../../patches/qtbase_$QT -type f -print0 | sort -z | xargs -0 git apply
          cd ..
--- 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'
@@ -57,28 +52,34 @@ jobs:
          - ""
    env:
      SDK: "10.0.18362.0"
-      VC: "call vcvars32.bat && cd Libraries"
      GIT: "https://github.com"
-      QT: "5_15_2"
      QT_VER: "5.15.2"
      OPENSSL_VER: "1_1_1"
      UPLOAD_ARTIFACT: "false"
      ONLY_CACHE: "false"
-      MANUAL_CACHING: "2"
-      DOC_PATH: "docs/building-msvc.md"
+      MANUAL_CACHING: "0"
+      DOC_PATH: "docs/building-win.md"
      AUTO_CACHING: "1"

    defaults:
      run:
        shell: cmd
+        working-directory: Libraries

    steps:
      - name: Get repository name.
        shell: bash
+        working-directory: ${{ github.workspace }}
        run: echo "REPO_NAME=${GITHUB_REPOSITORY##*/}" >> $GITHUB_ENV

+      - uses: ilammy/msvc-dev-cmd@v1.9.0
+        name: x86 Native Tools Command Prompt.
+        with:
+          arch: win32
+
      - name: Set up environment paths.
        shell: bash
+        working-directory: ${{ github.workspace }}
        run: |
          echo "C:\\Strawberry\\perl\\bin\\" >> $GITHUB_PATH
          echo "C:\\Program Files\\NASM\\" >> $GITHUB_PATH
@@ -89,6 +90,8 @@ jobs:
          p=`pwd | sed 's#^/[d]#d:#g' |sed 's#/#\\\\#g'`
          echo "LibrariesPath=$p" >> $GITHUB_ENV

+          echo "QT=${QT_VER//./_}" >> $GITHUB_ENV
+
      - name: Save msbuild version.
        run: |
          call vcvars32.bat
@@ -102,8 +105,10 @@ jobs:

      - name: Generate cache key.
        shell: bash
+        working-directory: ${{ github.workspace }}
        run: |
          curl -o $LibrariesPath/tg_owt-version.json https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master
+          curl -o $LibrariesPath/tg_angle-version.json https://api.github.com/repos/desktop-app/tg_angle/git/refs/heads/master
          echo $MANUAL_CACHING >> CACHE_KEY.txt
          if [ "$AUTO_CACHING" == "1" ]; then
            thisFile=$REPO_NAME/.github/workflows/win.yml
@@ -112,7 +117,10 @@ jobs:
          echo "CACHE_KEY=`md5sum CACHE_KEY.txt | awk '{ print $1 }'`" >> $GITHUB_ENV

      - name: Choco installs.
-        run: choco install --no-progress -y nasm yasm jom ninja
+        run: |
+          choco install --allow-empty-checksums --no-progress -y yasm
+          choco install --no-progress -y nasm jom ninja
+          python -m pip install pywin32

      - name: NuGet sources.
        run: |
@@ -121,6 +129,7 @@ jobs:

      - name: Patches.
        shell: bash
+        working-directory: ${{ github.workspace }}
        run: |
          echo "Find necessary commit from doc."
          checkoutCommit=$(grep -A 1 "cd patches" $REPO_NAME/$DOC_PATH | sed -n 2p)
@@ -143,8 +152,6 @@ jobs:

      - name: LZMA.
        run: |
-          %VC%
-
          git clone %GIT%/telegramdesktop/lzma.git
          cd lzma
          cd C\Util\LzmaLib
@@ -159,8 +166,6 @@ jobs:
      - name: OpenSSL.
        if: steps.cache-openssl.outputs.cache-hit != 'true'
        run: |
-          %VC%
-
          git clone %GIT%/openssl/openssl.git openssl_%OPENSSL_VER%
          cd openssl_%OPENSSL_VER%
          git checkout OpenSSL_%OPENSSL_VER%-stable
@@ -184,8 +189,6 @@ jobs:

      - name: Zlib.
        run: |
-          %VC%
-
          git clone %GIT%/telegramdesktop/zlib.git
          cd zlib
          git checkout tdesktop
@@ -195,8 +198,6 @@ jobs:
      - name: MozJPEG.
        shell: cmd
        run: |
-          %VC%
-
          git clone -b v4.0.1-rc2 %GIT%/mozilla/mozjpeg.git
          cd mozjpeg
          cmake . ^
@@ -215,8 +216,6 @@ jobs:
      - name: OpenAL Soft.
        if: steps.cache-openal.outputs.cache-hit != 'true'
        run: |
-          %VC%
-
          git clone -b openal-soft-1.21.0 --depth=1 %GIT%/kcat/openal-soft.git
          cd openal-soft\build
          cmake .. ^
@@ -240,8 +239,6 @@ jobs:
          GYP_MSVS_VERSION: 2019
        if: steps.cache-breakpad.outputs.cache-hit != 'true'
        run: |
-          cd %LibrariesPath%
-
          git clone %GIT%/telegramdesktop/gyp.git
          cd gyp
          SET PATH=%PY2%;%cd%;%PATH%
@@ -275,8 +272,6 @@ jobs:
      - name: Opus.
        if: steps.cache-opus.outputs.cache-hit != 'true'
        run: |
-          %VC%
-
          git clone %GIT%/telegramdesktop/opus.git
          cd opus
          git checkout tdesktop
@@ -285,10 +280,7 @@ jobs:
          msbuild -m opus.sln /property:Configuration=Release /property:Platform="Win32"

      - name: Rnnoise.
-        shell: cmd
        run: |
-          %VC%
-
          git clone %GIT%/desktop-app/rnnoise.git
          mkdir rnnoise\out
          cd rnnoise\out
@@ -304,7 +296,6 @@ jobs:
      - name: FFmpeg.
        if: steps.cache-ffmpeg.outputs.cache-hit != 'true'
        run: |
-          %VC%
          choco install --no-progress -y msys2

          git clone %GIT%/FFmpeg/FFmpeg.git ffmpeg
@@ -316,6 +307,31 @@ jobs:

          rmdir /S /Q .git

+      - name: Angle cache.
+        id: cache-angle
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.LibrariesPath }}/tg_angle
+          key: ${{ runner.OS }}-angle-${{ env.CACHE_KEY }}-${{ hashFiles('**/tg_angle-version.json') }}
+      - name: Angle.
+        if: steps.cache-angle.outputs.cache-hit != 'true'
+        run: |
+          git clone --recursive %GIT%/desktop-app/tg_angle.git
+          mkdir tg_angle\out\Debug
+          cd tg_angle\out\Debug
+          cmake -G Ninja ^
+          -DCMAKE_BUILD_TYPE=Debug ^
+          -DTG_ANGLE_SPECIAL_TARGET=win64 ^
+          -DTG_ANGLE_ZLIB_INCLUDE_PATH=%cd%/../../../zlib ../..
+          ninja
+
+          :: Cleanup.
+          cd %LibrariesPath%\tg_angle
+          move out\Debug\tg_angle.lib tg_angle.lib
+          rmdir /S /Q out
+          mkdir out\Debug
+          move tg_angle.lib out\Debug\tg_angle.lib
+
      - name: Qt 5.15.2 cache.
        id: cache-qt
        uses: actions/cache@v2
@@ -325,20 +341,24 @@ jobs:
      - name: Configure Qt 5.15.2.
        if: steps.cache-qt.outputs.cache-hit != 'true'
        run: |
-          %VC%
-
          git clone git://code.qt.io/qt/qt5.git qt_%QT%
          cd qt_%QT%
-          perl init-repository --module-subset=qtbase,qtimageformats
+          perl init-repository --module-subset=qtbase,qtimageformats,qtsvg
          git checkout v%QT_VER%
          git submodule update qtbase
          git submodule update qtimageformats
+          git submodule update qtsvg
          cd qtbase
          for /r %%i in (..\..\patches\qtbase_%QT%\*) do git apply %%i
          cd ..

          SET SSL=%LibrariesPath%\openssl_%OPENSSL_VER%
-          SET LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
+          SET SSL_LIBS=libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib
+
+          SET ANGLE=%LibrariesPath%\tg_angle
+          SET ANGLE_LIBS=d3d9.lib dxgi.lib dxguid.lib
+
+          SET ZLIB=%LibrariesPath%\zlib\contrib\vstudio\vc14\x86

          configure ^
          -prefix "%LibrariesPath%\Qt-%QT_VER%" ^
@@ -347,22 +367,32 @@ jobs:
          -opensource ^
          -confirm-license ^
          -static ^
-          -static-runtime -I "%SSL%\include" ^
-          -opengl dynamic ^
+          -static-runtime ^
+          -opengl es2 -no-angle ^
+          -I "%ANGLE%\include" ^
+          -D "GL_APICALL=" ^
+          QMAKE_LIBS_OPENGL_ES2_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS%" ^
+          QMAKE_LIBS_OPENGL_ES2_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS%" ^
+          -egl ^
+          -D "EGLAPI=" ^
+          -D "DESKTOP_APP_QT_STATIC_ANGLE=" ^
+          QMAKE_LIBS_EGL_DEBUG="%ANGLE%\out\Debug\tg_angle.lib %ZLIB%\ZlibStatDebug\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
+          QMAKE_LIBS_EGL_RELEASE="%ANGLE%\out\Release\tg_angle.lib %ZLIB%\ZlibStatReleaseWithoutAsm\zlibstat.lib %ANGLE_LIBS% Gdi32.lib User32.lib" ^
          -openssl-linked ^
-          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%LIBS%" ^
-          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%LIBS%" ^
+          -I "%SSL%\include" ^
+          OPENSSL_LIBS_DEBUG="%SSL%\out32.dbg\libssl.lib %SSL%\out32.dbg\%SSL_LIBS%" ^
+          OPENSSL_LIBS_RELEASE="%SSL%\out32\libssl.lib %SSL%\out32\%SSL_LIBS%" ^
+          -I "%LibrariesPath%\mozjpeg" ^
+          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
          -mp ^
          -nomake examples ^
          -nomake tests ^
-          -platform win32-msvc ^
-          -I "%LibrariesPath%\mozjpeg" ^
-          LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
-          LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
+          -platform win32-msvc
+
      - name: Qt 5.15.2 build.
        if: steps.cache-qt.outputs.cache-hit != 'true'
        run: |
-          %VC%
          cd qt_%QT%

          jom -j%NUMBER_OF_PROCESSORS%
@@ -380,8 +410,6 @@ jobs:
      - name: WebRTC.
        if: steps.cache-webrtc.outputs.cache-hit != 'true'
        run: |
-          %VC%
-
          git clone --recursive %GIT%/desktop-app/tg_owt.git
          mkdir tg_owt\out\Debug
          cd tg_owt\out\Debug
@@ -418,10 +446,12 @@ jobs:
          echo "TDESKTOP_BUILD_DEFINE=$DEFINE" >> $GITHUB_ENV

      - name: Free up some disk space.
+        working-directory: ${{ github.workspace }}
        run: del /S *.pdb

      - name: Telegram Desktop build.
        if: env.ONLY_CACHE == 'false'
+        working-directory: ${{ github.workspace }}
        run: |
          cd %REPO_NAME%\Telegram

@@ -439,6 +469,7 @@ jobs:

      - name: Move artifact.
        if: env.UPLOAD_ARTIFACT == 'true'
+        working-directory: ${{ github.workspace }}
        run: |
          cd %REPO_NAME%\out\Debug
          mkdir artifact
--- a/.gitmodules
+++ b/.gitmodules
@@ -76,9 +76,6 @@
 [submodule "Telegram/ThirdParty/hime"]
 	path = Telegram/ThirdParty/hime
 	url = https://github.com/hime-ime/hime.git
-[submodule "Telegram/ThirdParty/qt5ct"]
-	path = Telegram/ThirdParty/qt5ct
-	url = https://github.com/desktop-app/qt5ct.git
 [submodule "Telegram/ThirdParty/fcitx5-qt"]
 	path = Telegram/ThirdParty/fcitx5-qt
 	url = https://github.com/fcitx/fcitx5-qt.git
@@ -91,9 +88,9 @@
 [submodule "Telegram/lib_webview"]
 	path = Telegram/lib_webview
 	url = https://github.com/desktop-app/lib_webview.git
-[submodule "Telegram/ThirdParty/mallocng"]
-	path = Telegram/ThirdParty/mallocng
-	url = https://github.com/desktop-app/mallocng.git
 [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
-        desktop-app::external_mallocng
-    )
-
-    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)
-
-        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
@@ -144,12 +91,16 @@ PRIVATE
    api/api_attached_stickers.h
    api/api_authorizations.cpp
    api/api_authorizations.h
+    api/api_blocked_peers.cpp
+    api/api_blocked_peers.h
    api/api_bot.cpp
    api/api_bot.h
    api/api_chat_filters.cpp
    api/api_chat_filters.h
    api/api_chat_invite.cpp
    api/api_chat_invite.h
+    api/api_cloud_password.cpp
+    api/api_cloud_password.h
    api/api_common.h
    api/api_editing.cpp
    api/api_editing.h
@@ -177,6 +128,8 @@ PRIVATE
    api/api_toggling_media.h
    api/api_updates.cpp
    api/api_updates.h
+    api/api_user_privacy.cpp
+    api/api_user_privacy.h
    boxes/filters/edit_filter_box.cpp
    boxes/filters/edit_filter_box.h
    boxes/filters/edit_filter_chats_list.cpp
@@ -251,8 +204,6 @@ PRIVATE
    boxes/peer_lists_box.h
    boxes/passcode_box.cpp
    boxes/passcode_box.h
-    boxes/photo_crop_box.cpp
-    boxes/photo_crop_box.h
    boxes/rate_call_box.cpp
    boxes/rate_call_box.h
    boxes/self_destruction_box.cpp
@@ -275,6 +226,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
@@ -320,6 +272,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
@@ -395,6 +349,7 @@ PRIVATE
    data/stickers/data_stickers_set.h
    data/stickers/data_stickers.cpp
    data/stickers/data_stickers.h
+    data/data_abstract_sparse_ids.h
    data/data_abstract_structure.cpp
    data/data_abstract_structure.h
    data/data_auto_download.cpp
@@ -507,6 +462,40 @@ PRIVATE
    dialogs/dialogs_search_from_controllers.h
    dialogs/dialogs_widget.cpp
    dialogs/dialogs_widget.h
+    editor/color_picker.cpp
+    editor/color_picker.h
+    editor/controllers/controllers.h
+    editor/controllers/stickers_panel_controller.cpp
+    editor/controllers/stickers_panel_controller.h
+    editor/controllers/undo_controller.cpp
+    editor/controllers/undo_controller.h
+    editor/editor_crop.cpp
+    editor/editor_crop.h
+    editor/editor_paint.cpp
+    editor/editor_paint.h
+    editor/photo_editor.cpp
+    editor/photo_editor.h
+    editor/photo_editor_common.cpp
+    editor/photo_editor_common.h
+    editor/photo_editor_content.cpp
+    editor/photo_editor_content.h
+    editor/photo_editor_controls.cpp
+    editor/photo_editor_controls.h
+    editor/photo_editor_inner_common.h
+    editor/photo_editor_layer_widget.cpp
+    editor/photo_editor_layer_widget.h
+    editor/scene/scene.cpp
+    editor/scene/scene.h
+    editor/scene/scene_item_base.cpp
+    editor/scene/scene_item_base.h
+    editor/scene/scene_item_canvas.cpp
+    editor/scene/scene_item_canvas.h
+    editor/scene/scene_item_image.cpp
+    editor/scene/scene_item_image.h
+    editor/scene/scene_item_line.cpp
+    editor/scene/scene_item_line.h
+    editor/scene/scene_item_sticker.cpp
+    editor/scene/scene_item_sticker.h
    export/export_manager.cpp
    export/export_manager.h
    export/view/export_view_content.cpp
@@ -584,6 +573,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
@@ -720,6 +711,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
@@ -861,18 +856,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_file_dialog.cpp
-    platform/linux/linux_gtk_file_dialog.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
@@ -891,7 +880,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
@@ -906,7 +894,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
@@ -937,8 +924,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
@@ -1038,6 +1023,10 @@ PRIVATE
    support/support_helper.h
    support/support_templates.cpp
    support/support_templates.h
+    ui/chat/attach/attach_item_single_file_preview.cpp
+    ui/chat/attach/attach_item_single_file_preview.h
+    ui/chat/attach/attach_item_single_media_preview.cpp
+    ui/chat/attach/attach_item_single_media_preview.h
    ui/effects/fireworks_animation.cpp
    ui/effects/fireworks_animation.h
    ui/effects/round_checkbox.cpp
@@ -1108,13 +1097,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
@@ -1141,8 +1128,6 @@ PRIVATE
    config.h
    facades.cpp
    facades.h
-    layout.cpp
-    layout.h
    logs.cpp
    logs.h
    main.cpp
@@ -1155,21 +1140,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
@@ -1196,8 +1168,6 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
    remove_target_sources(Telegram ${src_loc}
        platform/linux/linux_gdk_helper.cpp
        platform/linux/linux_gdk_helper.h
-        platform/linux/linux_gtk_file_dialog.cpp
-        platform/linux/linux_gtk_file_dialog.h
        platform/linux/linux_gtk_integration_p.h
        platform/linux/linux_gtk_integration.cpp
        platform/linux/linux_gtk_open_with_dialog.cpp
@@ -1289,6 +1259,46 @@ 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()
+    endif()
 endif()

 if (build_macstore)
@@ -1305,10 +1315,6 @@ if (build_macstore)
        COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
        COMMAND cp -a ${libs_loc}/breakpad/src/client/mac/build/Release/Breakpad.framework $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework
    )
-elseif (build_osx)
-    set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:DebugOsx>")
-    set(bundle_entitlements "Telegram.entitlements")
-    set(output_name "Telegram")
 else()
    set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
    set(bundle_entitlements "Telegram.entitlements")
@@ -1362,6 +1368,32 @@ endif()

 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})

+if (WIN32)
+    target_link_options(Telegram
+    PRIVATE
+        /DELAYLOAD:secur32.dll
+        /DELAYLOAD:winmm.dll
+        /DELAYLOAD:ws2_32.dll
+        /DELAYLOAD:user32.dll
+        /DELAYLOAD:gdi32.dll
+        /DELAYLOAD:advapi32.dll
+        /DELAYLOAD:shell32.dll
+        /DELAYLOAD:ole32.dll
+        /DELAYLOAD:oleaut32.dll
+        /DELAYLOAD:shlwapi.dll
+        /DELAYLOAD:iphlpapi.dll
+        /DELAYLOAD:gdiplus.dll
+        /DELAYLOAD:version.dll
+        /DELAYLOAD:dwmapi.dll
+        /DELAYLOAD:crypt32.dll
+        /DELAYLOAD:bcrypt.dll
+        /DELAYLOAD:imm32.dll
+        /DELAYLOAD:netapi32.dll
+        /DELAYLOAD:userenv.dll
+        /DELAYLOAD:wtsapi32.dll
+    )
+endif()
+
 if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT build_winstore)
    add_executable(Updater WIN32)
    init_target(Updater)
@@ -1378,16 +1410,30 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT

    set_target_properties(Updater PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})

-    if (WIN32 AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-        target_link_options(Updater PRIVATE -municode)
-    endif()
-
-    if (LINUX)
-        target_link_options(Updater PRIVATE -static-libstdc++)
+    if (WIN32)
+        get_filename_component(lib_base_loc lib_base REALPATH)
+        nice_target_sources(Updater ${lib_base_loc}
+        PRIVATE
+            base/platform/win/base_windows_safe_library.cpp
+            base/platform/win/base_windows_safe_library.h
+        )
+        target_include_directories(Updater PRIVATE ${lib_base_loc})
+        if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            target_link_options(Updater
+            PRIVATE
+                /DELAYLOAD:user32.dll
+                /DELAYLOAD:advapi32.dll
+                /DELAYLOAD:shell32.dll
+                /DELAYLOAD:ole32.dll
+                /DELAYLOAD:shlwapi.dll
+            )
+        else()
+            target_link_options(Updater PRIVATE -municode)
+        endif()
    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/icons/photo_editor/flip.png
+++ b/Telegram/Resources/icons/photo_editor/flip.png
--- a/Telegram/Resources/icons/photo_editor/flip@2x.png
+++ b/Telegram/Resources/icons/photo_editor/flip@2x.png
--- a/Telegram/Resources/icons/photo_editor/flip@3x.png
+++ b/Telegram/Resources/icons/photo_editor/flip@3x.png
--- a/Telegram/Resources/icons/photo_editor/paint.png
+++ b/Telegram/Resources/icons/photo_editor/paint.png
--- a/Telegram/Resources/icons/photo_editor/paint@2x.png
+++ b/Telegram/Resources/icons/photo_editor/paint@2x.png
--- a/Telegram/Resources/icons/photo_editor/paint@3x.png
+++ b/Telegram/Resources/icons/photo_editor/paint@3x.png
--- a/Telegram/Resources/icons/photo_editor/rotate.png
+++ b/Telegram/Resources/icons/photo_editor/rotate.png
--- a/Telegram/Resources/icons/photo_editor/rotate@2x.png
+++ b/Telegram/Resources/icons/photo_editor/rotate@2x.png
--- a/Telegram/Resources/icons/photo_editor/rotate@3x.png
+++ b/Telegram/Resources/icons/photo_editor/rotate@3x.png
--- a/Telegram/Resources/icons/photo_editor/undo.png
+++ b/Telegram/Resources/icons/photo_editor/undo.png
--- a/Telegram/Resources/icons/photo_editor/undo@2x.png
+++ b/Telegram/Resources/icons/photo_editor/undo@2x.png
--- a/Telegram/Resources/icons/photo_editor/undo@3x.png
+++ b/Telegram/Resources/icons/photo_editor/undo@3x.png
--- a/Telegram/Resources/icons/send_media/send_media_delete.png
+++ b/Telegram/Resources/icons/send_media/send_media_delete.png
--- a/Telegram/Resources/icons/send_media/send_media_delete@2x.png
+++ b/Telegram/Resources/icons/send_media/send_media_delete@2x.png
--- a/Telegram/Resources/icons/send_media/send_media_delete@3x.png
+++ b/Telegram/Resources/icons/send_media/send_media_delete@3x.png
--- a/Telegram/Resources/icons/send_media/send_media_replace.png
+++ b/Telegram/Resources/icons/send_media/send_media_replace.png
--- a/Telegram/Resources/icons/send_media/send_media_replace@2x.png
+++ b/Telegram/Resources/icons/send_media/send_media_replace@2x.png
--- a/Telegram/Resources/icons/send_media/send_media_replace@3x.png
+++ b/Telegram/Resources/icons/send_media/send_media_replace@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";
@@ -184,6 +186,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 "lng_edit_media_album_error" = "This file cannot be saved as a part of an album.";
 "lng_edit_media_invalid_file" = "Sorry, no way to use this file.";
+"lng_edit_photo_editor_hint" = "Left-click on the photo to edit.";
 "lng_edit_caption_attach" = "Sorry, you can't attach a new media while you're editing your message.";
 "lng_edit_caption_voice" = "Sorry, you can't edit your message while you're having an unsent voice message.";

@@ -452,6 +455,13 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_settings_performance" = "Performance";
 "lng_settings_enable_animations" = "Enable animations";
 "lng_settings_enable_opengl" = "Enable OpenGL rendering for media";
+"lng_settings_angle_backend" = "ANGLE graphics backend";
+"lng_settings_angle_backend_auto" = "Auto";
+"lng_settings_angle_backend_d3d9" = "Direct3D 9";
+"lng_settings_angle_backend_d3d11" = "Direct3D 11";
+"lng_settings_angle_backend_d3d11on12" = "D3D11on12";
+"lng_settings_angle_backend_opengl" = "OpenGL";
+"lng_settings_angle_backend_disabled" = "Disabled";
 "lng_settings_sensitive_title" = "Sensitive content";
 "lng_settings_sensitive_disable_filtering" = "Disable filtering";
 "lng_settings_sensitive_about" = "Display sensitive media in public channels on all your Telegram devices.";
@@ -567,6 +577,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_passcode_autolock_minutes#other" = "{count} minutes";
 "lng_passcode_autolock_hours#one" = "{count} hour";
 "lng_passcode_autolock_hours#other" = "{count} hours";
+"lng_passcode_autolock_hours_minutes" = "{hours_count}h {minutes_count}m";
 "lng_passcode_enter_old" = "Enter current passcode";
 "lng_passcode_enter_first" = "Enter a passcode";
 "lng_passcode_enter_new" = "Enter new passcode";
@@ -588,6 +599,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";
@@ -610,6 +624,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)";
@@ -854,6 +875,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";
@@ -896,6 +920,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";
@@ -915,6 +940,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";
@@ -928,6 +955,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";
@@ -990,8 +1018,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.";
@@ -1000,8 +1029,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";
@@ -1372,6 +1402,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_switch_stickers" = "Stickers";
 "lng_switch_emoji" = "Emoji";
 "lng_switch_gifs" = "GIFs";
+"lng_switch_masks" = "Masks";
 "lng_stickers_featured_add" = "Add";
 "lng_gifs_search" = "Search GIFs";
 "lng_gifs_no_saved" = "You have no saved GIFs yet.";
@@ -1382,11 +1413,14 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_box_remove" = "Remove";

 "lng_stickers_installed_tab" = "Stickers";
+"lng_stickers_masks_tab" = "Masks";
 "lng_stickers_featured_tab" = "Trending";
 "lng_stickers_archived_tab" = "Archived";
 "lng_stickers_remove_pack" = "Remove «{sticker_pack}»?";
 "lng_stickers_add_pack" = "Add stickers";
+"lng_stickers_add_masks" = "Add masks";
 "lng_stickers_share_pack" = "Share Stickers";
+"lng_stickers_share_masks" = "Share Masks";
 "lng_stickers_not_found" = "Sticker pack not found.";
 "lng_stickers_packs_archived" = "Some of your unused stickers have been archived to make room for the sets you've activated.";
 "lng_stickers_copied" = "Sticker pack link copied to clipboard.";
@@ -1395,7 +1429,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stickers_return" = "Undo";
 "lng_stickers_count#one" = "{count} sticker";
 "lng_stickers_count#other" = "{count} stickers";
-"lng_stickers_masks_pack" = "This is a pack of mask stickers. You can use them in the photo editor on our mobile apps.";
+"lng_masks_count#one" = "{count} mask";
+"lng_masks_count#other" = "{count} masks";
 "lng_stickers_attached_sets" = "Sets of attached stickers";
 "lng_stickers_group_set" = "Group sticker set";
 "lng_stickers_remove_group_set" = "Remove group sticker set?";
@@ -1406,6 +1441,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_stickers_remove_pack_confirm" = "Remove";
 "lng_stickers_archive_pack" = "Archive Stickers";
 "lng_stickers_has_been_archived" = "Sticker pack has been archived.";
+"lng_masks_archive_pack" = "Archive Masks";
+"lng_masks_has_been_archived" = "Mask pack has been archived.";
+"lng_masks_installed" = "Mask pack has been installed.";

 "lng_in_dlg_photo" = "Photo";
 "lng_in_dlg_album" = "Album";
@@ -1478,6 +1516,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";
@@ -1602,6 +1641,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_context_mark_read_sure" = "Are you sure you want to mark all chats from this folder as read?";
 "lng_context_mark_read_all" = "Mark all chats as read";
 "lng_context_mark_read_all_sure" = "Are you sure you want to mark all chats as read?";
+"lng_context_mark_read_mentions_all" = "Mark all mentions as read";
 "lng_context_archive_expand" = "Expand";
 "lng_context_archive_collapse" = "Collapse";
 "lng_context_archive_to_menu" = "Move to main menu";
@@ -1985,6 +2025,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";
@@ -2005,6 +2046,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_group_call_screen_share_start" = "Share Screen";
 "lng_group_call_screen_share_stop" = "Stop Sharing";
 "lng_group_call_screen_title" = "Screen {index}";
+"lng_group_call_screen_share_audio" = "Share System Audio";
 "lng_group_call_unmute_small" = "Unmute";
 "lng_group_call_more" = "More";
 "lng_group_call_unmute" = "Unmute";
@@ -2063,6 +2105,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";
@@ -2760,6 +2804,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_filters_remove_sure" = "This will remove the folder, your chats will not be deleted.";
 "lng_filters_remove_yes" = "Remove";

+"lng_photo_editor_menu_delete" = "Delete";
+"lng_photo_editor_menu_flip" = "Flip";
+"lng_photo_editor_menu_duplicate" = "Duplicate";
+
 // Wnd specific

 "lng_wnd_choose_program_menu" = "Choose Default Program...";
--- 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/tl/api.tl
+++ b/Telegram/Resources/tl/api.tl
@@ -376,6 +376,7 @@ updateChatParticipant#f3b3781f flags:# chat_id:int date:int actor_id:int user_id
 updateChannelParticipant#7fecb1ec flags:# channel_id:int date:int actor_id:int user_id:int prev_participant:flags.0?ChannelParticipant new_participant:flags.1?ChannelParticipant invite:flags.2?ExportedChatInvite qts:int = Update;
 updateBotStopped#7f9488a user_id:int date:int stopped:Bool qts:int = Update;
 updateGroupCallConnection#b783982 flags:# presentation:flags.0?true params:DataJSON = Update;
+updateBotCommands#cf7e0873 peer:Peer bot_id:int commands:Vector<BotCommand> = Update;

 updates.state#a56c2a3e pts:int qts:int date:int seq:int unread_count:int = updates.State;

@@ -534,7 +535,7 @@ authorization#ad01d61d flags:# current:flags.0?true official_app:flags.1?true pa

 account.authorizations#1250abde authorizations:Vector<Authorization> = account.Authorizations;

-account.password#ad2641f8 flags:# has_recovery:flags.0?true has_secure_values:flags.1?true has_password:flags.2?true current_algo:flags.2?PasswordKdfAlgo srp_B:flags.2?bytes srp_id:flags.2?long hint:flags.3?string email_unconfirmed_pattern:flags.4?string new_algo:PasswordKdfAlgo new_secure_algo:SecurePasswordKdfAlgo secure_random:bytes = account.Password;
+account.password#185b184f flags:# has_recovery:flags.0?true has_secure_values:flags.1?true has_password:flags.2?true current_algo:flags.2?PasswordKdfAlgo srp_B:flags.2?bytes srp_id:flags.2?long hint:flags.3?string email_unconfirmed_pattern:flags.4?string new_algo:PasswordKdfAlgo new_secure_algo:SecurePasswordKdfAlgo secure_random:bytes pending_reset_date:flags.5?int = account.Password;

 account.passwordSettings#9a5c33e5 flags:# email:flags.0?string secure_settings:flags.1?SecureSecretSettings = account.PasswordSettings;

@@ -579,8 +580,8 @@ keyboardButtonRequestPoll#bbc7515d flags:# quiz:flags.0?Bool text:string = Keybo
 keyboardButtonRow#77608b83 buttons:Vector<KeyboardButton> = KeyboardButtonRow;

 replyKeyboardHide#a03e5b85 flags:# selective:flags.2?true = ReplyMarkup;
-replyKeyboardForceReply#f4108aa0 flags:# single_use:flags.1?true selective:flags.2?true = ReplyMarkup;
-replyKeyboardMarkup#3502758c flags:# resize:flags.0?true single_use:flags.1?true selective:flags.2?true rows:Vector<KeyboardButtonRow> = ReplyMarkup;
+replyKeyboardForceReply#86b40b08 flags:# single_use:flags.1?true selective:flags.2?true placeholder:flags.3?string = ReplyMarkup;
+replyKeyboardMarkup#85dd99d1 flags:# resize:flags.0?true single_use:flags.1?true selective:flags.2?true rows:Vector<KeyboardButtonRow> placeholder:flags.3?string = ReplyMarkup;
 replyInlineMarkup#48a30254 rows:Vector<KeyboardButtonRow> = ReplyMarkup;

 messageEntityUnknown#bb92ba95 offset:int length:int = MessageEntity;
@@ -1205,7 +1206,7 @@ peerBlocked#e8fd8014 peer_id:Peer date:int = PeerBlocked;
 stats.messageStats#8999f295 views_graph:StatsGraph = stats.MessageStats;

 groupCallDiscarded#7780bcb4 id:long access_hash:long duration:int = GroupCall;
-groupCall#653dbaad flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int version:int = GroupCall;
+groupCall#d597650c flags:# join_muted:flags.1?true can_change_join_muted:flags.2?true join_date_asc:flags.6?true schedule_start_subscribed:flags.8?true can_start_video:flags.9?true id:long access_hash:long participants_count:int title:flags.3?string stream_dc_id:flags.4?int record_start_date:flags.5?int schedule_date:flags.7?int unmuted_video_count:flags.10?int unmuted_video_limit:int version:int = GroupCall;

 inputGroupCall#d8aa840f id:long access_hash:long = InputGroupCall;

@@ -1248,7 +1249,21 @@ phone.exportedGroupCallInvite#204bd158 link:string = phone.ExportedGroupCallInvi

 groupCallParticipantVideoSourceGroup#dcb118b7 semantics:string sources:Vector<int> = GroupCallParticipantVideoSourceGroup;

-groupCallParticipantVideo#78e41663 flags:# paused:flags.0?true endpoint:string source_groups:Vector<GroupCallParticipantVideoSourceGroup> = GroupCallParticipantVideo;
+groupCallParticipantVideo#67753ac8 flags:# paused:flags.0?true endpoint:string source_groups:Vector<GroupCallParticipantVideoSourceGroup> audio_source:flags.1?int = GroupCallParticipantVideo;
+
+stickers.suggestedShortName#85fea03f short_name:string = stickers.SuggestedShortName;
+
+botCommandScopeDefault#2f6cb2ab = BotCommandScope;
+botCommandScopeUsers#3c4f04d8 = BotCommandScope;
+botCommandScopeChats#6fe1a881 = BotCommandScope;
+botCommandScopeChatAdmins#b9aa606a = BotCommandScope;
+botCommandScopePeer#db9d897d peer:InputPeer = BotCommandScope;
+botCommandScopePeerAdmins#3fd863d1 peer:InputPeer = BotCommandScope;
+botCommandScopePeerUser#a1321f3 peer:InputPeer user_id:InputUser = BotCommandScope;
+
+account.resetPasswordFailedWait#e3779861 retry_date:int = account.ResetPasswordResult;
+account.resetPasswordRequestedWait#e9effc7d until_date:int = account.ResetPasswordResult;
+account.resetPasswordOk#e926d63e = account.ResetPasswordResult;

 ---functions---

@@ -1271,13 +1286,14 @@ auth.bindTempAuthKey#cdd42a05 perm_auth_key_id:long nonce:long expires_at:int en
 auth.importBotAuthorization#67a3ff2c flags:int api_id:int api_hash:string bot_auth_token:string = auth.Authorization;
 auth.checkPassword#d18b4d16 password:InputCheckPasswordSRP = auth.Authorization;
 auth.requestPasswordRecovery#d897bc66 = auth.PasswordRecovery;
-auth.recoverPassword#4ea56e92 code:string = auth.Authorization;
+auth.recoverPassword#37096c70 flags:# code:string new_settings:flags.0?account.PasswordInputSettings = auth.Authorization;
 auth.resendCode#3ef1a9bf phone_number:string phone_code_hash:string = auth.SentCode;
 auth.cancelCode#1f040578 phone_number:string phone_code_hash:string = Bool;
 auth.dropTempAuthKeys#8e48a188 except_auth_keys:Vector<long> = Bool;
 auth.exportLoginToken#b1b41517 api_id:int api_hash:string except_ids:Vector<int> = auth.LoginToken;
 auth.importLoginToken#95ac5ce4 token:bytes = auth.LoginToken;
 auth.acceptLoginToken#e894ad4d token:bytes = Authorization;
+auth.checkRecoveryPassword#d36bf79 code:string = Bool;

 account.registerDevice#68976c6f flags:# no_muted:flags.0?true token_type:int token:string app_sandbox:Bool secret:bytes other_uids:Vector<int> = Bool;
 account.unregisterDevice#3076c4bf token_type:int token:string other_uids:Vector<int> = Bool;
@@ -1347,6 +1363,8 @@ account.getMultiWallPapers#65ad71dc wallpapers:Vector<InputWallPaper> = Vector<W
 account.getGlobalPrivacySettings#eb2b4cf6 = GlobalPrivacySettings;
 account.setGlobalPrivacySettings#1edaaac2 settings:GlobalPrivacySettings = GlobalPrivacySettings;
 account.reportProfilePhoto#fa8cc6f5 peer:InputPeer photo_id:InputPhoto reason:ReportReason message:string = Bool;
+account.resetPassword#9308ce1b = account.ResetPasswordResult;
+account.declinePasswordReset#4c9409f6 = Bool;

 users.getUsers#d91a548 id:Vector<InputUser> = Vector<User>;
 users.getFullUser#ca30a5b1 id:InputUser = UserFull;
@@ -1596,7 +1614,9 @@ channels.convertToGigagroup#b290c69 channel:InputChannel = Updates;

 bots.sendCustomRequest#aa2769ed custom_method:string params:DataJSON = DataJSON;
 bots.answerWebhookJSONQuery#e6213f4d query_id:long data:DataJSON = Bool;
-bots.setBotCommands#805d46f6 commands:Vector<BotCommand> = Bool;
+bots.setBotCommands#517165a scope:BotCommandScope lang_code:string commands:Vector<BotCommand> = Bool;
+bots.resetBotCommands#3d8de0f9 scope:BotCommandScope lang_code:string = Bool;
+bots.getBotCommands#e34c0dd6 scope:BotCommandScope lang_code:string = Vector<BotCommand>;

 payments.getPaymentForm#8a333c8d flags:# peer:InputPeer msg_id:int theme_params:flags.0?DataJSON = payments.PaymentForm;
 payments.getPaymentReceipt#2478d1cc peer:InputPeer msg_id:int = payments.PaymentReceipt;
@@ -1606,11 +1626,13 @@ payments.getSavedInfo#227d824b = payments.SavedInfo;
 payments.clearSavedInfo#d83d70c1 flags:# credentials:flags.0?true info:flags.1?true = Bool;
 payments.getBankCardData#2e79d779 number:string = payments.BankCardData;

-stickers.createStickerSet#f1036780 flags:# masks:flags.0?true animated:flags.1?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> = messages.StickerSet;
+stickers.createStickerSet#9021ab67 flags:# masks:flags.0?true animated:flags.1?true user_id:InputUser title:string short_name:string thumb:flags.2?InputDocument stickers:Vector<InputStickerSetItem> software:flags.3?string = messages.StickerSet;
 stickers.removeStickerFromSet#f7760f51 sticker:InputDocument = messages.StickerSet;
 stickers.changeStickerPosition#ffb6d4ca sticker:InputDocument position:int = messages.StickerSet;
 stickers.addStickerToSet#8653febe stickerset:InputStickerSet sticker:InputStickerSetItem = messages.StickerSet;
 stickers.setStickerSetThumb#9a364e30 stickerset:InputStickerSet thumb:InputDocument = messages.StickerSet;
+stickers.checkShortName#284b3639 short_name:string = Bool;
+stickers.suggestShortName#4dafc503 title:string = stickers.SuggestedShortName;

 phone.getCallConfig#55451fa9 = DataJSON;
 phone.requestCall#42ff96ed flags:# video:flags.0?true user_id:InputUser random_id:int g_a_hash:bytes protocol:PhoneCallProtocol = phone.PhoneCall;
@@ -1656,4 +1678,4 @@ stats.getMegagroupStats#dcdf8607 flags:# dark:flags.0?true channel:InputChannel
 stats.getMessagePublicForwards#5630281b channel:InputChannel msg_id:int offset_rate:int offset_peer:InputPeer offset_id:int limit:int = messages.Messages;
 stats.getMessageStats#b6e0a3f5 flags:# dark:flags.0?true channel:InputChannel msg_id:int = stats.MessageStats;

-// LAYER 129
+// LAYER 131
--- 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.3.0" />
+    Version="2.9.11.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,3,0
- PRODUCTVERSION 2,8,3,0
+ FILEVERSION 2,9,11,0
+ PRODUCTVERSION 2,9,11,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.3.0"
+            VALUE "FileVersion", "2.9.11.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.3.0"
+            VALUE "ProductVersion", "2.9.11.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,3,0
- PRODUCTVERSION 2,8,3,0
+ FILEVERSION 2,9,11,0
+ PRODUCTVERSION 2,9,11,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.3.0"
+            VALUE "FileVersion", "2.9.11.0"
            VALUE "LegalCopyright", "Copyright (C) 2014-2021"
            VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "2.8.3.0"
+            VALUE "ProductVersion", "2.9.11.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,13 +494,9 @@ 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));
-#else
 	QString outName(QString("tlinuxupd%1").arg(AlphaVersion ? AlphaVersion : version));
-#endif
 #else
 #error Unknown platform!
 #endif
--- a/Telegram/SourceFiles/_other/updater_linux.cpp
+++ b/Telegram/SourceFiles/_other/updater_linux.cpp
@@ -384,8 +384,6 @@ int main(int argc, char *argv[]) {
 	bool writeprotected = false;
 	bool tosettings = false;
 	bool startintray = false;
-	bool testmode = false;
-	bool externalupdater = false;
 	bool customWorkingDir = false;

 	char *key = 0;
@@ -399,10 +397,6 @@ int main(int argc, char *argv[]) {
 			debug = _debug = true;
 		} else if (equal(argv[i], "-startintray")) {
 			startintray = true;
-		} else if (equal(argv[i], "-testmode")) {
-			testmode = true;
-		} else if (equal(argv[i], "-externalupdater")) {
-			externalupdater = true;
 		} else if (equal(argv[i], "-tosettings")) {
 			tosettings = true;
 		} else if (equal(argv[i], "-workdir_custom")) {
@@ -503,8 +497,6 @@ int main(int argc, char *argv[]) {
 	if (autostart) push("-autostart");
 	if (debug) push("-debug");
 	if (startintray) push("-startintray");
-	if (testmode) push("-testmode");
-	if (externalupdater) push("-externalupdater");
 	if (tosettings) push("-tosettings");
 	if (key) {
 		push("-key");
--- a/Telegram/SourceFiles/_other/updater_osx.m
+++ b/Telegram/SourceFiles/_other/updater_osx.m
@@ -90,7 +90,7 @@ int main(int argc, const char * argv[]) {

 	openLog();
 	pid_t procId = 0;
-	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, testMode = NO, freeType = NO, externalUpdater = NO;
+	BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, freeType = NO;
 	BOOL customWorkingDir = NO;
 	NSString *key = nil;
 	for (int i = 0; i < argc; ++i) {
@@ -114,12 +114,8 @@ int main(int argc, const char * argv[]) {
 			_debug = YES;
 		} else if ([@"-startintray" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			startInTray = YES;
-		} else if ([@"-testmode" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
-			testMode = YES;
 		} else if ([@"-freetype" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			freeType = YES;
-		} else if ([@"-externalupdater" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
-			externalUpdater = YES;
 		} else if ([@"-workdir_custom" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
 			customWorkingDir = YES;
 		} else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
@@ -256,9 +252,7 @@ int main(int argc, const char * argv[]) {
 	if (toSettings) [args addObject:@"-tosettings"];
 	if (_debug) [args addObject:@"-debug"];
 	if (startInTray) [args addObject:@"-startintray"];
-	if (testMode) [args addObject:@"-testmode"];
 	if (freeType) [args addObject:@"-freetype"];
-	if (externalUpdater) [args addObject:@"-externalupdater"];
 	if (autoStart) [args addObject:@"-autostart"];
 	if (key) {
 		[args addObject:@"-key"];
--- a/Telegram/SourceFiles/_other/updater_win.cpp
+++ b/Telegram/SourceFiles/_other/updater_win.cpp
@@ -7,6 +7,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "updater.h"

+#include "base/platform/win/base_windows_safe_library.h"
+
 bool _debug = false;

 wstring updaterName, updaterDir, updateTo, exeName, customWorkingDir, customKeyFile;
@@ -329,6 +331,8 @@ void updateRegistry() {
 }

 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdParamarg, int cmdShow) {
+	base::Platform::InitDynamicLibraries();
+
 	openLog();

 	_oldWndExceptionFilter = SetUnhandledExceptionFilter(_exceptionFilter);
@@ -339,7 +343,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 	LPWSTR *args;
 	int argsCount;

-	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, testmode = false, freetype = false, externalupdater = false;
+	bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, freetype = false;
 	args = CommandLineToArgvW(GetCommandLine(), &argsCount);
 	if (args) {
 		for (int i = 1; i < argsCount; ++i) {
@@ -353,12 +357,8 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 				openLog();
 			} else if (equal(args[i], L"-startintray")) {
 				startintray = true;
-			} else if (equal(args[i], L"-testmode")) {
-				testmode = true;
 			} else if (equal(args[i], L"-freetype")) {
 				freetype = true;
-			} else if (equal(args[i], L"-externalupdater")) {
-				externalupdater = true;
 			} else if (equal(args[i], L"-writeprotected") && ++i < argsCount) {
 				writeLog(std::wstring(L"Argument: ") + args[i]);
 				writeprotected = true;
@@ -428,9 +428,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
 	if (autostart) targs += L" -autostart";
 	if (debug) targs += L" -debug";
 	if (startintray) targs += L" -startintray";
-	if (testmode) targs += L" -testmode";
 	if (freetype) targs += L" -freetype";
-	if (externalupdater) targs += L" -externalupdater";
 	if (!customWorkingDir.empty()) {
 		targs += L" -workdir \"" + customWorkingDir + L"\"";
 	}
--- a/Telegram/SourceFiles/api/api_attached_stickers.cpp
+++ b/Telegram/SourceFiles/api/api_attached_stickers.cpp
@@ -52,8 +52,10 @@ void AttachedStickers::request(
 		});

 		const auto setId = (setData->vid().v && setData->vaccess_hash().v)
-			? MTP_inputStickerSetID(setData->vid(), setData->vaccess_hash())
-			: MTP_inputStickerSetShortName(setData->vshort_name());
+			? StickerSetIdentifier{
+				.id = setData->vid().v,
+				.accessHash = setData->vaccess_hash().v }
+			: StickerSetIdentifier{ .shortName = qs(setData->vshort_name()) };
 		strongController->show(
 			Box<StickerSetBox>(strongController, setId),
 			Ui::LayerOption::KeepOther);
--- a/Telegram/SourceFiles/api/api_blocked_peers.cpp
+++ b/Telegram/SourceFiles/api/api_blocked_peers.cpp
@@ -0,0 +1,173 @@
+/*
+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 "api/api_blocked_peers.h"
+
+#include "apiwrap.h"
+#include "base/unixtime.h"
+#include "data/data_changes.h"
+#include "data/data_peer.h"
+#include "data/data_peer_id.h"
+#include "data/data_session.h"
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kBlockedFirstSlice = 16;
+constexpr auto kBlockedPerPage = 40;
+
+BlockedPeers::Slice TLToSlice(
+		const MTPcontacts_Blocked &blocked,
+		Data::Session &owner) {
+	const auto create = [&](int count, const QVector<MTPPeerBlocked> &list) {
+		auto slice = BlockedPeers::Slice();
+		slice.total = std::max(count, list.size());
+		slice.list.reserve(list.size());
+		for (const auto &contact : list) {
+			contact.match([&](const MTPDpeerBlocked &data) {
+				slice.list.push_back({
+					.id = peerFromMTP(data.vpeer_id()),
+					.date = data.vdate().v,
+				});
+			});
+		}
+		return slice;
+	};
+	return blocked.match([&](const MTPDcontacts_blockedSlice &data) {
+		owner.processUsers(data.vusers());
+		owner.processChats(data.vchats());
+		return create(data.vcount().v, data.vblocked().v);
+	}, [&](const MTPDcontacts_blocked &data) {
+		owner.processUsers(data.vusers());
+		owner.processChats(data.vchats());
+		return create(0, data.vblocked().v);
+	});
+}
+
+} // namespace
+
+BlockedPeers::BlockedPeers(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance()) {
+}
+
+bool BlockedPeers::Slice::Item::operator==(const Item &other) const {
+	return (id == other.id) && (date == other.date);
+}
+
+bool BlockedPeers::Slice::Item::operator!=(const Item &other) const {
+	return !(*this == other);
+}
+
+bool BlockedPeers::Slice::operator==(const BlockedPeers::Slice &other) const {
+	return (total == other.total) && (list == other.list);
+}
+
+bool BlockedPeers::Slice::operator!=(const BlockedPeers::Slice &other) const {
+	return !(*this == other);
+}
+
+void BlockedPeers::block(not_null<PeerData*> peer) {
+	if (peer->isBlocked()) {
+		_session->changes().peerUpdated(
+			peer,
+			Data::PeerUpdate::Flag::IsBlocked);
+	} else if (_blockRequests.find(peer) == end(_blockRequests)) {
+		const auto requestId = _api.request(MTPcontacts_Block(
+			peer->input
+		)).done([=](const MTPBool &result) {
+			_blockRequests.erase(peer);
+			peer->setIsBlocked(true);
+			if (_slice) {
+				_slice->list.insert(
+					_slice->list.begin(),
+					{ peer->id, base::unixtime::now() });
+				++_slice->total;
+				_changes.fire_copy(*_slice);
+			}
+		}).fail([=](const MTP::Error &error) {
+			_blockRequests.erase(peer);
+		}).send();
+
+		_blockRequests.emplace(peer, requestId);
+	}
+}
+
+void BlockedPeers::unblock(not_null<PeerData*> peer, Fn<void()> onDone) {
+	if (!peer->isBlocked()) {
+		_session->changes().peerUpdated(
+			peer,
+			Data::PeerUpdate::Flag::IsBlocked);
+		return;
+	} else if (_blockRequests.find(peer) != end(_blockRequests)) {
+		return;
+	}
+	const auto requestId = _api.request(MTPcontacts_Unblock(
+		peer->input
+	)).done([=](const MTPBool &result) {
+		_blockRequests.erase(peer);
+		peer->setIsBlocked(false);
+		if (_slice) {
+			auto &list = _slice->list;
+			for (auto i = list.begin(); i != list.end(); ++i) {
+				if (i->id == peer->id) {
+					list.erase(i);
+					break;
+				}
+			}
+			if (_slice->total > list.size()) {
+				--_slice->total;
+			}
+			_changes.fire_copy(*_slice);
+		}
+		if (onDone) {
+			onDone();
+		}
+	}).fail([=](const MTP::Error &error) {
+		_blockRequests.erase(peer);
+	}).send();
+	_blockRequests.emplace(peer, requestId);
+}
+
+void BlockedPeers::reload() {
+	if (_requestId) {
+		return;
+	}
+	request(0, [=](Slice &&slice) {
+		if (!_slice || *_slice != slice) {
+			_slice = slice;
+			_changes.fire(std::move(slice));
+		}
+	});
+}
+
+auto BlockedPeers::slice() -> rpl::producer<BlockedPeers::Slice> {
+	if (!_slice) {
+		reload();
+	}
+	return _slice
+		? _changes.events_starting_with_copy(*_slice)
+		: (_changes.events() | rpl::type_erased());
+}
+
+void BlockedPeers::request(int offset, Fn<void(BlockedPeers::Slice)> onDone) {
+	if (_requestId) {
+		return;
+	}
+	_requestId = _api.request(MTPcontacts_GetBlocked(
+		MTP_int(offset),
+		MTP_int(offset ? kBlockedPerPage : kBlockedFirstSlice)
+	)).done([=](const MTPcontacts_Blocked &result) {
+		_requestId = 0;
+		onDone(TLToSlice(result, _session->data()));
+	}).fail([=](const MTP::Error &error) {
+		_requestId = 0;
+	}).send();
+}
+
+} // namespace Api
--- a/Telegram/SourceFiles/api/api_blocked_peers.h
+++ b/Telegram/SourceFiles/api/api_blocked_peers.h
@@ -0,0 +1,60 @@
+/*
+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
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+class BlockedPeers final {
+public:
+	struct Slice {
+		struct Item {
+			PeerId id;
+			TimeId date = 0;
+
+			bool operator==(const Item &other) const;
+			bool operator!=(const Item &other) const;
+		};
+
+		QVector<Item> list;
+		int total = 0;
+
+		bool operator==(const Slice &other) const;
+		bool operator!=(const Slice &other) const;
+	};
+
+	explicit BlockedPeers(not_null<ApiWrap*> api);
+
+	void reload();
+	rpl::producer<Slice> slice();
+	void request(int offset, Fn<void(Slice)> onDone);
+
+	void block(not_null<PeerData*> peer);
+	void unblock(not_null<PeerData*> peer, Fn<void()> onDone = nullptr);
+
+private:
+	const not_null<Main::Session*> _session;
+
+	MTP::Sender _api;
+
+	base::flat_map<not_null<PeerData*>, mtpRequestId> _blockRequests;
+	mtpRequestId _requestId = 0;
+	std::optional<Slice> _slice;
+	rpl::event_stream<Slice> _changes;
+
+
+};
+
+} // namespace Api
--- a/Telegram/SourceFiles/api/api_bot.cpp
+++ b/Telegram/SourceFiles/api/api_bot.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_bot.h"

 #include "apiwrap.h"
+#include "api/api_cloud_password.h"
 #include "core/core_cloud_password.h"
 #include "api/api_send_progress.h"
 #include "boxes/confirm_box.h"
@@ -156,7 +157,6 @@ void SendBotCallbackDataWithPassword(
 	const auto session = &history->session();
 	const auto owner = &history->owner();
 	const auto api = &session->api();
-	const auto bot = item->getMessageBot();
 	const auto fullId = item->fullId();
 	const auto getButton = [=] {
 		return HistoryMessageMarkupButton::Get(
@@ -169,7 +169,7 @@ void SendBotCallbackDataWithPassword(
 	if (!button || button->requestId) {
 		return;
 	}
-	api->reloadPasswordState();
+	api->cloudPassword().reload();
 	SendBotCallbackData(item, row, column, MTP_inputCheckPasswordEmpty(), [=](const MTP::Error &error) {
 		auto box = PrePasswordErrorBox(
 			error,
@@ -182,7 +182,7 @@ void SendBotCallbackDataWithPassword(
 		} else {
 			auto lifetime = std::make_shared<rpl::lifetime>();
 			button->requestId = -1;
-			api->passwordState(
+			api->cloudPassword().state(
 			) | rpl::take(
 				1
 			) | rpl::start_with_next([=](const Core::CloudPasswordState &state) mutable {
--- a/Telegram/SourceFiles/api/api_chat_invite.cpp
+++ b/Telegram/SourceFiles/api/api_chat_invite.cpp
@@ -112,6 +112,11 @@ ConfirmInviteBox::ConfirmInviteBox(
 			? tr::lng_channel_invite_private(tr::now)
 			: (!_participants.empty() && _participants.size() < count)
 			? tr::lng_group_invite_members(tr::now, lt_count, count)
+			: (count > 0 && _isChannel)
+			? tr::lng_chat_status_subscribers(
+				tr::now,
+				lt_count_decimal,
+				count)
 			: (count > 0)
 			? tr::lng_chat_status_members(tr::now, lt_count_decimal, count)
 			: _isChannel
--- a/Telegram/SourceFiles/api/api_cloud_password.cpp
+++ b/Telegram/SourceFiles/api/api_cloud_password.cpp
@@ -0,0 +1,112 @@
+/*
+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 "api/api_cloud_password.h"
+
+#include "base/openssl_help.h"
+#include "core/core_cloud_password.h"
+#include "apiwrap.h"
+
+namespace Api {
+
+// #TODO Add ability to set recovery email separately.
+
+CloudPassword::CloudPassword(not_null<ApiWrap*> api)
+: _api(&api->instance()) {
+}
+
+void CloudPassword::reload() {
+	if (_requestId) {
+		return;
+	}
+	_requestId = _api.request(MTPaccount_GetPassword(
+	)).done([=](const MTPaccount_Password &result) {
+		_requestId = 0;
+		result.match([&](const MTPDaccount_password &data) {
+			openssl::AddRandomSeed(bytes::make_span(data.vsecure_random().v));
+			if (_state) {
+				*_state = Core::ParseCloudPasswordState(data);
+			} else {
+				_state = std::make_unique<Core::CloudPasswordState>(
+					Core::ParseCloudPasswordState(data));
+			}
+			_stateChanges.fire_copy(*_state);
+		});
+	}).fail([=](const MTP::Error &error) {
+		_requestId = 0;
+	}).send();
+}
+
+void CloudPassword::clearUnconfirmedPassword() {
+	_requestId = _api.request(MTPaccount_CancelPasswordEmail(
+	)).done([=](const MTPBool &result) {
+		_requestId = 0;
+		reload();
+	}).fail([=](const MTP::Error &error) {
+		_requestId = 0;
+		reload();
+	}).send();
+}
+
+rpl::producer<Core::CloudPasswordState> CloudPassword::state() const {
+	return _state
+		? _stateChanges.events_starting_with_copy(*_state)
+		: (_stateChanges.events() | rpl::type_erased());
+}
+
+auto CloudPassword::stateCurrent() const
+-> std::optional<Core::CloudPasswordState> {
+	return _state
+		? base::make_optional(*_state)
+		: std::nullopt;
+}
+
+auto CloudPassword::resetPassword()
+-> rpl::producer<CloudPassword::ResetRetryDate, QString> {
+	return [=](auto consumer) {
+		_api.request(MTPaccount_ResetPassword(
+		)).done([=](const MTPaccount_ResetPasswordResult &result) {
+			result.match([&](const MTPDaccount_resetPasswordOk &data) {
+				reload();
+			}, [&](const MTPDaccount_resetPasswordRequestedWait &data) {
+				if (!_state) {
+					reload();
+					return;
+				}
+				const auto until = data.vuntil_date().v;
+				if (_state->pendingResetDate != until) {
+					_state->pendingResetDate = until;
+					_stateChanges.fire_copy(*_state);
+				}
+			}, [&](const MTPDaccount_resetPasswordFailedWait &data) {
+				consumer.put_next_copy(data.vretry_date().v);
+			});
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return rpl::lifetime();
+	};
+}
+
+auto CloudPassword::cancelResetPassword()
+-> rpl::producer<rpl::no_value, QString> {
+	return [=](auto consumer) {
+		_api.request(MTPaccount_DeclinePasswordReset(
+		)).done([=] {
+			reload();
+			consumer.put_done();
+		}).fail([=](const MTP::Error &error) {
+			consumer.put_error_copy(error.type());
+		}).send();
+
+		return rpl::lifetime();
+	};
+}
+
+} // namespace Api
--- a/Telegram/SourceFiles/api/api_cloud_password.h
+++ b/Telegram/SourceFiles/api/api_cloud_password.h
@@ -0,0 +1,45 @@
+/*
+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
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+namespace Core {
+struct CloudPasswordState;
+} // namespace Core
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+class CloudPassword final {
+public:
+	using ResetRetryDate = int;
+	explicit CloudPassword(not_null<ApiWrap*> api);
+
+	void reload();
+	void clearUnconfirmedPassword();
+	rpl::producer<Core::CloudPasswordState> state() const;
+	std::optional<Core::CloudPasswordState> stateCurrent() const;
+
+	rpl::producer<ResetRetryDate, QString> resetPassword();
+	rpl::producer<rpl::no_value, QString> cancelResetPassword();
+
+private:
+	MTP::Sender _api;
+	mtpRequestId _requestId = 0;
+	std::unique_ptr<Core::CloudPasswordState> _state;
+	rpl::event_stream<Core::CloudPasswordState> _stateChanges;
+
+};
+
+} // namespace Api
--- a/Telegram/SourceFiles/api/api_editing.cpp
+++ b/Telegram/SourceFiles/api/api_editing.cpp
@@ -52,6 +52,10 @@ mtpRequestId EditMessage(
 		ConvertOption::SkipLocal);
 	const auto media = item->media();

+	const auto updateRecentStickers = inputMedia.has_value()
+		? Api::HasAttachedStickers(*inputMedia)
+		: false;
+
 	const auto emptyFlag = MTPmessages_EditMessage::Flag(0);
 	const auto flags = emptyFlag
 	| (!text.isEmpty() || media
@@ -97,6 +101,10 @@ mtpRequestId EditMessage(
 		} else {
 			apply();
 		}
+
+		if (updateRecentStickers) {
+			api->requestRecentStickersForce(true);
+		}
 	}).fail(
 		fail
 	).send();
@@ -165,22 +173,30 @@ void EditMessageWithUploadedDocument(
 		HistoryItem *item,
 		const MTPInputFile &file,
 		const std::optional<MTPInputFile> &thumb,
-		SendOptions options) {
+		SendOptions options,
+		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->document()) {
 		return;
 	}
-	const auto media = PrepareUploadedDocument(item, file, thumb);
+	const auto media = PrepareUploadedDocument(
+		item,
+		file,
+		thumb,
+		std::move(attachedStickers));
 	EditMessageWithUploadedMedia(item, options, media);
 }

 void EditMessageWithUploadedPhoto(
 		HistoryItem *item,
 		const MTPInputFile &file,
-		SendOptions options) {
+		SendOptions options,
+		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->photo()) {
 		return;
 	}
-	const auto media = PrepareUploadedPhoto(file);
+	const auto media = PrepareUploadedPhoto(
+		file,
+		std::move(attachedStickers));
 	EditMessageWithUploadedMedia(item, options, media);
 }

--- a/Telegram/SourceFiles/api/api_editing.h
+++ b/Telegram/SourceFiles/api/api_editing.h
@@ -31,12 +31,14 @@ void EditMessageWithUploadedDocument(
 	HistoryItem *item,
 	const MTPInputFile &file,
 	const std::optional<MTPInputFile> &thumb,
-	SendOptions options);
+	SendOptions options,
+	std::vector<MTPInputDocument> attachedStickers);

 void EditMessageWithUploadedPhoto(
 	HistoryItem *item,
 	const MTPInputFile &file,
-	SendOptions options);
+	SendOptions options,
+	std::vector<MTPInputDocument> attachedStickers);

 mtpRequestId EditCaption(
 	not_null<HistoryItem*> item,
--- a/Telegram/SourceFiles/api/api_hash.cpp
+++ b/Telegram/SourceFiles/api/api_hash.cpp
@@ -40,6 +40,7 @@ namespace {
 int32 CountStickersHash(
 		not_null<Main::Session*> session,
 		bool checkOutdatedInfo) {
+	using Flag = Data::StickersSetFlag;
 	auto result = HashInit();
 	bool foundOutdated = false;
 	const auto &sets = session->data().stickers().sets();
@@ -50,8 +51,8 @@ int32 CountStickersHash(
 			const auto set = it->second.get();
 			if (set->id == Data::Stickers::DefaultSetId) {
 				foundOutdated = true;
-			} else if (!(set->flags & MTPDstickerSet_ClientFlag::f_special)
-				&& !(set->flags & MTPDstickerSet::Flag::f_archived)) {
+			} else if (!(set->flags & Flag::Special)
+				&& !(set->flags & Flag::Archived)) {
 				HashUpdate(result, set->hash);
 			}
 		}
@@ -61,10 +62,14 @@ int32 CountStickersHash(
 		: 0;
 }

-int32 CountRecentStickersHash(not_null<Main::Session*> session) {
+int32 CountRecentStickersHash(
+		not_null<Main::Session*> session,
+		bool attached) {
 	return CountSpecialStickerSetHash(
 		session,
-		Data::Stickers::CloudRecentSetId);
+		attached
+			? Data::Stickers::CloudRecentAttachedSetId
+			: Data::Stickers::CloudRecentSetId);
 }

 int32 CountFavedStickersHash(not_null<Main::Session*> session) {
@@ -80,7 +85,7 @@ int32 CountFeaturedStickersHash(not_null<Main::Session*> session) {

 		const auto it = sets.find(setId);
 		if (it != sets.cend()
-			&& (it->second->flags & MTPDstickerSet_ClientFlag::f_unread)) {
+			&& (it->second->flags & Data::StickersSetFlag::Unread)) {
 			HashUpdate(result, 1);
 		}
 	}
--- a/Telegram/SourceFiles/api/api_hash.h
+++ b/Telegram/SourceFiles/api/api_hash.h
@@ -17,7 +17,8 @@ namespace Api {
 	not_null<Main::Session*> session,
 	bool checkOutdatedInfo = false);
 [[nodiscard]] int32 CountRecentStickersHash(
-	not_null<Main::Session*> session);
+	not_null<Main::Session*> session,
+	bool attached = false);
 [[nodiscard]] int32 CountFavedStickersHash(not_null<Main::Session*> session);
 [[nodiscard]] int32 CountFeaturedStickersHash(
 	not_null<Main::Session*> session);
--- a/Telegram/SourceFiles/api/api_media.cpp
+++ b/Telegram/SourceFiles/api/api_media.cpp
@@ -8,6 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "api/api_media.h"

 #include "data/data_document.h"
+#include "data/stickers/data_stickers_set.h"
 #include "history/history_item.h"

 namespace Api {
@@ -47,7 +48,7 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 		attributes.push_back(MTP_documentAttributeSticker(
 			MTP_flags(0),
 			MTP_string(document->sticker()->alt),
-			document->sticker()->set,
+			Data::InputStickerSet(document->sticker()->set),
 			MTPMaskCoords()));
 	} else if (const auto song = document->song()) {
 		const auto flags = MTPDdocumentAttributeAudio::Flag::f_title
@@ -73,18 +74,24 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(

 } // namespace

-MTPInputMedia PrepareUploadedPhoto(const MTPInputFile &file) {
+MTPInputMedia PrepareUploadedPhoto(
+		const MTPInputFile &file,
+		std::vector<MTPInputDocument> attachedStickers) {
+	const auto flags = attachedStickers.empty()
+		? MTPDinputMediaUploadedPhoto::Flags(0)
+		: MTPDinputMediaUploadedPhoto::Flag::f_stickers;
 	return MTP_inputMediaUploadedPhoto(
-		MTP_flags(0),
+		MTP_flags(flags),
 		file,
-		MTPVector<MTPInputDocument>(),
+		MTP_vector<MTPInputDocument>(ranges::to<QVector>(attachedStickers)),
 		MTP_int(0));
 }

 MTPInputMedia PrepareUploadedDocument(
 		not_null<HistoryItem*> item,
 		const MTPInputFile &file,
-		const std::optional<MTPInputFile> &thumb) {
+		const std::optional<MTPInputFile> &thumb,
+		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->document()) {
 		return MTP_inputMediaEmpty();
 	}
@@ -92,7 +99,8 @@ MTPInputMedia PrepareUploadedDocument(
 	using DocFlags = MTPDinputMediaUploadedDocument::Flag;
 	const auto flags = emptyFlag
 		| (thumb ? DocFlags::f_thumb : emptyFlag)
-		| (item->groupId() ? DocFlags::f_nosound_video : emptyFlag);
+		| (item->groupId() ? DocFlags::f_nosound_video : emptyFlag)
+		| (attachedStickers.empty() ? DocFlags::f_stickers : emptyFlag);
 	const auto document = item->media()->document();
 	return MTP_inputMediaUploadedDocument(
 		MTP_flags(flags),
@@ -100,8 +108,20 @@ MTPInputMedia PrepareUploadedDocument(
 		thumb.value_or(MTPInputFile()),
 		MTP_string(document->mimeString()),
 		ComposeSendingDocumentAttributes(document),
-		MTPVector<MTPInputDocument>(),
+		MTP_vector<MTPInputDocument>(ranges::to<QVector>(attachedStickers)),
 		MTP_int(0));
 }

+bool HasAttachedStickers(MTPInputMedia media) {
+	return media.match([&](const MTPDinputMediaUploadedPhoto &photo) -> bool {
+		return (photo.vflags().v
+			& MTPDinputMediaUploadedPhoto::Flag::f_stickers);
+	}, [&](const MTPDinputMediaUploadedDocument &document) -> bool {
+		return (document.vflags().v
+			& MTPDinputMediaUploadedDocument::Flag::f_stickers);
+	}, [](const auto &d) {
+		return false;
+	});
+}
+
 } // namespace Api
--- a/Telegram/SourceFiles/api/api_media.h
+++ b/Telegram/SourceFiles/api/api_media.h
@@ -11,11 +11,16 @@ class HistoryItem;

 namespace Api {

-MTPInputMedia PrepareUploadedPhoto(const MTPInputFile &file);
+MTPInputMedia PrepareUploadedPhoto(
+	const MTPInputFile &file,
+	std::vector<MTPInputDocument> attachedStickers);

 MTPInputMedia PrepareUploadedDocument(
 	not_null<HistoryItem*> item,
 	const MTPInputFile &file,
-	const std::optional<MTPInputFile> &thumb);
+	const std::optional<MTPInputFile> &thumb,
+	std::vector<MTPInputDocument> attachedStickers);
+
+bool HasAttachedStickers(MTPInputMedia media);

 } // namespace Api
--- a/Telegram/SourceFiles/api/api_sending.cpp
+++ b/Telegram/SourceFiles/api/api_sending.cpp
@@ -32,7 +32,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "storage/file_upload.h"
 #include "mainwidget.h"
 #include "apiwrap.h"
-#include "app.h"

 namespace Api {
 namespace {
@@ -40,22 +39,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 +78,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 +109,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 +251,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 +269,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 +319,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 +378,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 +403,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 +442,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
@@ -9,6 +9,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL

 #include "api/api_authorizations.h"
 #include "api/api_text_entities.h"
+#include "api/api_user_privacy.h"
 #include "main/main_session.h"
 #include "main/main_account.h"
 #include "mtproto/mtp_instance.h"
@@ -41,7 +42,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 {
@@ -474,7 +476,6 @@ void Updates::differenceDone(const MTPupdates_Difference &result) {
 		stateDone(d.vstate());
 	} break;
 	case mtpc_updates_differenceTooLong: {
-		auto &d = result.c_updates_differenceTooLong();
 		LOG(("API Error: updates.differenceTooLong is not supported by Telegram Desktop!"));
 	} break;
 	};
@@ -999,8 +1000,8 @@ void Updates::handleSendActionUpdate(
 			const auto chat = peer->asChat();
 			const auto channel = peer->asChannel();
 			const auto active = chat
-				? (chat->flags() & MTPDchat::Flag::f_call_active)
-				: (channel->flags() & MTPDchannel::Flag::f_call_active);
+				? (chat->flags() & ChatDataFlag::CallActive)
+				: (channel->flags() & ChannelDataFlag::CallActive);
 			if (active) {
 				_pendingSpeakingCallParticipants.emplace(
 					peer).first->second[fromId] = now;
@@ -1030,9 +1031,6 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 		const auto &d = updates.c_updateShortMessage();
 		const auto flags = mtpCastFlags(d.vflags().v)
 			| MTPDmessage::Flag::f_from_id;
-		const auto peerUserId = d.is_out()
-			? d.vuser_id()
-			: MTP_int(_session->userId().bare); // #TODO ids
 		_session->data().addNewMessage(
 			MTP_message(
 				MTP_flags(flags),
@@ -1058,7 +1056,7 @@ void Updates::applyUpdatesNoPtsCheck(const MTPUpdates &updates) {
 				//MTPMessageReactions(),
 				MTPVector<MTPRestrictionReason>(),
 				MTP_int(d.vttl_period().value_or_empty())),
-			MTPDmessage_ClientFlags(),
+			MessageFlags(),
 			NewMessageType::Unread);
 	} break;

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

@@ -1118,7 +1116,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		if (needToAdd) {
 			_session->data().addNewMessage(
 				d.vmessage(),
-				MTPDmessage_ClientFlags(),
+				MessageFlags(),
 				NewMessageType::Unread);
 		}
 	} break;
@@ -1212,7 +1210,7 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {
 		if (needToAdd) {
 			_session->data().addNewMessage(
 				d.vmessage(),
-				MTPDmessage_ClientFlags(),
+				MessageFlags(),
 				NewMessageType::Unread);
 		}
 	} break;
@@ -1250,7 +1248,6 @@ void Updates::applyUpdateNoPtsCheck(const MTPUpdate &update) {

 	case mtpc_updatePinnedMessages: {
 		const auto &d = update.c_updatePinnedMessages();
-		const auto peerId = peerFromMTP(d.vpeer());
 		for (const auto &msgId : d.vmessages().v) {
 			const auto item = session().data().message(0, msgId.v);
 			if (item) {
@@ -1607,7 +1604,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 				history->setUnreadMark(data.is_unread());
 			}
 		}, [&](const MTPDdialogPeerFolder &dialog) {
-			const auto id = dialog.vfolder_id().v; // #TODO archive
+			//const auto id = dialog.vfolder_id().v; // #TODO archive
 			//if (const auto folder = session().data().folderLoaded(id)) {
 			//	folder->setUnreadMark(data.is_unread());
 			//}
@@ -1817,11 +1814,7 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		const auto &d = update.c_updatePeerSettings();
 		const auto peerId = peerFromMTP(d.vpeer());
 		if (const auto peer = session().data().peerLoaded(peerId)) {
-			const auto settings = d.vsettings().match([](
-					const MTPDpeerSettings &data) {
-				return data.vflags().v;
-			});
-			peer->setSettings(settings);
+			peer->setSettings(d.vsettings());
 		}
 	} break;

@@ -1853,7 +1846,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(
@@ -1872,19 +1865,15 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 	} break;

 	case mtpc_updateNewEncryptedMessage: {
-		auto &d = update.c_updateNewEncryptedMessage();
 	} break;

 	case mtpc_updateEncryptedChatTyping: {
-		auto &d = update.c_updateEncryptedChatTyping();
 	} break;

 	case mtpc_updateEncryption: {
-		auto &d = update.c_updateEncryption();
 	} break;

 	case mtpc_updateEncryptedMessagesRead: {
-		auto &d = update.c_updateEncryptedMessagesRead();
 	} break;

 	case mtpc_updatePhoneCall:
@@ -1902,6 +1891,26 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 		}
 	} break;

+	case mtpc_updateBotCommands: {
+		const auto &d = update.c_updateBotCommands();
+		if (const auto peer = session().data().peerLoaded(peerFromMTP(d.vpeer()))) {
+			const auto botId = UserId(d.vbot_id().v);
+			if (const auto user = peer->asUser()) {
+				if (user->isBot() && user->id == peerFromUser(botId)) {
+					if (Data::UpdateBotCommands(user->botInfo->commands, d.vcommands())) {
+						session().data().botCommandsChanged(user);
+					}
+				}
+			} else if (const auto chat = peer->asChat()) {
+				chat->setBotCommands(botId, d.vcommands());
+			} else if (const auto megagroup = peer->asMegagroup()) {
+				if (megagroup->mgInfo->updateBotCommands(botId, d.vcommands())) {
+					session().data().botCommandsChanged(megagroup);
+				}
+			}
+		}
+	} break;
+
 	case mtpc_updateServiceNotification: {
 		const auto &d = update.c_updateServiceNotification();
 		const auto text = TextWithEntities {
@@ -1946,13 +1955,10 @@ void Updates::feedUpdate(const MTPUpdate &update) {
 			}
 			return true;
 		};
-		if (const auto key = ApiWrap::Privacy::KeyFromMTP(d.vkey().type())) {
-			if (allLoaded()) {
-				session().api().handlePrivacyChange(*key, d.vrules());
-			} else {
-				session().api().reloadPrivacy(*key);
-			}
-		}
+		session().api().userPrivacy().apply(
+			d.vkey().type(),
+			d.vrules(),
+			allLoaded());
 	} break;

 	case mtpc_updatePinnedDialogs: {
@@ -2141,31 +2147,46 @@ void Updates::feedUpdate(const MTPUpdate &update) {

 	case mtpc_updateStickerSetsOrder: {
 		auto &d = update.c_updateStickerSetsOrder();
-		if (!d.is_masks()) {
-			const auto &order = d.vorder().v;
-			const auto &sets = session().data().stickers().sets();
-			Data::StickersSetsOrder result;
-			for (const auto &item : order) {
-				if (sets.find(item.v) == sets.cend()) {
-					break;
-				}
-				result.push_back(item.v);
+		auto &stickers = session().data().stickers();
+		const auto isMasks = d.is_masks();
+		const auto &order = d.vorder().v;
+		const auto &sets = stickers.sets();
+		Data::StickersSetsOrder result;
+		for (const auto &item : order) {
+			if (sets.find(item.v) == sets.cend()) {
+				break;
 			}
-			if (result.size() != session().data().stickers().setsOrder().size()
-				|| result.size() != order.size()) {
-				session().data().stickers().setLastUpdate(0);
-				session().api().updateStickers();
+			result.push_back(item.v);
+		}
+		const auto localSize = isMasks
+			? stickers.maskSetsOrder().size()
+			: stickers.setsOrder().size();
+		if ((result.size() != localSize) || (result.size() != order.size())) {
+			if (isMasks) {
+				stickers.setLastMasksUpdate(0);
+				session().api().updateMasks();
 			} else {
-				session().data().stickers().setsOrderRef() = std::move(result);
-				session().local().writeInstalledStickers();
-				session().data().stickers().notifyUpdated();
+				stickers.setLastUpdate(0);
+				session().api().updateStickers();
 			}
+		} else {
+			if (isMasks) {
+				stickers.maskSetsOrderRef() = std::move(result);
+				session().local().writeInstalledMasks();
+			} else {
+				stickers.setsOrderRef() = std::move(result);
+				session().local().writeInstalledStickers();
+			}
+			stickers.notifyUpdated();
 		}
 	} break;

 	case mtpc_updateStickerSets: {
+		// Can't determine is it masks or stickers, so update both.
 		session().data().stickers().setLastUpdate(0);
 		session().api().updateStickers();
+		session().data().stickers().setLastMasksUpdate(0);
+		session().api().updateMasks();
 	} break;

 	case mtpc_updateRecentStickers: {
--- a/Telegram/SourceFiles/api/api_user_privacy.cpp
+++ b/Telegram/SourceFiles/api/api_user_privacy.cpp
@@ -0,0 +1,303 @@
+/*
+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 "api/api_user_privacy.h"
+
+#include "apiwrap.h"
+#include "data/data_chat.h"
+#include "data/data_channel.h"
+#include "data/data_peer.h"
+#include "data/data_peer_id.h"
+#include "data/data_session.h"
+#include "data/data_user.h"
+#include "main/main_session.h"
+
+namespace Api {
+namespace {
+
+constexpr auto kMaxRules = 3; // Allow users, disallow users, Option.
+
+using TLInputRules = MTPVector<MTPInputPrivacyRule>;
+using TLRules = MTPVector<MTPPrivacyRule>;
+
+TLInputRules RulesToTL(const UserPrivacy::Rule &rule) {
+	const auto collectInputUsers = [](const auto &peers) {
+		auto result = QVector<MTPInputUser>();
+		result.reserve(peers.size());
+		for (const auto peer : peers) {
+			if (const auto user = peer->asUser()) {
+				result.push_back(user->inputUser);
+			}
+		}
+		return result;
+	};
+	const auto collectInputChats = [](const auto &peers) {
+		auto result = QVector<MTPint>(); // #TODO ids
+		result.reserve(peers.size());
+		for (const auto peer : peers) {
+			if (!peer->isUser()) {
+				result.push_back(peerToBareMTPInt(peer->id));
+			}
+		}
+		return result;
+	};
+
+	auto result = QVector<MTPInputPrivacyRule>();
+	result.reserve(kMaxRules);
+	if (!rule.ignoreAlways) {
+		const auto users = collectInputUsers(rule.always);
+		const auto chats = collectInputChats(rule.always);
+		if (!users.empty()) {
+			result.push_back(
+				MTP_inputPrivacyValueAllowUsers(
+					MTP_vector<MTPInputUser>(users)));
+		}
+		if (!chats.empty()) {
+			result.push_back(
+				MTP_inputPrivacyValueAllowChatParticipants(
+					MTP_vector<MTPint>(chats)));
+		}
+	}
+	if (!rule.ignoreNever) {
+		const auto users = collectInputUsers(rule.never);
+		const auto chats = collectInputChats(rule.never);
+		if (!users.empty()) {
+			result.push_back(
+				MTP_inputPrivacyValueDisallowUsers(
+					MTP_vector<MTPInputUser>(users)));
+		}
+		if (!chats.empty()) {
+			result.push_back(
+				MTP_inputPrivacyValueDisallowChatParticipants(
+					MTP_vector<MTPint>(chats)));
+		}
+	}
+	result.push_back([&] {
+		using Option = UserPrivacy::Option;
+		switch (rule.option) {
+		case Option::Everyone: return MTP_inputPrivacyValueAllowAll();
+		case Option::Contacts: return MTP_inputPrivacyValueAllowContacts();
+		case Option::Nobody: return MTP_inputPrivacyValueDisallowAll();
+		}
+		Unexpected("Option value in Api::UserPrivacy::RulesToTL.");
+	}());
+
+
+	return MTP_vector<MTPInputPrivacyRule>(std::move(result));
+}
+
+UserPrivacy::Rule TLToRules(const TLRules &rules, Data::Session &owner) {
+	// This is simplified version of privacy rules interpretation.
+	// But it should be fine for all the apps
+	// that use the same subset of features.
+	using Option = UserPrivacy::Option;
+	auto result = UserPrivacy::Rule();
+	auto optionSet = false;
+	const auto setOption = [&](Option option) {
+		if (optionSet) return;
+		optionSet = true;
+		result.option = option;
+	};
+	auto &always = result.always;
+	auto &never = result.never;
+	const auto feed = [&](const MTPPrivacyRule &rule) {
+		rule.match([&](const MTPDprivacyValueAllowAll &) {
+			setOption(Option::Everyone);
+		}, [&](const MTPDprivacyValueAllowContacts &) {
+			setOption(Option::Contacts);
+		}, [&](const MTPDprivacyValueAllowUsers &data) {
+			const auto &users = data.vusers().v;
+			always.reserve(always.size() + users.size());
+			for (const auto userId : users) {
+				const auto user = owner.user(UserId(userId.v));
+				if (!base::contains(never, user)
+					&& !base::contains(always, user)) {
+					always.emplace_back(user);
+				}
+			}
+		}, [&](const MTPDprivacyValueAllowChatParticipants &data) {
+			const auto &chats = data.vchats().v;
+			always.reserve(always.size() + chats.size());
+			for (const auto &chatId : chats) {
+				const auto chat = owner.chatLoaded(chatId);
+				const auto peer = chat
+					? static_cast<PeerData*>(chat)
+					: owner.channelLoaded(chatId);
+				if (peer
+					&& !base::contains(never, peer)
+					&& !base::contains(always, peer)) {
+					always.emplace_back(peer);
+				}
+			}
+		}, [&](const MTPDprivacyValueDisallowContacts &) {
+			// Not supported
+		}, [&](const MTPDprivacyValueDisallowAll &) {
+			setOption(Option::Nobody);
+		}, [&](const MTPDprivacyValueDisallowUsers &data) {
+			const auto &users = data.vusers().v;
+			never.reserve(never.size() + users.size());
+			for (const auto userId : users) {
+				const auto user = owner.user(UserId(userId.v));
+				if (!base::contains(always, user)
+					&& !base::contains(never, user)) {
+					never.emplace_back(user);
+				}
+			}
+		}, [&](const MTPDprivacyValueDisallowChatParticipants &data) {
+			const auto &chats = data.vchats().v;
+			never.reserve(never.size() + chats.size());
+			for (const auto &chatId : chats) {
+				const auto chat = owner.chatLoaded(chatId);
+				const auto peer = chat
+					? static_cast<PeerData*>(chat)
+					: owner.channelLoaded(chatId);
+				if (peer
+					&& !base::contains(always, peer)
+					&& !base::contains(never, peer)) {
+					never.emplace_back(peer);
+				}
+			}
+		});
+	};
+	for (const auto &rule : rules.v) {
+		feed(rule);
+	}
+	feed(MTP_privacyValueDisallowAll()); // Disallow by default.
+	return result;
+}
+
+MTPInputPrivacyKey KeyToTL(UserPrivacy::Key key) {
+	using Key = UserPrivacy::Key;
+	switch (key) {
+	case Key::Calls: return MTP_inputPrivacyKeyPhoneCall();
+	case Key::Invites: return MTP_inputPrivacyKeyChatInvite();
+	case Key::PhoneNumber: return MTP_inputPrivacyKeyPhoneNumber();
+	case Key::AddedByPhone:
+		return MTP_inputPrivacyKeyAddedByPhone();
+	case Key::LastSeen:
+		return MTP_inputPrivacyKeyStatusTimestamp();
+	case Key::CallsPeer2Peer:
+		return MTP_inputPrivacyKeyPhoneP2P();
+	case Key::Forwards:
+		return MTP_inputPrivacyKeyForwards();
+	case Key::ProfilePhoto:
+		return MTP_inputPrivacyKeyProfilePhoto();
+	}
+	Unexpected("Key in Api::UserPrivacy::KetToTL.");
+}
+
+std::optional<UserPrivacy::Key> TLToKey(mtpTypeId type) {
+	using Key = UserPrivacy::Key;
+	switch (type) {
+	case mtpc_privacyKeyPhoneNumber:
+	case mtpc_inputPrivacyKeyPhoneNumber: return Key::PhoneNumber;
+	case mtpc_privacyKeyAddedByPhone:
+	case mtpc_inputPrivacyKeyAddedByPhone: return Key::AddedByPhone;
+	case mtpc_privacyKeyStatusTimestamp:
+	case mtpc_inputPrivacyKeyStatusTimestamp: return Key::LastSeen;
+	case mtpc_privacyKeyChatInvite:
+	case mtpc_inputPrivacyKeyChatInvite: return Key::Invites;
+	case mtpc_privacyKeyPhoneCall:
+	case mtpc_inputPrivacyKeyPhoneCall: return Key::Calls;
+	case mtpc_privacyKeyPhoneP2P:
+	case mtpc_inputPrivacyKeyPhoneP2P: return Key::CallsPeer2Peer;
+	case mtpc_privacyKeyForwards:
+	case mtpc_inputPrivacyKeyForwards: return Key::Forwards;
+	case mtpc_privacyKeyProfilePhoto:
+	case mtpc_inputPrivacyKeyProfilePhoto: return Key::ProfilePhoto;
+	}
+	return std::nullopt;
+}
+
+} // namespace
+
+UserPrivacy::UserPrivacy(not_null<ApiWrap*> api)
+: _session(&api->session())
+, _api(&api->instance()) {
+}
+
+void UserPrivacy::save(
+		Key key,
+		const UserPrivacy::Rule &rule) {
+	const auto tlKey = KeyToTL(key);
+	const auto keyTypeId = tlKey.type();
+	const auto it = _privacySaveRequests.find(keyTypeId);
+	if (it != _privacySaveRequests.cend()) {
+		_api.request(it->second).cancel();
+		_privacySaveRequests.erase(it);
+	}
+
+	const auto requestId = _api.request(MTPaccount_SetPrivacy(
+		tlKey,
+		RulesToTL(rule)
+	)).done([=](const MTPaccount_PrivacyRules &result) {
+		result.match([&](const MTPDaccount_privacyRules &data) {
+			_session->data().processUsers(data.vusers());
+			_session->data().processChats(data.vchats());
+			_privacySaveRequests.remove(keyTypeId);
+			apply(keyTypeId, data.vrules(), true);
+		});
+	}).fail([=](const MTP::Error &error) {
+		_privacySaveRequests.remove(keyTypeId);
+	}).send();
+
+	_privacySaveRequests.emplace(keyTypeId, requestId);
+}
+
+void UserPrivacy::apply(
+		mtpTypeId type,
+		const TLRules &rules,
+		bool allLoaded) {
+	if (const auto key = TLToKey(type)) {
+		if (!allLoaded) {
+			reload(*key);
+			return;
+		}
+		pushPrivacy(*key, rules);
+		if ((*key) == Key::LastSeen) {
+			_session->api().updatePrivacyLastSeens();
+		}
+	}
+}
+
+void UserPrivacy::reload(Key key) {
+	if (_privacyRequestIds.contains(key)) {
+		return;
+	}
+	const auto requestId = _api.request(MTPaccount_GetPrivacy(
+		KeyToTL(key)
+	)).done([=](const MTPaccount_PrivacyRules &result) {
+		_privacyRequestIds.erase(key);
+		result.match([&](const MTPDaccount_privacyRules &data) {
+			_session->data().processUsers(data.vusers());
+			_session->data().processChats(data.vchats());
+			pushPrivacy(key, data.vrules());
+		});
+	}).fail([=](const MTP::Error &error) {
+		_privacyRequestIds.erase(key);
+	}).send();
+	_privacyRequestIds.emplace(key, requestId);
+}
+
+void UserPrivacy::pushPrivacy(Key key, const TLRules &rules) {
+	const auto &saved = (_privacyValues[key] =
+		TLToRules(rules, _session->data()));
+	const auto i = _privacyChanges.find(key);
+	if (i != end(_privacyChanges)) {
+		i->second.fire_copy(saved);
+	}
+}
+
+auto UserPrivacy::value(Key key) -> rpl::producer<UserPrivacy::Rule> {
+	if (const auto i = _privacyValues.find(key); i != end(_privacyValues)) {
+		return _privacyChanges[key].events_starting_with_copy(i->second);
+	} else {
+		return _privacyChanges[key].events();
+	}
+}
+
+} // namespace Api
--- a/Telegram/SourceFiles/api/api_user_privacy.h
+++ b/Telegram/SourceFiles/api/api_user_privacy.h
@@ -0,0 +1,73 @@
+/*
+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
+*/
+#pragma once
+
+#include "mtproto/sender.h"
+
+class ApiWrap;
+
+namespace Main {
+class Session;
+} // namespace Main
+
+namespace Api {
+
+class UserPrivacy final {
+public:
+	enum class Key {
+		PhoneNumber,
+		AddedByPhone,
+		LastSeen,
+		Calls,
+		Invites,
+		CallsPeer2Peer,
+		Forwards,
+		ProfilePhoto,
+	};
+	enum class Option {
+		Everyone,
+		Contacts,
+		Nobody,
+	};
+	struct Rule {
+		Option option = Option::Everyone;
+		std::vector<not_null<PeerData*>> always;
+		std::vector<not_null<PeerData*>> never;
+		bool ignoreAlways = false;
+		bool ignoreNever = false;
+	};
+
+	explicit UserPrivacy(not_null<ApiWrap*> api);
+
+	void save(
+		Key key,
+		const UserPrivacy::Rule &rule);
+	void apply(
+		mtpTypeId type,
+		const MTPVector<MTPPrivacyRule> &rules,
+		bool allLoaded);
+
+	void reload(Key key);
+	rpl::producer<Rule> value(Key key);
+
+private:
+	const not_null<Main::Session*> _session;
+
+	void pushPrivacy(Key key, const MTPVector<MTPPrivacyRule> &rules);
+
+	base::flat_map<mtpTypeId, mtpRequestId> _privacySaveRequests;
+
+	base::flat_map<Key, mtpRequestId> _privacyRequestIds;
+	base::flat_map<Key, Rule> _privacyValues;
+	std::map<Key, rpl::event_stream<Rule>> _privacyChanges;
+
+	MTP::Sender _api;
+
+};
+
+} // namespace Api
--- a/Show More
+++ b/Show More