version 0.6.15

MSVC.md

@@ -66,6 +66,57 @@ or download in ZIP and extract to **D:\TBuild\Libraries\**, rename **libexif-0.6
 * Build Debug configuration
 * Build Release configuration
 
+####OpenAL Soft
+
+Get sources by git – in [Git Bash](http://git-scm.com/downloads) go to **/d/tbuild/libraries** and run
+
+    git clone git://repo.or.cz/openal-soft.git
+
+to have **D:\TBuild\Libraries\openal-soft\CMakeLists.txt**
+
+#####Building library
+
+* Install [CMake](http://www.cmake.org/)
+* Go in **cmd** to **D:\TBuild\Libraries\openal-soft\build\**
+* Run **cmake -G "Visual Studio 12 2013" -D LIBTYPE:STRING=STATIC ..**
+* Open in VS2013 **D:\TBuild\Libraries\openal-soft\build\OpenAL.sln**
+* For **Debug** configuration
+  * OpenAL32 Properties > C/C++ > Code Generation > Runtime Library = **Multi-threaded Debug (/MTd)** – **OK**
+  * common Properties > C/C++ > Code Generation > Runtime Library = **Multi-threaded Debug (/MTd)** – **OK**
+* For **Release** configuration
+  * OpenAL32 Properties > C/C++ > Code Generation > Runtime Library = **Multi-threaded (/MT)** – **OK**
+  * common Properties > C/C++ > Code Generation > Runtime Library = **Multi-threaded (/MT)** – **OK**
+
+####libogg 1.3.2
+
+Get sources from http://xiph.org/downloads/ – in [ZIP](http://downloads.xiph.org/releases/ogg/libogg-1.3.2.zip) and extract to **D:\TBuild\Libraries\**
+
+#####Building library
+
+* Open in VS2013 **D:\TBuild\Libraries\libogg-1.3.2\win32\VS2010\libogg_static.sln** > One-way upgrade – **OK**
+* Build Debug configuration
+* Build Release configuration
+
+####Opus codec, opusfile
+
+Get sources by git – in [Git Bash](http://git-scm.com/downloads) go to **/d/tbuild/libraries** and run
+
+    git clone git://git.opus-codec.org/opus.git
+    git clone git://git.xiph.org/opusfile.git
+
+to have **D:\TBuild\Libraries\opus\win32**
+
+#####Building libraries
+
+* Open in VS2013 **D:\TBuild\Libraries\opus\win32\VS2010\opus.sln** > One-way upgrade – **OK**
+* Build Debug configuration
+* Build Release configuration
+* Open in VS2013 **D:\TBuild\Libraries\opusfile\win32\VS2010\opusfile.sln** > One-way upgrade – **OK**
+* For **Debug** and **Release** configurations
+  * opusfile > C/C++ > General > Additional include directories > Add **../../../libogg-1.3.2/include;**
+* Build Debug configuration
+* Build Release configuration
+
 ####Qt 5.3.1, slightly patched
 
 http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.zip
@@ -86,8 +137,7 @@ There go to Qt directory
 
 and after that run configure
 
-    configure -debug-and-release -opensource -static -opengl desktop -mp -nomake examples -platform win32-msvc2013
-    y
+    configure -debug-and-release -opensource -confirm-license -static -I "D:\TBuild\Libraries\OpenSSL-Win32\include" -L "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Lib" -l Gdi32 -opengl desktop -openssl-linked OPENSSL_LIBS_DEBUG="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MTd.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MTd.lib" OPENSSL_LIBS_RELEASE="D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\ssleay32MT.lib D:\TBuild\Libraries\OpenSSL-Win32\lib\VC\static\libeay32MT.lib" -mp -nomake examples -platform win32-msvc2013
 
 to configure Qt build. After configuration is complete run
 

QTCREATOR.md

@@ -32,6 +32,53 @@ Install dev libraries
 
     sudo apt-get install libexif-dev liblzma-dev libz-dev libssl-dev
 
+Install audio libraries
+
+####libogg-1.3.2
+
+[Download libogg-1.3.2 sources](http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz) from http://xiph.org/downloads, extract to **/home/user/TBuild/Libraries**, go to **/home/user/TBuild/Libraries/libogg-1.3.2** and run
+
+    ./configure
+    make
+    sudo make install
+
+####Opus codec 1.1
+
+[Download opus-1.1 sources](http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz) from http://www.opus-codec.org/downloads, extract to **/home/user/TBuild/Libraries**, go to **/home/user/TBuild/Libraries/opus-1.1** and run
+
+    ./configure
+    make
+    sudo make install
+
+####opusfile-0.6
+
+[Download opusfile-0.6 sources](http://downloads.xiph.org/releases/opus/opusfile-0.6.tar.gz) from http://www.opus-codec.org/downloads, extract to **/home/user/TBuild/Libraries**, go to **/home/user/TBuild/Libraries/opusfile-0.6** and run
+
+    ./configure
+    make
+    sudo make install
+
+####PortAudio 19
+
+[Download portaudio sources](http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz) from **http://www.portaudio.com/download.html**, extract to **/home/user/TBuild/Libraries**, go to **/home/user/TBuild/Libraries/portaudio** and run
+
+    ./configure
+    make
+    sudo make install
+
+####OpenAL Soft
+
+In Terminal go to **/home/user/TBuild/Libraries** and run
+
+    git clone git://repo.or.cz/openal-soft.git
+
+then go to **/home/user/TBuild/Libraries/openal-soft/build** and run 
+
+    sudo apt-get install cmake
+    cmake -D LIBTYPE:STRING=STATIC ..
+    make
+    sudo make install
+
 ####Qt 5.3.1, slightly patched
 
 http://download.qt-project.org/official_releases/qt/5.3/5.3.1/single/qt-everywhere-opensource-src-5.3.1.tar.gz
@@ -49,7 +96,6 @@ Install some packages for Qt (see **/home/user/TBuild/Libraries/QtStatic/qtbase/
 In Terminal go to **/home/user/TBuild/Libraries/QtStatic** and there run
 
     ./configure -release -opensource -confirm-license -qt-xcb -no-opengl -static -nomake examples -skip qtquick1 -skip qtdeclarative
-    y
     make
     sudo make install
 

README.md

@@ -1,6 +1,6 @@
-## [Telegram D](https://tdesktop.com) – Unofficial Telegram Desktop App
+## [Telegram Desktop](https://tdesktop.com) – Official Telegram Messenger app
 
-This is complete source code and build instructions for alpha version of unofficial desktop client for [Telegram](https://telegram.org) messenger, based on [Telegram API](https://core.telegram.org/) and [MTProto](https://core.telegram.org/mtproto) secure protocol.
+This is complete source code and build instructions for alpha version of official desktop client for [Telegram](https://telegram.org) messenger, based on [Telegram API](https://core.telegram.org/) and [MTProto](https://core.telegram.org/mtproto) secure protocol.
 
 Source code is published under GPL v3, license is available [here](https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE).
 
@@ -26,6 +26,9 @@ Source code is published under GPL v3, license is available [here](https://githu
 * libexif 0.6.20 ([LGPL](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html))
 * LZMA SDK 9.20 ([public domain](http://www.7-zip.org/sdk.html))
 * liblzma ([public domain](http://tukaani.org/xz/))
+* OpenAL Soft ([LGPL](http://kcat.strangesoft.net/openal.html))
+* Opus codec, opusfile ([BSD license](http://www.opus-codec.org/license/))
+* libogg ([BSD license](http://www.xiph.org/downloads/))
 * Open Sans font ([Apache License](http://www.apache.org/licenses/LICENSE-2.0.html))
 * DejaVu Sans font ([Free license](http://dejavu-fonts.org/wiki/License))
 

Telegram/DeployLinux.sh

@@ -0,0 +1,16 @@
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion" ]; then
+    echo "tlinuxupd$AppVersion not found!";
+    exit 1
+fi
+
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz" ]; then
+    echo "tsetup.$AppVersionStr.tar.xz not found!"
+    exit 1
+fi
+
+scp ./../Linux/Release/deploy/$AppVersionStr/tlinuxupd$AppVersion tupdates:tdesktop/static/tlinux/
+scp ./../Linux/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.tar.xz tupdates:tdesktop/static/tlinux/
+

Telegram/DeployLinux32.sh

@@ -0,0 +1,16 @@
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion" ]; then
+    echo "tlinux32upd$AppVersion not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz" ]; then
+    echo "tsetup32.$AppVersionStr.zip not found!"
+    exit 1
+fi
+
+scp ./../Linux/Release/deploy/$AppVersionStr/tlinux32upd$AppVersion tupdates:tdesktop/static/tlinux32/
+scp ./../Linux/Release/deploy/$AppVersionStr/tsetup32.$AppVersionStr.tar.xz tupdates:tdesktop/static/tlinux32/
+

Telegram/DeployMacWin.sh

@@ -0,0 +1,34 @@
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+
+if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion" ]; then
+    echo "tmacupd$AppVersion not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg" ]; then
+    echo "tsetup.$AppVersionStr.dmg not found!"
+    exit 1
+fi
+
+if [ ! -f "./../../tother/tsetup/tupdate$AppVersion" ]; then
+    echo "tupdate$AppVersion not found!"
+    exit 1
+fi
+
+if [ ! -f "./../../tother/tsetup/tportable.$AppVersionStr.zip" ]; then
+    echo "tportable.$AppVersionStr.zip not found!"
+    exit 1
+fi
+
+if [ ! -f "./../../tother/tsetup/tsetup.$AppVersionStr.exe" ]; then
+    echo "tsetup.$AppVersionStr.exe not found!"
+    exit 1
+fi
+
+scp ./../Mac/Release/deploy/$AppVersionStr/tmacupd$AppVersion tupdates:tdesktop/static/tmac/
+scp ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg tupdates:tdesktop/static/tmac/
+scp ./../../tother/tsetup/tupdate$AppVersion tupdates:tdesktop/static/tsetup/
+scp ./../../tother/tsetup/tportable.$AppVersionStr.zip tupdates:tdesktop/static/tsetup/
+scp ./../../tother/tsetup/tsetup.$AppVersionStr.exe tupdates:tdesktop/static/tsetup/
+

Telegram/DeployWin.sh

@@ -0,0 +1,21 @@
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion" ]; then
+    echo "tupdate$AppVersion not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip" ]; then
+    echo "tportable.$AppVersionStr.zip not found!"
+    exit 1
+fi
+
+if [ ! -f "./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe" ]; then
+    echo "tsetup.$AppVersionStr.exe not found!"
+    exit 1
+fi
+
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tupdate$AppVersion /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tportable.$AppVersionStr.zip /z/TBuild/tother/tsetup/
+cp -v ./../Win32/Deploy/deploy/$AppVersionStr/tsetup.$AppVersionStr.exe /z/TBuild/tother/tsetup/

Telegram/FixMake.sh

@@ -14,4 +14,7 @@ sed -i 's/\-lssl/\/usr\/lib\/x86_64\-linux\-gnu\/libssl\.a/g' Makefile
 sed -i 's/\-lcrypto/\/usr\/lib\/x86_64\-linux\-gnu\/libcrypto\.a/g' Makefile
 sed -i 's/\-lexif/\/usr\/lib\/x86_64\-linux\-gnu\/libexif\.a/g' Makefile
 sed -i 's/\-lglib\-2\.0/\/usr\/lib\/x86_64\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
-
+sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
+sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
+sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
+sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile

Telegram/FixMake32.sh

@@ -14,4 +14,7 @@ sed -i 's/\-lssl/\/usr\/lib\/i386\-linux\-gnu\/libssl\.a/g' Makefile
 sed -i 's/\-lcrypto/\/usr\/lib\/i386\-linux\-gnu\/libcrypto\.a/g' Makefile
 sed -i 's/\-lexif/\/usr\/lib\/i386\-linux\-gnu\/libexif\.a/g' Makefile
 sed -i 's/\-lglib\-2\.0/\/usr\/lib\/i386\-linux\-gnu\/libglib\-2\.0\.a/g' Makefile
-
+sed -i 's/\-lopusfile/\/usr\/local\/lib\/libopusfile\.a/g' Makefile
+sed -i 's/\-lopus/\/usr\/local\/lib\/libopus\.a/g' Makefile
+sed -i 's/\-lopenal/\/usr\/local\/lib\/libopenal\.a/g' Makefile
+sed -i 's/\-logg/\/usr\/local\/lib\/libogg\.a/g' Makefile

Telegram/MetaEmoji.xcodeproj/project.pbxproj

@@ -515,7 +515,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "MetaEmoji" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -575,25 +575,27 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_BOOL_CONVERSION = NO;
+				CLANG_WARN_CONSTANT_CONVERSION = NO;
 				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = NO;
+				CLANG_WARN_INT_CONVERSION = NO;
+				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Emoji$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
+				GCC_WARN_UNUSED_FUNCTION = NO;
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
 					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
 					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,
@@ -660,27 +662,29 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CC = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_BOOL_CONVERSION = NO;
+				CLANG_WARN_CONSTANT_CONVERSION = NO;
 				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_ENUM_CONVERSION = NO;
+				CLANG_WARN_INT_CONVERSION = NO;
+				CLANG_WARN_UNREACHABLE_CODE = NO;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Emoji$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
+				GCC_WARN_UNUSED_FUNCTION = NO;
+				GCC_WARN_UNUSED_VARIABLE = NO;
 				HEADER_SEARCH_PATHS = (
 					../../Libraries/QtStatic/qtbase/include/QtGui/5.3.1/QtGui,
 					../../Libraries/QtStatic/qtbase/include/QtCore/5.3.1/QtCore,

Telegram/MetaLang.xcodeproj/project.pbxproj

@@ -516,7 +516,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "MetaLang" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -594,11 +594,13 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Lang$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -679,12 +681,14 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Lang$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;

Telegram/MetaStyle.xcodeproj/project.pbxproj

@@ -516,7 +516,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "MetaStyle" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -594,11 +594,13 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Style$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -679,12 +681,14 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)Style$(EFFECTIVE_PLATFORM_NAME)";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;

Telegram/Packer.xcodeproj/project.pbxproj

@@ -483,7 +483,7 @@
 		6DB9C3763D02B1415CD9D565 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0510;
+				LastUpgradeCheck = 0610;
 			};
 			buildConfigurationList = DAC4C1AA5EDEA1C85E9CA5E6 /* Build configuration list for PBXProject "Packer" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -546,10 +546,12 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -634,11 +636,13 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1.0;
 				DYLIB_CURRENT_VERSION = 1.0.0;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;

Telegram/PrepareLinux.sh

@@ -1,5 +1,5 @@
-AppVersionStr=0.5.16
-AppVersion=5016
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"

Telegram/PrepareLinux32.sh

@@ -1,5 +1,5 @@
-AppVersionStr=0.5.16
-AppVersion=5016
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
 
 if [ -d "./../Linux/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"

Telegram/PrepareMac.sh

@@ -1,5 +1,9 @@
-AppVersionStr=0.5.16
-AppVersion=5016
+AppVersion=`./Version.sh | awk -F " " '{print $1}'`
+AppVersionStr=`./Version.sh | awk -F " " '{print $2}'`
+
+echo ""
+echo "Preparing version $AppVersionStr.."
+echo ""
 
 if [ -d "./../Mac/Release/deploy/$AppVersionStr" ]; then
   echo "Deploy folder for version $AppVersionStr already exists!"
@@ -31,18 +35,26 @@ if [ ! -f "./../Mac/Release/Telegram.app/Contents/Frameworks/Updater" ]; then
   exit 1
 fi
 
-if [ ! -f "./../Mac/Release/Telegram.app.dmg" ]; then
-  echo "Telegram.app.dmg not found!"
+cd ./../Mac/Release && codesign --force --deep --sign "Developer ID Application: John Preston" Telegram.app && cd ./../../Telegram
+
+if [ ! -d "./../Mac/Release/Telegram.app/Contents/_CodeSignature" ]; then
+  echo "Telegram signature not found!"
   exit 1
 fi
 
-echo "Preparing version $AppVersionStr, executing Packer.."
+cd ./../Mac/Release
+temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
+cp -R ./Telegram.app "$temppath/"
+bless --folder "$temppath/" --openfolder "$temppath/"
+hdiutil detach "$temppath"
+hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o tsetup.$AppVersionStr.dmg
+cd ./../../Telegram
 cd ./../Mac/Release && ./Packer.app/Contents/MacOS/Packer -path Telegram.app -version $AppVersion && cd ./../../Telegram
-echo "Packer done!"
 
 if [ ! -d "./../Mac/Release/deploy/" ]; then
   mkdir "./../Mac/Release/deploy"
 fi
+
 echo "Copying Telegram.app and tmacupd$AppVersion to deploy/$AppVersionStr..";
 mkdir "./../Mac/Release/deploy/$AppVersionStr"
 mkdir "./../Mac/Release/deploy/$AppVersionStr/Telegram"
@@ -50,6 +62,6 @@ cp -r ./../Mac/Release/Telegram.app ./../Mac/Release/deploy/$AppVersionStr/Teleg
 rm ./../Mac/Release/Telegram.app/Contents/MacOS/Telegram
 rm ./../Mac/Release/Telegram.app/Contents/Frameworks/Updater
 mv ./../Mac/Release/tmacupd$AppVersion ./../Mac/Release/deploy/$AppVersionStr/
-mv ./../Mac/Release/Telegram.app.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
+mv ./../Mac/Release/tsetup.$AppVersionStr.dmg ./../Mac/Release/deploy/$AppVersionStr/tsetup.$AppVersionStr.dmg
 echo "Version $AppVersionStr prepared!";
 

Telegram/PrepareWin.bat

@@ -1,3 +1,49 @@
+@echo OFF
+
+set "AppVersionStrSmall=0.6.15"
+set "AppVersionStr=0.6.15"
+set "AppVersionStrFull=0.6.15.0"
+
+echo.
+echo Preparing version %AppVersionStr%..
+echo.
+
+set "PATH=%PATH%;C:\Program Files\7-Zip;C:\Program Files (x86)\Inno Setup 5"
 cd ..\Win32\Deploy
-Prepare.exe -path Telegram.exe -path Updater.exe
+
+call ..\..\..\TelegramPrivate\Sign.bat Telegram.exe
+if %errorlevel% neq 0 goto error1
+
+call ..\..\..\TelegramPrivate\Sign.bat Updater.exe
+if %errorlevel% neq 0 goto error1
+
+iscc /dMyAppVersion=%AppVersionStrSmall% /dMyAppVersionZero=%AppVersionStr% /dMyAppFullVersion=%AppVersionStrFull% ..\..\Telegram\Setup.iss
+if %errorlevel% neq 0 goto error1
+
+call ..\..\..\TelegramPrivate\Sign.bat tsetup.%AppVersionStr%.exe
+if %errorlevel% neq 0 goto error1
+
+call Prepare.exe -path Telegram.exe -path Updater.exe
+if %errorlevel% neq 0 goto error1
+
+cd deploy\%AppVersionStr%
+mkdir Telegram
+move Telegram.exe Telegram\
+7z a -mx9 tportable.%AppVersionStr%.zip Telegram\
+if %errorlevel% neq 0 goto error2
+
+echo .
+echo Version %AppVersionStr% is ready for deploy!
+echo .
+
+cd ..\..\..\..\Telegram
+goto eof
+
+:error2
+cd ..\..
+:error1
 cd ..\..\Telegram
+echo ERROR occured!
+exit /b %errorlevel%
+
+:eof

Telegram/Resources/lang.txt

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,13 +17,15 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 */
 direction: "LTR";
 
-lng_maintitle: "Telegram D";
+lng_maintitle: "Telegram Desktop";
 
 lng_menu_contacts: "Contacts";
 lng_menu_settings: "Settings";
 lng_menu_about: "About";
+lng_menu_update: "Update";
 
 lng_open_from_tray: "Open Telegram";
+lng_minimize_to_tray: "Minimize to tray";
 lng_quit_from_tray: "Quit Telegram";
 lng_tray_icon_text: "Telegram is still running here,
 you can change this from settings page.
@@ -56,11 +58,15 @@ lng_month_day: "{month} {day}";
 
 lng_cancel: "Cancel";
 lng_continue: "Continue";
-lng_connecting: "Connecting...";
-lng_reconnecting: "Reconnect in %1 s...";
+lng_connecting: "Connecting..";
+lng_reconnecting: "Reconnect in %1 s..";
 lng_reconnecting_try_now: "Try now";
 
-lng_status_offline: "offline";
+lng_status_service_notifications: "service notifications";
+lng_status_offline: "last seen a long time ago";
+lng_status_recently: "last seen recently";
+lng_status_last_week: "last seen within a week";
+lng_status_last_month: "last seen within a month";
 lng_status_invisible: "invisible";
 lng_status_lastseen: "last seen {when}";
 lng_status_lastseen_now: "just now";
@@ -73,6 +79,7 @@ lng_status_lastseen_yesterday: "yesterday at {time}";
 lng_status_lastseen_date: "{date}";
 lng_status_lastseen_date_time: "{date} at {time}";
 lng_status_online: "online";
+lng_status_connecting: "connecting..";
 
 lng_chat_no_members: "Group is unaccessible";
 lng_chat_members: "%1 members";
@@ -82,14 +89,12 @@ lng_server_error: "Internal server error.";
 lng_flood_error: "Too much tries. Please try again later.";
 lng_deleted: "Unknown";
 
-lng_intro1: "Welcome to an unofficial [b]desktop[/b] client
-of [b]Telegram[/b] mobile messenger.";
-lng_intro2: "Visit [a href=\"https://telegram.org/\"]telegram.org[/a] to learn more.";
-lng_start_msgs: "Start Messaging";
+lng_intro: "Welcome to the official [a href=\"https://telegram.org/\"]Telegram[/a] desktop app.
+It's [b]fast[/b] and [b]secure[/b].";
+lng_start_msgs: "START MESSAGING";
 
-lng_intro_back: "Back";
-lng_intro_next: "Next";
-lng_intro_finish: "Finish";
+lng_intro_next: "NEXT";
+lng_intro_finish: "SIGN UP";
 
 lng_phone_ph: "Your phone number";
 lng_phone_title: "Your Phone";
@@ -105,10 +110,10 @@ lng_country_none: "Country not found";
 lng_country_select: "Select Country";
 
 lng_code_ph: "Your code";
-lng_code_desc: "We have sent you an SMS with activation
+lng_code_desc: "We have sent you a message with activation
 code to your phone. Please enter it below.";
 lng_code_call: "Telegram will dial your number in %1:%2";
-lng_code_calling: "Requesting a call from Telegram...";
+lng_code_calling: "Requesting a call from Telegram..";
 lng_code_called: "Telegram dialed your number";
 
 lng_bad_phone: "Invalid phone number. Please try again.";
@@ -119,6 +124,8 @@ lng_bad_chat_title: "Please enter new chat title.";
 lng_bad_photo: "Bad image selected.";
 
 lng_signup_title: "Information and photo";
+lng_signup_desc: "Please enter your name and
+upload a photo.";
 lng_signup_firstname: "First Name";
 lng_signup_lastname: "Last Name";
 
@@ -127,6 +134,9 @@ lng_dlg_conversations: "Conversations";
 lng_dlg_messages: "Messages";
 lng_dlg_new_group_name: "Group name";
 lng_dlg_create_group: "Create";
+lng_no_contacts: "You have no contacts";
+lng_contacts_loading: "Loading..";
+lng_contacts_not_found: "No contacts found";
 
 lng_settings_profile: "Profile";
 lng_settings_edit: "Edit";
@@ -135,7 +145,27 @@ lng_settings_cancel: "Cancel";
 lng_settings_upload: "Set Profile Photo";
 lng_settings_badsize: "This image has bad size, please try other.";
 lng_settings_crop_profile: "Select square area for your profile photo";
-lng_settings_uploading_photo: "Uploading photo...";
+lng_settings_uploading_photo: "Uploading photo..";
+
+lng_username_title: "Change username";
+lng_username_about: "You can choose a username on Telegram.
+If you do, other people will be able to find
+you by this username and contact you
+without knowing your phone number.
+
+You can use a-z, 0-9 and underscores.
+Minimum length is 5 characters.";
+lng_username_invalid: "This name is invalid.";
+lng_username_occupied: "This name is already occupied.";
+lng_username_too_short: "This name is too short.";
+lng_username_bad_symbols: "This name has bad symbols.";
+lng_username_available: "This name is available.";
+
+lng_settings_section_contact_info: "Contact info";
+lng_settings_phone_number: "Phone number:";
+lng_settings_username: "Username:";
+lng_settings_choose_username: "choose username";
+lng_settings_change_username: "Change";
 
 lng_settings_section_notify: "Notifications";
 lng_settings_desktop_notify: "Desktop notifications";
@@ -150,9 +180,9 @@ lng_settings_section_general: "General";
 lng_settings_auto_update: "Update automatically";
 lng_settings_current_version: "Version {version}";
 lng_settings_check_now: "Check for updates";
-lng_settings_update_checking: "Checking for updates...";
+lng_settings_update_checking: "Checking for updates..";
 lng_settings_latest_installed: "Latest version is installed";
-lng_settings_downloading: "Downloading update {ready} / {total} Mb...";
+lng_settings_downloading: "Downloading update {ready} / {total} Mb..";
 lng_settings_update_ready: "New version is ready";
 lng_settings_update_now: "Restart Now";
 lng_settings_update_fail: "Update check failed :(";
@@ -176,8 +206,10 @@ lng_settings_cats_and_dogs: "Allow cats and dogs";
 lng_download_path_dont_ask: "Don't ask download path for each file";
 lng_download_path_label: "Download path: ";
 lng_download_path_temp: "temp folder";
+lng_download_path_default: "default folder";
 lng_download_path_clear: "Clear All";
 lng_download_path_header: "Choose download path";
+lng_download_path_default_radio: "Telegram folder in system «Downloads»";
 lng_download_path_temp_radio: "Temp folder, cleared on logout or uninstall";
 lng_download_path_dir_radio: "Custom folder, cleared only manually";
 lng_download_path_choose: "Choose download path";
@@ -189,10 +221,19 @@ lng_download_path_settings: "Go to Settings";
 lng_download_finish_failed: "File download could not be finished.
 
 Would you like to try again?";
-lng_download_path_clearing: "Clearing...";
+lng_download_path_clearing: "Clearing..";
 lng_download_path_cleared: "Cleared!";
 lng_download_path_clear_failed: "Clear failed :(";
 
+lng_settings_section_cache: "Local storage";
+lng_settings_no_images_cached: "No cached images found!";
+lng_settings_image_cached: "Cached: {count} image, {size}";
+lng_settings_images_cached: "Cached: {count} images, {size}";
+lng_local_images_clear: "Clear All";
+lng_local_images_clearing: "Clearing..";
+lng_local_images_cleared: "Cleared!";
+lng_local_images_clear_failed: "Clear failed :(";
+
 lng_settings_section_advanced: "Advanced";
 lng_connection_type: "Connection type:";
 lng_connection_auto_connecting: "Default (connecting..)";
@@ -211,6 +252,7 @@ lng_connection_save: "Save";
 lng_settings_reset: "Reset other sessions";
 lng_settings_reset_done: "Sessions reset done";
 lng_settings_logout: "Log Out";
+lng_sure_logout: "Are you sure you want to log out?";
 
 lng_settings_need_restart: "You need to restart for applying
 some of the new settings. Restart now?";
@@ -235,15 +277,15 @@ lng_profile_add_participant: "Add Member";
 lng_profile_delete_and_exit: "Leave";
 lng_profile_kick: "Kick";
 lng_profile_sure_kick: "Kick {user} from the group?";
-lng_profile_loading: "Loading...";
+lng_profile_loading: "Loading..";
 lng_profile_shared_media: "Shared media";
 lng_profile_no_media: "No media in this conversation.";
 lng_profile_photo: "{count} photo »";
 lng_profile_photos: "{count} photos »";
 lng_profile_photos_header: "Photos overview";
-lng_profile_video: "{count} videofile »";
-lng_profile_videos: "{count} videofiles »";
-lng_profile_videos_header: "Videofiles overview";
+lng_profile_video: "{count} video file »";
+lng_profile_videos: "{count} video files »";
+lng_profile_videos_header: "Video files overview";
 lng_profile_document: "{count} document »";
 lng_profile_documents: "{count} documents »";
 lng_profile_documents_header: "Documents overview";
@@ -251,6 +293,7 @@ lng_profile_audio: "{count} voice message »";
 lng_profile_audios: "{count} voice messages »";
 lng_profile_audios_header: "Voice messages overview";
 lng_profile_show_all_types: "Show all types";
+lng_profile_copy_phone: "Copy phone number";
 
 lng_participant_filter: "Search";
 lng_participant_invite: "Invite";
@@ -288,24 +331,30 @@ lng_action_checked_in: "{from} checked in";
 lng_forwarded_from: "Forwarded from ";
 
 lng_attach_failed: "Failed";
-lng_attach_file: "File";
+lng_attach_file: "Document";
 lng_attach_photo: "Photo";
 
+lng_media_type: "Media type";
+lng_media_type_photos: "Photos";
+lng_media_type_videos: "Video files";
+lng_media_type_documents: "Documents";
+lng_media_type_audios: "Voice messages";
+
 lng_media_open_with: "Open With";
 lng_media_download: "Download";
 lng_media_cancel: "Cancel";
-lng_media_video: "Video";
-lng_media_audio: "Audio";
+lng_media_video: "Video file";
+lng_media_audio: "Voice message";
 
 lng_in_dlg_photo: "Photo";
 lng_in_dlg_video: "Video";
 lng_in_dlg_geo: "Map";
 lng_in_dlg_contact: "Contact";
 lng_in_dlg_audio: "Audio";
-lng_in_dlg_document: "File";
+lng_in_dlg_document: "Document";
 
 lng_send_button: "Send";
-lng_message_ph: "Write a message...";
+lng_message_ph: "Write a message..";
 lng_empty_history: "";
 lng_willbe_history: "Please select chat to start messaging";
 lng_message_with_from: "[c]{from}:[/c] {message}";
@@ -333,7 +382,7 @@ lng_context_copy_email: "Copy email address";
 lng_context_open_hashtag: "Search by hashtag";
 lng_context_copy_hashtag: "Copy hashtag";
 lng_context_open_image: "Open Image";
-lng_context_save_image: "Save Image As...";
+lng_context_save_image: "Save Image As..";
 lng_context_forward_image: "Forward Image";
 lng_context_delete_image: "Delete Image";
 lng_context_copy_image: "Copy Image";
@@ -342,24 +391,30 @@ lng_context_cancel_download: "Cancel Download";
 lng_context_show_in_folder: "Show in Folder";
 lng_context_show_in_finder: "Show in Finder";
 lng_context_open_video: "Open Video";
-lng_context_save_video: "Save Video As...";
+lng_context_save_video: "Save Video As..";
 lng_context_open_audio: "Open Audio";
-lng_context_save_audio: "Save Audio As...";
+lng_context_save_audio: "Save Audio As..";
 lng_context_open_document: "Open File";
-lng_context_save_document: "Save File As...";
+lng_context_save_document: "Save File As..";
+lng_context_forward_file: "Forward File";
+lng_context_delete_file: "Delete File";
+lng_context_close_file: "Close File";
 lng_context_copy_text: "Copy Message Text";
 lng_context_to_msg: "Go To Message";
 lng_context_forward_msg: "Forward Message";
 lng_context_delete_msg: "Delete Message";
+lng_context_select_msg: "Select Message";
 lng_context_cancel_upload: "Cancel Upload";
 lng_context_copy_selected: "Copy Selected Text";
 lng_context_forward_selected: "Forward Selected";
 lng_context_delete_selected: "Delete Selected";
 lng_context_clear_selection: "Clear Selection";
 lng_really_send_image: "Do you want to send this image?";
+lng_really_send_file: "Do you want to send this file?";
+lng_really_share_contact: "Do you want to share this contact?";
 lng_send_image_compressed: "Send compressed image";
 
-lng_forward_choose: "Choose recipient...";
+lng_forward_choose: "Choose recipient..";
 lng_forward_confirm: "Forward to {recipient}?";
 lng_forward_share_contact: "Share contact to {recipient}?";
 lng_forward_send_file_confirm: "Send «{name}» to {recipient}?";
@@ -404,7 +459,7 @@ lng_selected_delete_confirm: "Delete";
 lng_emoji_no_recent: "Recent emojis will be here";
 
 lng_about_version: "Version {version}";
-lng_about_text: "Unofficial free messaging app based on [a href=\"https://core.telegram.org/mtproto\"]MTProto[/a] and
+lng_about_text: "Official free messaging app based on [a href=\"https://core.telegram.org/mtproto\"]MTProto[/a] and
 [a href=\"https://core.telegram.org/api\"]Telegram API[/a] for speed and security
 
 This software is licensed under [a href=\"https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\"]GNU GPL[/a] version 3,
@@ -414,15 +469,18 @@ lng_about_done: "Done";
 lng_search_no_results: "No messages found";
 lng_search_one_result: "Found {count} message";
 lng_search_n_results: "Found {count} messages";
+lng_search_global_results: "Global search results";
 
-lng_mediaview_close: "Close";
-lng_mediaview_save: "Save as";
+lng_mediaview_save: "Download";
 lng_mediaview_forward: "Forward";
 lng_mediaview_delete: "Delete";
 lng_mediaview_single_photo: "Single Photo";
 lng_mediaview_group_photo: "Group Photo";
 lng_mediaview_profile_photo: "Profile Photo";
-lng_mediaview_n_of_count: "{n} of {count}";
+lng_mediaview_n_of_count: "Photo {n} of {count}";
+lng_mediaview_doc_image: "Document";
+
+lng_mediaview_saved: "Image was saved to your [c]Downloads[/c] folder";
 
 // Mac specific
 
@@ -435,5 +493,22 @@ lng_mac_always_open_with: "Always Open With";
 lng_mac_this_app_can_open: "This application can open \"{file}\".";
 lng_mac_not_known_app: "It's not known if this application can open \"{file}\".";
 
-// Keys finished
+lng_mac_menu_about: "About Telegram";
+lng_mac_menu_preferences: "Preferences...";
+lng_mac_menu_file: "File";
+lng_mac_menu_logout: "Log Out";
+lng_mac_menu_edit: "Edit";
+lng_mac_menu_undo: "Undo";
+lng_mac_menu_redo: "Redo";
+lng_mac_menu_cut: "Cut";
+lng_mac_menu_copy: "Copy";
+lng_mac_menu_paste: "Paste";
+lng_mac_menu_delete: "Delete";
+lng_mac_menu_select_all: "Select All";
+lng_mac_menu_window: "Window";
+lng_mac_menu_contacts: "Contacts";
+lng_mac_menu_add_contact: "Add Contact";
+lng_mac_menu_new_group: "New Group";
+lng_mac_menu_show: "Show Telegram";
 
+// Keys finished

Telegram/Resources/style.txt

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,15 +20,16 @@ semibold: 'Open Sans Semibold';
 
 fsize: 13px;
 
-spriteFile: ':/gui/art/sprite.png' / 2:':/gui/art/sprite_125x.png' / 3:':/gui/art/sprite_150x.png' / 4:':/gui/art/sprite_200x.png'; // exceptional value for retina
-emojisFile: ':/gui/art/emoji.png' / 2:':/gui/art/emoji_125x.png' / 3:':/gui/art/emoji_150x.png' / 4:':/gui/art/emoji_200x.png'; // exceptional value for retina
-emojiImgSize: 16px; // exceptional value for retina
-emojiSize: 16px;
-emojiPadding: 1px;
+spriteFile: ':/gui/art/sprite.png' / 2:':/gui/art/sprite_125x.png' / 3:':/gui/art/sprite_150x.png' / 4:':/gui/art/sprite_200x.png';
+emojisFile: ':/gui/art/emoji.png' / 2:':/gui/art/emoji_125x.png' / 3:':/gui/art/emoji_150x.png' / 4:':/gui/art/emoji_200x.png';
+emojiImgSize: 18px; // exceptional value for retina
+emojiSize: 18px;
+emojiPadding: 0px;
 
-counterBG: #b42f35;
-counterMuteBG: #777;
+counterBG: #f23c34;
+counterMuteBG: #888;
 counterColor: #fff;
+counterMacInvColor: #ffffff01;
 
 lineWidth: 1px;
 
@@ -85,6 +86,7 @@ sysUpd: sysButton {
 	overColor: white;
 	duration: 150;
 }
+updateBlinkDuration: 500;
 sysMin: sysButton(sysUpd) {
 	img: sprite(207px, 1px, 19px, 19px);
 }
@@ -243,9 +245,9 @@ inpDefFlat: flatInput {
 }
 
 inpDefGray: flatInput(inpDefFlat) {
-	bgColor: #ebebeb;
+	bgColor: #f2f2f2;
 	borderWidth: 2px;
-	borderColor: #ebebeb;
+	borderColor: #f2f2f2;
 	borderActive: #80cff9;
 	borderError: #ed8080;
 	phColor: #808080;
@@ -304,20 +306,18 @@ labelDefFlat: flatLabel {
 	align: align(left);
 }
 
-introSkip: 20px;
+introBtnTop: 288px;
+introSkip: 45px;
 introFinishSkip: 15px;
-introHeaderFont: font(28px);
+introPhotoSize: 98px;
+introHeaderFont: font(24px);
 introHeaderSkip: 14px;
-introFont: font(17px);
-introVersionFont: introFont;
-introVersionColor: #9b9b9b;
-introVersionSkip: 10px;
-intro2Skip: 60px;
-intro1Skip: 14px;
+introIconSkip: 54px;
+introFont: font(16px);
 introColor: black;
-
 introLabel: flatLabel(labelDefFlat) {
 	font: introFont;
+	align: align(center);
 }
 
 introPointsTop: -30px; // intro steps bottom points
@@ -348,32 +348,29 @@ introHideFunc: transition(easeInCirc);
 introShowFunc: transition(easeOutCirc);
 introAlphaHideFunc: transition(easeOutCirc);
 introAlphaShowFunc: transition(easeInCirc);
-introTextSize: size(400px, 97px);
-
-introTitleFont: font(24px);
-introDescFont: font(18px);
+introTextTop: 22px;
+introTextSize: size(400px, 93px);
+introCallSkip: 15px;
 
 btnIntroSep: 12px;
 btnIntroNext: flatButton(btnDefNext, btnDefBig) {
-	width: 144px;
-}
-btnIntroBack: flatButton(btnIntroNext, btnDefBack) {
-}
+	textTop: 16px;
+	overTextTop: 16px;
+	downTextTop: 17px;
+
+	font: font(17px);
+	overFont: font(17px);
 
-btnIntroStart: flatButton(btnIntroNext) {
 	width: 300px;
 }
-btnIntroFinish: flatButton(btnIntroNext) {
-	width: 240px;
-}
 
 boxShadow: sprite(240px, 21px, 9px, 9px);
 
 introCountry: countryInput {
 	width: 300px;
 	height: 41px;
-	top: 24px;
-	bgColor: #ebebeb;
+	top: 33px;
+	bgColor: #f2f2f2;
 	ptrSize: size(15px, 8px);
 	textMrg: margins(16px, 5px, 16px, 15px);
 	font: inpDefFont;
@@ -395,13 +392,14 @@ inpIntroCode: flatInput(inpDefGray) {
 	textMrg: margins(12px, 5px, 12px, 6px);
 	width: 106px;
 	height: 41px;
+	align: align(center);
 
 	phPos: point(0px, 0px);
 	phAlign: align(center);
 	phShift: 0px;
 }
 inpIntroName: flatInput(inpIntroPhone) {
-	width: 240px;
+	width: 192px;
 }
 
 introSelectDelta: 30px;
@@ -445,7 +443,7 @@ countryList: countryList {
 	color: #000;
 	codeColor: #aaaaaa;//rgb(20, 136, 210);
 	bgColor: #FFF;
-	bgHovered: #f1f1f1;
+	bgHovered: #f5f5f5;
 	margin: 13px;
 	codeWidth: 60px;
 
@@ -463,8 +461,6 @@ countriesBackShowFunc: transition(linear);
 countriesAlphaHideFunc: transition(easeOutCirc);
 countriesAlphaShowFunc: transition(easeInCirc);
 
-introBtnTop: 244px;
-
 introErrWidth: 450px;
 introErrDuration: 200;
 introErrFunc: transition(linear);
@@ -476,6 +472,7 @@ introErrFont: font(16px);
 
 introErrLabel: flatLabel(labelDefFlat) {
 	font: introErrFont;
+	align: align(center);
 }
 
 setWidth: 356px;
@@ -483,10 +480,9 @@ setTop: 26px;
 setNameLeft: 3px;
 setNameTop: 1px;
 setNameFont: font(22px);
-setPhoneFont: font(16px);
-setPhoneColor: #999;
-setPhoneTop: 39px;
-setPhoneLeft: 1px;
+setStatusTop: 39px;
+setStatusLeft: 1px;
+setStatusFont: font(16px);
 setPhotoSize: 120px;
 setHeaderFont: font(20px);
 setHeaderColor: black;
@@ -505,15 +501,17 @@ setScroll: flatScroll(scrollDef) {
 	topsh: 0px;
 }
 setClose: iconedButton(btnDefIconed) {
-	icon: sprite(245px, 221px, 43px, 43px);
+	icon: sprite(245px, 221px, 40px, 40px);
 	iconPos: point(0px, 0px);
-	downIcon: sprite(245px, 221px, 43px, 43px);
+	downIcon: sprite(245px, 221px, 40px, 40px);
 	downIconPos: point(0px, 0px);
 
+	opacity: 0.71;
+
 	width: 43px;
 	height: 43px;
 }
-setClosePos: point(18px, 18px);
+setClosePos: point(32px, 32px);
 setPhotoImg: sprite(0px, 220px, 120px, 120px);
 setOverPhotoImg: sprite(122px, 220px, 120px, 120px);
 setPhotoDuration: 150;
@@ -534,6 +532,7 @@ setErrBG: #ffa5a5;
 setErrColor: #800000;
 setErrHeight: 30px;
 setErrFont: font(fsize);
+setGoodColor: #008000;
 
 btnSetUpload: flatButton(btnDefNext, btnDefBig) {
 	width: 206px;
@@ -597,22 +596,9 @@ dlgPaddingVer: 8px;
 dlgHeight: 62px;
 dlgPhotoPadding: 12px;
 
-dlgState: switcher {
-	border: 2px;
-	borderColor: btnNextBG;
-
-	bgColor: #fff;
-	bgHovered: btnWhiteHover;
-	bgActive: btnNextBG;
-
-	height: 34px;
-
-	font: font(fsize);
-	textColor: btnYesColor;
-	activeColor: #fff;
-
-	duration: 200;
-}
+noContactsHeight: 100px;
+noContactsFont: font(fsize);
+noContactsColor: #777;
 
 dlgSep: 8px;
 
@@ -753,6 +739,7 @@ msgFont: font(fsize);
 msgNameFont: font(fsize semibold);
 msgServiceFont: font(fsize semibold);
 msgServiceNameFont: font(fsize semibold);
+msgServicePhotoWidth: 100px;
 msgDateFont: font(13px);
 msgMinWidth: 190px;
 msgPhotoSize: 30px;
@@ -839,6 +826,10 @@ outTextStyle: textStyle(defaultTextStyle) {
 	selectBG: msgOutSelectBG;
 	selectOverlay: msgOutSelectOverlay;
 }
+medviewSaveAsTextStyle: textStyle(defaultTextStyle) {
+	lnkColor: #91d9ff;
+	lnkDownColor: #91d9ff;
+}
 
 dlgTextStyle: textStyle(defaultTextStyle) {
 	lnkColor: dlgSystemColor;
@@ -850,28 +841,40 @@ dlgActiveTextStyle: textStyle(defaultTextStyle) {
 	lnkDownColor: dlgActiveColor;
 	lnkOverFlags: font(fsize);
 }
+introLabelTextStyle: textStyle(defaultTextStyle) {
+	lineHeight: 30px;
+}
+introErrLabelTextStyle: textStyle(defaultTextStyle) {
+	lineHeight: 27px;
+}
 
 mediaMaxWidth: 250px;
 mediaFont: font(fsize);
 mediaPadding: margins(7px, 6px, 11px, 6px);
 mediaThumbSize: 48px;
+mediaNameTop: 3px;
+mediaDetailsShift: 3px;
 mediaDocOutImg: sprite(6px, 146px, 48px, 48px);
 mediaDocInImg: sprite(56px, 146px, 48px, 48px);
 mediaAudioOutImg: sprite(106px, 146px, 48px, 48px);
 mediaAudioInImg: sprite(156px, 146px, 48px, 48px);
+mediaPlayOutImg: sprite(122px, 341px, 48px, 48px);
+mediaPlayInImg: sprite(172px, 341px, 48px, 48px);
+mediaPauseOutImg: sprite(222px, 341px, 48px, 48px);
+mediaPauseInImg: sprite(272px, 341px, 48px, 48px);
 mediaInColor: msgInDateColor;
 mediaOutColor: msgOutDateColor;
 mediaInSelectColor: msgInSelectDateColor;
 mediaOutSelectColor: msgOutSelectDateColor;
 mediaSaveDelta: 14px; // between bubble and download
 mediaSaveButton: flatButton(btnDefFlat) {
-	color: btnYesColor;
-	overColor: btnYesHover;
-	downColor: btnYesHover;
+	color: #507da2;
+	overColor: #507da2;
+	downColor: #507da2;
 
 	bgColor: white;
-	overBgColor: btnWhiteHover;
-	downBgColor: btnWhiteHover;
+	overBgColor: #f5f8fa;
+	downBgColor: #f5f8fa;
 
 	width: -28px;
 	height: 34px;
@@ -935,7 +938,7 @@ historyScroll: flatScroll(scrollDef) {
 	barOverColor: #89a0b4bc;
 	bgOverColor: #89a0b46b;
 
-	round: 2px;
+	round: 0px;
 
 	width: 12px;
 	deltax: 3px;
@@ -1066,7 +1069,7 @@ profileListPhotoSize: 46px;
 profileListPadding: size(12px, 6px);
 profileListNameTop: 8px;
 profileListStatusBottom: 6px;
-profileHoverBG: #f1f1f1;
+profileHoverBG: #f5f5f5;
 profileActiveBG: #6294b9;
 profileSubFont: font(fsize);
 profileCheckRect: sprite(88px, 108px, 24px, 24px);
@@ -1215,7 +1218,7 @@ contactsClose: flatButton {
 	overColor: btnYesHover;
 	downColor: btnYesHover;
 
-	bgColor: #fffe;
+	bgColor: white;
 	overBgColor: white;
 	downBgColor: white;
 
@@ -1303,6 +1306,20 @@ dropdownAttachPhoto: iconedButton(dropdownAttachDocument) {
 	icon: sprite(113px, 0px, 24px, 24px);
 	downIcon: sprite(113px, 0px, 24px, 24px);
 }
+dropdownMediaPhotos: iconedButton(dropdownAttachPhoto) {
+	width: 200px;
+}
+dropdownMediaVideos: iconedButton(dropdownMediaPhotos) {
+	icon: sprite(79px, 348px, 24px, 24px);
+	downIcon: sprite(79px, 348px, 24px, 24px);
+}
+dropdownMediaDocuments: iconedButton(dropdownAttachDocument) {
+	width: 200px;
+}
+dropdownMediaAudios: iconedButton(dropdownMediaDocuments) {
+	icon: sprite(49px, 348px, 24px, 24px);
+	downIcon: sprite(49px, 348px, 24px, 24px);
+}
 
 dragFont: font(28px semibold);
 dragSubfont: font(20px semibold);
@@ -1441,48 +1458,115 @@ emojiPanDuration: 200;
 emojiPanHover: #f0f0f0;
 emojiPanRound: 2px;
 
-medviewNavBarWidth: 120px;
-medviewTopSkip: 66px;
-medviewBottomSkip: 66px;
-medviewMainWidth: 600px;
-medviewLightOpacity: 0.7;
-medviewDarkOpacity: 0.8;
+medviewNavBarWidth: 132px;
 medviewLightNav: 0.5;
-medviewHeaderFont: font(semibold 18px);
-medviewDateFont: font(fsize);
-medviewNameTop: 3px;
-medviewDateTop: 25px;
-medviewHeaderColor: #ffffffc0;
-medviewNameColor: medviewHeaderColor;
-medviewNameOverColor: #fff;
 medviewDarkNav: 1;
-medviewMinWidth: 600;
-medviewLeft: sprite(0px, 340px, 22px, 40px);
-medviewRight: sprite(22px, 340px, 22px, 40px);
+medviewHeaderFont: font(semibold 18px);
+medviewNameFont: font(16px);
+medviewDateFont: font(14px);
+medviewNameTop: 13px;
+medviewDateTop: 39px;
+medviewLeft: sprite(340px, 79px, 28px, 48px);
+medviewRight: sprite(368px, 79px, 28px, 48px);
 medviewDeltaFromLastAction: 5px;
 medviewSwipeDistance: 80px;
-medviewButton: flatButton(btnDefFlat) {
-	color: #ffffff80;
-	overColor: #fff;
-	downColor: #fff;
 
+medviewSaveMsgCheck: sprite(341px, 174px, 22px, 18px);
+medviewSaveMsgFont: font(16px);
+medviewSaveMsgPadding: margins(55px, 19px, 29px, 20px);
+medviewSaveMsgCheckPos: point(23px, 21px);
+medviewSaveMsgRadius: 3px;
+medviewSaveMsgShowing: 200;
+medviewSaveMsgShown: 2000;
+medviewSaveMsgHiding: 2500;
+medviewSaveMsg: #000000b2;
+
+medviewOverview: iconedButton(btnDefIconed) {
 	bgColor: #0000;
-	overBgColor: #00000055;
-	downBgColor: #00000055;
-
-	width: 100px;
-	height: 46px;
-
-	textTop: 13px;
-	overTextTop: 13px;
-	downTextTop: 14px;
-
+	overBgColor: #00000040;
 	font: font(16px);
-	overFont: font(16px);
+
+	opacity: 0.77;
+	overOpacity: 1;
+
+	icon: sprite(340px, 129px, 19px, 19px);
+	iconPos: point(16px, 14px);
+	downIcon: sprite(340px, 129px, 19px, 19px);
+	downIconPos: point(16px, 14px);
+
+	width: -69px;
+	height: 47px;
+
+	color: white;
+
+	textPos: point(51px, 13px);
+	downTextPos: point(51px, 14px);
 }
+medviewForward: iconedButton(medviewOverview) {
+	icon: sprite(357px, 58px, 22px, 17px);
+	iconPos: point(16px, 15px);
+	downIcon: sprite(357px, 58px, 22px, 17px);
+	downIconPos: point(16px, 15px);
+
+	width: -69px;
+}
+medviewDelete: iconedButton(medviewForward) {
+	icon: sprite(340px, 58px, 15px, 19px);
+	iconPos: point(16px, 14px);
+	downIcon: sprite(340px, 58px, 15px, 19px);
+	downIconPos: point(16px, 14px);
+}
+medviewClose: iconedButton(medviewOverview) {
+	icon: sprite(340px, 0px, 56px, 56px);
+	iconPos: point(0px, 0px);
+	downIcon: sprite(340px, 0px, 56px, 56px);
+	downIconPos: point(0px, 0px);
+
+	opacity: 0.6;
+
+	width: 56px;
+	height: 56px;
+}
+medviewBottomBar: 87px;
+medviewBG: #272727D9;
+medviewBottomBG: #272727;
+medviewNavOpacity: 0.6;
+medviewCloseOpacity: 0.6;
+medviewNavBGOpacity: 0.4;
+medviewNavOverOpacity: 1;
+medviewCloseOverOpacity: 1;
+medviewNameColor: black;
+medviewDateColor: #999;
+medviewSaveAs: iconedButton(medviewOverview) {
+	bgColor: #38abe6;
+	overBgColor: #299fdc;
+
+	opacity: 1;
+
+	icon: sprite(361px, 129px, 12px, 19px);
+	iconPos: point(18px, 15px);
+	downIcon: sprite(361px, 129px, 12px, 19px);
+	downIconPos: point(18px, 15px);
+
+	width: -62px;
+	height: 47px;
+
+	textPos: point(44px, 13px);
+	downTextPos: point(44px, 14px);
+}
+medviewSaveAsDisabledOpacity: 0.8;
+medviewPolaroid: margins(17px, 18px, 17px, 72px);
+medviewPolaroidMin: size(480px, 360px);
+medviewDocumentSprite: sprite(341px, 150px, 20px, 22px);
+medviewDocumentSpritePos: point(16px, 13px);
+medviewPhotoSprite: sprite(363px, 150px, 23px, 20px);
+medviewPhotoSpritePos: point(14px, 14px);
 
 overviewPhotoSkip: 10px;
 overviewPhotoMinSize: 100px;
+overviewPhotoCheck: sprite(245px, 308px, 32px, 32px);
+overviewPhotoChecked: sprite(278px, 308px, 32px, 32px);
+overviewPhotoSelectOverlay: #0a7bb03f;
 
 // Mac specific
 
@@ -1493,3 +1577,61 @@ macSelectorTop: 6;
 macAlwaysThisAppTop: 4;
 macAppHintTop: 8;
 macCautionIconSize: size(16, 16);
+
+btnContext: iconedButton(btnDefIconed) {
+	bgColor: white;
+	overBgColor: btnWhiteHover;
+	font: font(14px);
+
+	opacity: 1;
+	overOpacity: 1;
+
+	width: 172px;
+	height: 36px;
+
+	color: black;
+
+	textPos: point(16px, 7px);
+	downTextPos: point(16px, 8px);
+}
+
+photoLoader: size(52px, 22px);
+photoLoaderBg: #00000054;
+photoLoaderCnt: 3;
+photoLoaderPoint: size(6px, 6px);
+photoLoaderSkip: 6px;
+photoLoaderPeriod: 600; // ms full period
+photoLoaderDelta: 150; // ms between points
+photoLoaderDuration1: 150; // ms fade in
+photoLoaderDuration2: 150; // ms fade out
+photoLoaderAlphaMin: 0.1; // not less than that
+
+overviewLoader: size(34px, 14px);
+overviewLoaderPoint: size(4px, 4px);
+overviewLoaderSkip: 4px;
+
+mediaviewLoader: size(78px, 33px);
+mediaviewLoaderPoint: size(9px, 9px);
+mediaviewLoaderSkip: 9px;
+
+minPhotoWidth: 90px;
+minPhotoHeight: 90px;
+maxMediaSize: 420px;
+
+usernameFont: font(14px);
+usernameColor: #777;
+usernameWidth: 336px;
+usernameSkip: 32px;
+usernameInput: flatInput(inpAddContact) {
+	bgColor: transparent;
+}
+usernameDone: flatButton(btnSelectDone) {
+	width: 168px;
+}
+usernameCancel: flatButton(btnSelectCancel) {
+	width: 167px;
+}
+
+youtubeIcon: sprite(336px, 221px, 60px, 60px);
+vimeoIcon: sprite(336px, 283px, 60px, 60px);
+locationSize: size(320, 240);

Telegram/Resources/style_classes.txt

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/Setup.iss

@@ -2,11 +2,8 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppShortName "Telegram"
-#define MyAppName "Telegram Win (Unofficial)"
-#define MyAppVersion "0.5.16"
-#define MyAppVersionZero "0.5.16"
-#define MyAppFullVersion "0.5.16.0"
-#define MyAppPublisher "Telegram (Unofficial)"
+#define MyAppName "Telegram Desktop"
+#define MyAppPublisher "Telegram Messenger LLP"
 #define MyAppURL "https://tdesktop.com"
 #define MyAppExeName "Telegram.exe"
 #define MyAppId "53F49750-6209-4FBF-9CA8-7A333C87D1ED"
@@ -28,7 +25,7 @@ DefaultGroupName={#MyAppName}
 AllowNoIcons=yes
 OutputDir=.\..\Win32\Deploy
 OutputBaseFilename=tsetup.{#MyAppVersionZero}
-SetupIconFile=.\SourceFiles\art\iconround256.ico
+SetupIconFile=.\SourceFiles\art\icon256.ico
 UninstallDisplayIcon={app}\Telegram.exe
 Compression=lzma
 SolidCompression=yes         

Telegram/SignMac.sh

@@ -1 +0,0 @@
-codesign --force --sign "Developer ID Application: John Preston" ./../Mac/Release/Telegram.app

Telegram/SourceFiles/_other/genemoji.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/genlang.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -220,7 +220,7 @@ Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+an official desktop messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -283,7 +283,7 @@ Created from \'/Resources/lang.txt\' by \'/MetaLang\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+an official desktop messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\

Telegram/SourceFiles/_other/genlang.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/genstyles.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -361,7 +361,7 @@ Created from \'/Resources/style_classes.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+an official desktop messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -1498,7 +1498,7 @@ Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+an official desktop messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\
@@ -1521,7 +1521,7 @@ Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\
 WARNING! All changes made in this file will be lost!\n\
 \n\
 This file is part of Telegram Desktop,\n\
-an unofficial desktop messaging app, see https://telegram.org\n\
+an official desktop messaging app, see https://telegram.org\n\
 \n\
 Telegram Desktop is free software: you can redistribute it and/or modify\n\
 it under the terms of the GNU General Public License as published by\n\

Telegram/SourceFiles/_other/genstyles.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/memain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 #include "memain.h"
 
 int main(int argc, char *argv[]) {
-	QString emoji_in("."), emoji_out("emoji_config.cpp"), emoji_png("./SourceFiles/art/emoji");
+	QString emoji_in("./SourceFiles/art/emojisprite_"), emoji_out("./SourceFiles/gui/emoji_config.cpp"), emoji_png("./SourceFiles/art/emoji");
 	for (int i = 0; i < argc; ++i) {
 		if (string("-emoji_in") == argv[i]) {
 			if (++i < argc) emoji_in = argv[i];

Telegram/SourceFiles/_other/memain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/mlmain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/mlmain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/msmain.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/msmain.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/packer.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -189,7 +189,7 @@ int main(int argc, char *argv[])
 	}
 	for (QFileInfoList::iterator i = files.begin(); i != files.end(); ++i) {
 		QFileInfo info(*i);
-		if (info.canonicalFilePath().indexOf(remove) != 0) {
+		if (!info.canonicalFilePath().startsWith(remove)) {
 			cout << "Can't find '" << remove.toUtf8().constData() << "' in file '" << info.canonicalFilePath().toUtf8().constData() << "' :(\n";
 			return -1;
 		}

Telegram/SourceFiles/_other/packer.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/prepare.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -94,6 +94,5 @@ int main(int argc, char *argv[])
 		}
 	}
 	int res = prepare(f, paths);
-	system("PAUSE");
 	return res;
 }

Telegram/SourceFiles/_other/prepare.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/updater.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -271,12 +271,16 @@ void updateRegistry() {
 							if (GetFullPathName(L".", bufSize, exp, 0) < bufSize) {
 								wstring installpath = locationStr, mypath = exp;
 								if (installpath == mypath + L"\\" || true) { // always update reg info, if we found it
-									WCHAR nameStr[bufSize], dateStr[bufSize];
+									WCHAR nameStr[bufSize], dateStr[bufSize], publisherStr[bufSize], icongroupStr[bufSize];
 									SYSTEMTIME stLocalTime;
 									GetLocalTime(&stLocalTime);
 									RegSetValueEx(rkey, L"DisplayVersion", 0, REG_SZ, (BYTE*)versionStr, ((versionLen / 2) + 1) * sizeof(WCHAR));
-									wsprintf(nameStr, L"Telegram Win (Unofficial) version %s", versionStr);
+									wsprintf(nameStr, L"Telegram Desktop version %s", versionStr);
 									RegSetValueEx(rkey, L"DisplayName", 0, REG_SZ, (BYTE*)nameStr, (wcslen(nameStr) + 1) * sizeof(WCHAR));
+									wsprintf(publisherStr, L"Telegram Messenger LLP");
+									RegSetValueEx(rkey, L"Publisher", 0, REG_SZ, (BYTE*)publisherStr, (wcslen(publisherStr) + 1) * sizeof(WCHAR));
+									wsprintf(icongroupStr, L"Telegram Desktop");
+									RegSetValueEx(rkey, L"Inno Setup: Icon Group", 0, REG_SZ, (BYTE*)icongroupStr, (wcslen(icongroupStr) + 1) * sizeof(WCHAR));
 									wsprintf(dateStr, L"%04d%02d%02d", stLocalTime.wYear, stLocalTime.wMonth, stLocalTime.wDay);
 									RegSetValueEx(rkey, L"InstallDate", 0, REG_SZ, (BYTE*)dateStr, (wcslen(dateStr) + 1) * sizeof(WCHAR));
 
@@ -358,7 +362,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParama
 }
 
 #ifdef _NEED_WIN_GENERATE_DUMP
-static const WCHAR *_programName = L"Telegram Win (Unofficial)"; // folder in APPDATA, if current path is unavailable for writing
+static const WCHAR *_programName = L"Telegram Desktop"; // folder in APPDATA, if current path is unavailable for writing
 static const WCHAR *_exeName = L"Updater.exe";
 
 LPTOP_LEVEL_EXCEPTION_FILTER _oldWndExceptionFilter = 0;

Telegram/SourceFiles/_other/updater.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/updater_linux.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/_other/updater_osx.m

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

Telegram/SourceFiles/app.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -20,12 +20,14 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 
 #include "app.h"
 
+#include "audio.h"
 #include "application.h"
 #include "fileuploader.h"
 #include "mainwidget.h"
-#include <QtMultimedia/QSoundEffect>
 #include <libexif/exif-data.h>
 
+#include "localstorage.h"
+
 namespace {
 	bool quiting = false;
 
@@ -43,6 +45,9 @@ namespace {
 	typedef QHash<AudioId, AudioData*> AudiosData;
 	AudiosData audiosData;
 
+	typedef QHash<QString, ImageLinkData*> ImageLinksData;
+	ImageLinksData imageLinksData;
+
 	typedef QHash<DocumentId, DocumentData*> DocumentsData;
 	DocumentsData documentsData;
 
@@ -61,7 +66,6 @@ namespace {
 
 	HistoryItem *hoveredItem = 0, *pressedItem = 0, *hoveredLinkItem = 0, *pressedLinkItem = 0, *contextItem = 0, *mousedItem = 0;
 
-    QSoundEffect *newMsgSound = 0;
 	QPixmap *sprite = 0, *emojis = 0;
 
 	typedef QMap<uint32, QPixmap> EmojisMap;
@@ -112,7 +116,7 @@ namespace App {
 	bool loggedOut() {
 		Window *w(wnd());
 		if (w) {
-			w->tempDirDelete();
+			w->tempDirDelete(Local::ClearManagerAll);
 			w->notifyClearFast();
 			w->setupIntro(true);
 		}
@@ -163,6 +167,31 @@ namespace App {
         return (peer_id & 0x100000000L) ? int32(peer_id & 0xFFFFFFFFL) : 0;
     }
 
+	int32 onlineForSort(int32 online, int32 now) {
+		if (online <= 0) {
+			switch (online) {
+			case -2: {
+				QDate yesterday(date(now).date());
+				yesterday.addDays(-3);
+				return int32(QDateTime(yesterday).toTime_t());
+			} break;
+
+			case -3: {
+				QDate weekago(date(now).date());
+				weekago.addDays(-7);
+				return int32(QDateTime(weekago).toTime_t());
+			} break;
+
+			case -4: {
+				QDate monthago(date(now).date());
+				monthago.addDays(-30);
+				return int32(QDateTime(monthago).toTime_t());
+			} break;
+			}
+		}
+		return online;
+	}
+
 	int32 onlineWillChangeIn(int32 online, int32 now) {
 		if (online <= 0) return 86400;
 		if (online > now) {
@@ -180,9 +209,20 @@ namespace App {
 		return dNow.secsTo(dTomorrow);
 	}
 
-	QString onlineText(int32 online, int32 now, bool precise) {
-		if (!online) return lang(lng_status_offline);
-		if (online < 0) return lang(lng_status_invisible);
+	QString onlineText(UserData *user, int32 now, bool precise) {
+		if (isServiceUser(user->id)) {
+			return lang(lng_status_service_notifications);
+		}
+		int32 online = user->onlineTill;
+		if (online <= 0) {
+			switch (online) {
+			case 0: return lang(lng_status_offline);
+			case -2: return lang(lng_status_recently);
+			case -3: return lang(lng_status_last_week);
+			case -4: return lang(lng_status_last_month);
+			}
+			return lang(lng_status_invisible);
+		}
 		if (online > now) {
 			return lang(lng_status_online);
 		}
@@ -241,7 +281,7 @@ namespace App {
 				data = App::user(peer);
 				data->input = MTP_inputPeerContact(d.vid);
 				data->inputUser = MTP_inputUserContact(d.vid);
-				data->setName(lang(lng_deleted), QString(), QString());
+				data->setName(lang(lng_deleted), QString(), QString(), QString());
 				data->setPhoto(MTP_userProfilePhotoEmpty());
 				data->access = 0;
 				wasContact = (data->contact > 0);
@@ -254,7 +294,7 @@ namespace App {
 				data = App::user(peer);
 				data->input = MTP_inputPeerContact(d.vid);
 				data->inputUser = MTP_inputUserContact(d.vid);
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString());
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(MTP_userProfilePhotoEmpty());
 				data->access = 0;
 				wasContact = (data->contact > 0);
@@ -267,7 +307,7 @@ namespace App {
 				data = App::user(peer);
 				data->input = MTP_inputPeerSelf();
 				data->inputUser = MTP_inputUserSelf();
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString());
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(d.vphoto);
 				data->setPhone(qs(d.vphone));
 				data->access = 0;
@@ -275,7 +315,10 @@ namespace App {
 				data->contact = -1;
 				status = &d.vstatus;
 
-				::self = data;
+				if (::self != data) {
+					::self = data;
+					if (App::wnd()) App::wnd()->updateGlobalMenu();
+				}
 			} break;
 			case mtpc_userContact: {
 				const MTPDuserContact &d(user.c_userContact());
@@ -284,7 +327,7 @@ namespace App {
 				data = App::user(peer);
 				data->input = MTP_inputPeerContact(d.vid);
 				data->inputUser = MTP_inputUserContact(d.vid);
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString());
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(d.vphoto);
 				data->setPhone(qs(d.vphone));
 				data->access = d.vaccess_hash.v;
@@ -300,7 +343,7 @@ namespace App {
 				data->input = MTP_inputPeerForeign(d.vid, d.vaccess_hash);
 				data->inputUser = MTP_inputUserForeign(d.vid, d.vaccess_hash);
 				data->setPhone(qs(d.vphone));
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), (data->id != 333000 && !data->phone.isEmpty()) ? formatPhone(data->phone) : QString());
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), (!isServiceUser(data->id) && !data->phone.isEmpty()) ? formatPhone(data->phone) : QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(d.vphoto);
 				data->access = d.vaccess_hash.v;
 				wasContact = (data->contact > 0);
@@ -314,7 +357,7 @@ namespace App {
 				data = App::user(peer);
 				data->input = MTP_inputPeerForeign(d.vid, d.vaccess_hash);
 				data->inputUser = MTP_inputUserForeign(d.vid, d.vaccess_hash);
-				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString());
+				data->setName(textOneLine(qs(d.vfirst_name)), textOneLine(qs(d.vlast_name)), QString(), textOneLine(qs(d.vusername)));
 				data->setPhoto(d.vphoto);
 				data->access = d.vaccess_hash.v;
 				wasContact = (data->contact > 0);
@@ -327,6 +370,10 @@ namespace App {
 
 			data->loaded = true;
 			if (status) switch (status->type()) {
+			case mtpc_userStatusEmpty: data->onlineTill = 0; break;
+			case mtpc_userStatusRecently: data->onlineTill = -2; break;
+			case mtpc_userStatusLastWeek: data->onlineTill = -3; break;
+			case mtpc_userStatusLastMonth: data->onlineTill = -4; break;
 			case mtpc_userStatusOffline: data->onlineTill = status->c_userStatusOffline().vwas_online.v; break;
 			case mtpc_userStatusOnline: data->onlineTill = status->c_userStatusOnline().vexpires.v; break;
 			}
@@ -406,7 +453,7 @@ namespace App {
 			if (!data) continue;
 
 			data->loaded = true;
-			data->updateName(title.trimmed(), QString());
+			data->updateName(title.trimmed(), QString(), QString());
 
 			if (App::main()) App::main()->peerUpdated(data);
 		}
@@ -532,7 +579,7 @@ namespace App {
 			const MTPDphotoSize &d(size.c_photoSize());
 			if (d.vlocation.type() == mtpc_fileLocation) {
 				const MTPDfileLocation &l(d.vlocation.c_fileLocation());
-				return ImagePtr(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v);
+				return ImagePtr(d.vw.v, d.vh.v, l.vdc_id.v, l.vvolume_id.v, l.vlocal_id.v, l.vsecret.v, d.vsize.v);
 			}
 		} break;
 		case mtpc_photoCachedSize: {
@@ -562,20 +609,27 @@ namespace App {
 	}
 	
 	void feedWereDeleted(const QVector<MTPint> &msgsIds) {
+		bool resized = false;
 		for (QVector<MTPint>::const_iterator i = msgsIds.cbegin(), e = msgsIds.cend(); i != e; ++i) {
 			MsgsData::const_iterator j = msgsData.constFind(i->v);
 			if (j != msgsData.cend()) {
 				History *h = (*j)->history();
 				(*j)->destroy();
+				if (App::main() && h->peer == App::main()->peer()) {
+					resized = true;
+				}
 			}
 		}
+		if (resized) {
+			App::main()->itemResized(0);
+		}
 	}
 
 	void feedUserLinks(const MTPVector<MTPcontacts_Link> &links) {
 		const QVector<MTPcontacts_Link> &v(links.c_vector().v);
 		for (QVector<MTPcontacts_Link>::const_iterator i = v.cbegin(), e = v.cend(); i != e; ++i) {
 			const MTPDcontacts_link &dv(i->c_contacts_link());
-			feedUsers(MTP_vector<MTPUser>(QVector<MTPUser>(1, dv.vuser)));
+			feedUsers(MTP_vector<MTPUser>(1, dv.vuser));
 			MTPint userId(MTP_int(0));
 			switch (dv.vuser.type()) {
 			case mtpc_userEmpty: userId = dv.vuser.c_userEmpty().vid; break;
@@ -635,7 +689,7 @@ namespace App {
 					App::main()->removeContact(user);
 				}
 			}
-			user->setName(textOneLine(user->firstName), textOneLine(user->lastName), (user->contact || user->id == 333000 || user->phone.isEmpty()) ? QString() : App::formatPhone(user->phone));
+			user->setName(textOneLine(user->firstName), textOneLine(user->lastName), (user->contact || isServiceUser(user->id) || user->phone.isEmpty()) ? QString() : App::formatPhone(user->phone), textOneLine(user->username));
 			if (App::main()) App::main()->peerUpdated(user);
 		}
 	}
@@ -912,14 +966,6 @@ namespace App {
 		return result;
 	}
 
-	void forgetPhotos() {
-		lastPhotos.clear();
-		lastPhotosMap.clear();
-		for (PhotosData::const_iterator i = photosData.cbegin(), e = photosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-	
 	VideoData *video(const VideoId &video, VideoData *convert, const uint64 &access, int32 user, int32 date, int32 duration, int32 w, int32 h, const ImagePtr &thumb, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != video) {
@@ -968,12 +1014,6 @@ namespace App {
 		return result;
 	}
 
-	void forgetVideos() {
-		for (VideosData::const_iterator i = videosData.cbegin(), e = videosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-
 	AudioData *audio(const AudioId &audio, AudioData *convert, const uint64 &access, int32 user, int32 date, int32 duration, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != audio) {
@@ -1016,12 +1056,6 @@ namespace App {
 		return result;
 	}
 
-	void forgetAudios() {
-		for (AudiosData::const_iterator i = audiosData.cbegin(), e = audiosData.cend(); i != e; ++i) {
-			i.value()->forget();
-		}
-	}
-
 	DocumentData *document(const DocumentId &document, DocumentData *convert, const uint64 &access, int32 user, int32 date, const QString &name, const QString &mime, const ImagePtr &thumb, int32 dc, int32 size) {
 		if (convert) {
 			if (convert->id != document) {
@@ -1068,10 +1102,37 @@ namespace App {
 		return result;
 	}
 
-	void forgetDocuments() {
+	ImageLinkData *imageLink(const QString &imageLink, ImageLinkType type, const QString &url) {
+		ImageLinksData::const_iterator i = imageLinksData.constFind(imageLink);
+		ImageLinkData *result;
+		if (i == imageLinksData.cend()) {
+			result = new ImageLinkData(imageLink);
+			imageLinksData.insert(imageLink, result);
+			result->type = type;
+		} else {
+			result = i.value();
+		}
+		return result;
+	}
+
+	void forgetMedia() {
+		lastPhotos.clear();
+		lastPhotosMap.clear();
+		for (PhotosData::const_iterator i = photosData.cbegin(), e = photosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
+		for (VideosData::const_iterator i = videosData.cbegin(), e = videosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
+		for (AudiosData::const_iterator i = audiosData.cbegin(), e = audiosData.cend(); i != e; ++i) {
+			i.value()->forget();
+		}
 		for (DocumentsData::const_iterator i = documentsData.cbegin(), e = documentsData.cend(); i != e; ++i) {
 			i.value()->forget();
 		}
+		for (ImageLinksData::const_iterator i = imageLinksData.cbegin(), e = imageLinksData.cend(); i != e; ++i) {
+			i.value()->thumb->forget();
+		}
 	}
 
 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo) {
@@ -1117,6 +1178,17 @@ namespace App {
 		return 0;
 	}
 
+	void itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
+		newItem->history()->itemReplaced(oldItem, newItem);
+		if (App::main()) App::main()->itemReplaced(oldItem, newItem);
+		if (App::hoveredItem() == oldItem) App::hoveredItem(newItem);
+		if (App::pressedItem() == oldItem) App::pressedItem(newItem);
+		if (App::hoveredLinkItem() == oldItem) App::hoveredLinkItem(newItem);
+		if (App::pressedLinkItem() == oldItem) App::pressedLinkItem(newItem);
+		if (App::contextItem() == oldItem) App::contextItem(newItem);
+		if (App::mousedItem() == oldItem) App::mousedItem(newItem);
+	}
+
 	HistoryItem *historyRegItem(HistoryItem *item) {
 		MsgsData::const_iterator i = msgsData.constFind(item->id);
 		if (i == msgsData.cend()) {
@@ -1125,10 +1197,7 @@ namespace App {
 			return 0;
 		}
 		if (i.value() != item && !i.value()->block() && item->block()) { // replace search item
-			item->history()->itemReplaced(i.value(), item);
-			if (App::main()) {
-				emit App::main()->historyItemReplaced(i.value(), item);
-			}
+			itemReplaced(i.value(), item);
 			delete i.value();
 			msgsData.insert(item->id, item);
 			return 0;
@@ -1168,8 +1237,8 @@ namespace App {
 			}
 		}
 		historyItemDetached(item);
-		if (App::main()) {
-			emit App::main()->historyItemDeleted(item);
+		if (App::main() && !App::quiting()) {
+			App::main()->itemRemoved(item);
 		}
 	}
 
@@ -1217,6 +1286,7 @@ namespace App {
 		lastPhotos.clear();
 		lastPhotosMap.clear();
 		::self = 0;
+		if (App::wnd()) App::wnd()->updateGlobalMenu();
 	}
 /* // don't delete history without deleting its' peerdata
 	void deleteHistory(const PeerId &peer) {
@@ -1245,11 +1315,7 @@ namespace App {
 
 	void initMedia() {
 		deinitMedia(false);
-        if (!newMsgSound) {
-            newMsgSound = new QSoundEffect();
-            newMsgSound->setSource(QUrl::fromLocalFile(st::newMsgSound));
-            newMsgSound->setVolume(1);
-        }
+		audioInit();
 
 		if (!::sprite) {
 			::sprite = new QPixmap(st::spriteFile);
@@ -1266,17 +1332,10 @@ namespace App {
 		textlnkOver(TextLinkPtr());
 		textlnkDown(TextLinkPtr());
 
-		if (completely && App::main()) {
-			App::main()->disconnect(SIGNAL(historyItemDeleted(HistoryItem *)));
-		}
-
 		histories().clear();
 
 		if (completely) {
-			LOG(("Deleting sound.."));
-            delete newMsgSound;
-			LOG(("Sound deleted!"));
-            newMsgSound = 0;
+			audioFinish();
 
 			delete ::sprite;
 			::sprite = 0;
@@ -1367,7 +1426,7 @@ namespace App {
 	}
 
 	void playSound() {
-        if (cSoundNotify() && newMsgSound) newMsgSound->play();
+		if (cSoundNotify()) audioPlayNotify();
 	}
 
 	void writeConfig() {
@@ -1573,6 +1632,7 @@ namespace App {
 				stream << quint32(dbiNotifyView) << qint32(cNotifyView());
 				stream << quint32(dbiAskDownloadPath) << qint32(cAskDownloadPath());
 				stream << quint32(dbiDownloadPath) << (cAskDownloadPath() ? QString() : cDownloadPath());
+				stream << quint32(dbiCompressPastedImage) << qint32(cCompressPastedImage());
 				stream << quint32(dbiEmojiTab) << qint32(cEmojiTab());
 
 				RecentEmojiPreload v;
@@ -1600,7 +1660,7 @@ namespace App {
 			}
 			QByteArray encrypted(16 + fullSize, Qt::Uninitialized); // 128bit of sha1 - key128, sizeof(data), data
 			hashSha1(toEncrypt.constData(), toEncrypt.size(), encrypted.data());
-			aesEncryptLocal(toEncrypt.constData(), encrypted.data() + 16, fullSize, &MTP::localKey(), encrypted.constData());
+			aesEncryptLocal(toEncrypt.constData(), encrypted.data() + 16, fullSize, &Local::oldKey(), encrypted.constData());
 
 			DEBUG_LOG(("App Info: writing user config file"));
 			QDataStream configStream(&configFile);
@@ -1651,7 +1711,7 @@ namespace App {
 				}
 
 				cSetLocalSalt(salt);
-				MTP::createLocalKey(QByteArray(), &salt);
+				Local::createOldKey(&salt);
 
 				if (data.size() <= 16 || (data.size() & 0x0F)) {
 					LOG(("App Error: bad encrypted part size: %1").arg(data.size()));
@@ -1660,7 +1720,7 @@ namespace App {
 				uint32 fullDataLen = data.size() - 16;
 				decrypted.resize(fullDataLen);
 				const char *dataKey = data.constData(), *encrypted = data.constData() + 16;
-				aesDecryptLocal(encrypted, decrypted.data(), fullDataLen, &MTP::localKey(), dataKey);
+				aesDecryptLocal(encrypted, decrypted.data(), fullDataLen, &Local::oldKey(), dataKey);
 				uchar sha1Buffer[20];
 				if (memcmp(hashSha1(decrypted.constData(), decrypted.size(), sha1Buffer), dataKey, 16)) {
 					LOG(("App Error: bad decrypt key, data from user-config not decrypted"));
@@ -1741,7 +1801,7 @@ namespace App {
 				case dbinvShowName: cSetNotifyView(dbinvShowName); break;
 				default: cSetNotifyView(dbinvShowPreview); break;
 				}
-			}
+			} break;
 
 			case dbiAskDownloadPath: {
 				qint32 v;
@@ -1755,6 +1815,12 @@ namespace App {
 				cSetDownloadPath(v);
 			} break;
 
+			case dbiCompressPastedImage: {
+				qint32 v;
+				stream >> v;
+				cSetCompressPastedImage(v == 1);
+			} break;
+
 			case dbiEmojiTab: {
 				qint32 v;
 				stream >> v;
@@ -1851,17 +1917,14 @@ namespace App {
 	void checkImageCacheSize() {
 		int64 nowImageCacheSize = imageCacheSize();
 		if (nowImageCacheSize > serviceImageCacheSize + MemoryForImageCache) {
-			App::forgetPhotos();
-			App::forgetVideos();
-			App::forgetAudios();
-			App::forgetDocuments();
+			App::forgetMedia();
 			serviceImageCacheSize = imageCacheSize();
 		}
 	}
 
 	bool isValidPhone(QString phone) {
 		phone = phone.replace(QRegularExpression(qsl("[^\\d]")), QString());
-		return phone.length() >= 8 || phone == qsl("777") || phone == qsl("333") || phone == qsl("42") || phone == qsl("111");
+		return phone.length() >= 8 || phone == qsl("777") || phone == qsl("333") || phone == qsl("111") || (phone.startsWith(qsl("42")) && (phone.length() == 2 || phone.length() == 5 || phone == qsl("4242")));
 	}
 
 	void quit() {
@@ -1884,7 +1947,6 @@ namespace App {
 		::quiting = true;
 	}
 
-
     QImage readImage(QByteArray data, QByteArray *format) {
         QByteArray tmpFormat;
 		QImage result;

Telegram/SourceFiles/app.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -63,8 +63,9 @@ namespace App {
     int32 userFromPeer(const PeerId &peer_id);
     int32 chatFromPeer(const PeerId &peer_id);
 
+	int32 onlineForSort(int32 online, int32 now);
 	int32 onlineWillChangeIn(int32 onlineOnServer, int32 nowOnServer);
-	QString onlineText(int32 onlineOnServer, int32 nowOnServer, bool precise = false);
+	QString onlineText(UserData *user, int32 nowOnServer, bool precise = false);
 
 	void feedUsers(const MTPVector<MTPUser> &users);
 	void feedChats(const MTPVector<MTPChat> &chats);
@@ -102,13 +103,11 @@ namespace App {
 	ChatData *chat(int32 chat);
 	QString peerName(const PeerData *peer, bool forDialogs = false);
 	PhotoData *photo(const PhotoId &photo, PhotoData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, const ImagePtr &thumb = ImagePtr(), const ImagePtr &medium = ImagePtr(), const ImagePtr &full = ImagePtr());
-	void forgetPhotos();
 	VideoData *video(const VideoId &video, VideoData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, int32 duration = 0, int32 w = 0, int32 h = 0, const ImagePtr &thumb = ImagePtr(), int32 dc = 0, int32 size = 0);
-	void forgetVideos();
 	AudioData *audio(const AudioId &audio, AudioData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, int32 duration = 0, int32 dc = 0, int32 size = 0);
-	void forgetAudios();
 	DocumentData *document(const DocumentId &document, DocumentData *convert = 0, const uint64 &access = 0, int32 user = 0, int32 date = 0, const QString &name = QString(), const QString &mime = QString(), const ImagePtr &thumb = ImagePtr(), int32 dc = 0, int32 size = 0);
-	void forgetDocuments();
+	ImageLinkData *imageLink(const QString &imageLink, ImageLinkType type = InvalidImageLink, const QString &url = QString());
+	void forgetMedia();
 
 	MTPPhoto photoFromUserPhoto(MTPint userId, MTPint date, const MTPUserProfilePhoto &photo);
 

Telegram/SourceFiles/application.cpp

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -28,6 +28,8 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
 #include "boxes/confirmbox.h"
 #include "langloaderplain.h"
 
+#include "localstorage.h"
+
 namespace {
 	Application *mainApp = 0;
 	FileUploader *uploader = 0;
@@ -61,6 +63,13 @@ namespace {
 				case 3: if (ev->key() == Qt::Key_F11) _debugState = 4; else if (ev->key() != Qt::Key_F10) _debugState = 0; break;
 				case 4: if (ev->key() == Qt::Key_F12) offerDebug(); if (ev->key() != Qt::Key_F11) _debugState = 0; break;
 				}
+
+				if (cPlatform() == dbipMac && ev->key() == Qt::Key_W && (ev->modifiers() & (Qt::MetaModifier | Qt::ControlModifier))) {
+					if (cWorkMode() == dbiwmTrayOnly || cWorkMode() == dbiwmWindowAndTray) {
+						App::wnd()->minimizeToTray();
+						return true;
+					}
+				}
 			}
 			return QObject::eventFilter(o, e);
 		}
@@ -80,6 +89,8 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
     serverName(psServerPrefix() + cGUIDStr()), closing(false),
 	updateRequestId(0), updateReply(0), updateThread(0), updateDownloader(0) {
 
+	DEBUG_LOG(("Application Info: creation.."));
+
 	QByteArray d(QDir((cPlatform() == dbipWindows ? cExeDir() : cWorkingDir()).toLower()).absolutePath().toUtf8());
 	char h[33] = { 0 };
 	hashMd5Hex(d.constData(), d.size(), h);
@@ -124,15 +135,16 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 		}
 	}
 
+	Local::start();
 	style::startManager();
 	anim::startManager();
 	historyInit();
 
+	DEBUG_LOG(("Application Info: inited.."));
+
     window = new Window();
 
-    psInstallEventFilter();
-
-	updateCheckTimer.setSingleShot(true);
+	psInstallEventFilter();
 
 	connect(&socket, SIGNAL(connected()), this, SLOT(socketConnected()));
 	connect(&socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
@@ -144,10 +156,13 @@ Application::Application(int &argc, char **argv) : PsApplication(argc, argv),
 	connect(&updateCheckTimer, SIGNAL(timeout()), this, SLOT(startUpdateCheck()));
 	connect(this, SIGNAL(updateFailed()), this, SLOT(onUpdateFailed()));
 	connect(this, SIGNAL(updateReady()), this, SLOT(onUpdateReady()));
+	connect(this, SIGNAL(applicationStateChanged(Qt::ApplicationState)), this, SLOT(onAppStateChanged(Qt::ApplicationState)));
 	connect(&writeUserConfigTimer, SIGNAL(timeout()), this, SLOT(onWriteUserConfig()));
 	writeUserConfigTimer.setSingleShot(true);
 
-    if (cManyInstance()) {
+	connect(&killDownloadSessionsTimer, SIGNAL(timeout()), this, SLOT(killDownloadSessions()));
+
+	if (cManyInstance()) {
 		startApp();
 	} else {
         DEBUG_LOG(("Application Info: connecting local socket to %1..").arg(serverName));
@@ -319,10 +334,54 @@ void Application::writeUserConfigIn(uint64 ms) {
 	}
 }
 
+void Application::killDownloadSessionsStart(int32 dc) {
+	if (killDownloadSessionTimes.constFind(dc) == killDownloadSessionTimes.cend()) {
+		killDownloadSessionTimes.insert(dc, getms() + MTPAckSendWaiting + MTPKillFileSessionTimeout);
+	}
+	if (!killDownloadSessionsTimer.isActive()) {
+		killDownloadSessionsTimer.start(MTPAckSendWaiting + MTPKillFileSessionTimeout + 5);
+	}
+}
+
+void Application::killDownloadSessionsStop(int32 dc) {
+	killDownloadSessionTimes.remove(dc);
+	if (killDownloadSessionTimes.isEmpty() && killDownloadSessionsTimer.isActive()) {
+		killDownloadSessionsTimer.stop();
+	}
+}
+
+void Application::checkLocalTime() {
+	if (App::main()) App::main()->checkLastUpdate(checkms());
+}
+
 void Application::onWriteUserConfig() {
 	App::writeUserConfig();
 }
 
+void Application::onAppStateChanged(Qt::ApplicationState state) {
+	checkLocalTime();
+}
+
+void Application::killDownloadSessions() {
+	uint64 ms = getms(), left = MTPAckSendWaiting + MTPKillFileSessionTimeout;
+	for (QMap<int32, uint64>::iterator i = killDownloadSessionTimes.begin(); i != killDownloadSessionTimes.end(); ) {
+		if (i.value() <= ms) {
+			for (int j = 1; j < MTPDownloadSessionsCount; ++j) {
+				MTP::killSession(MTP::dld[j] + i.key());
+			}
+			i = killDownloadSessionTimes.erase(i);
+		} else {
+			if (i.value() - ms < left) {
+				left = i.value() - ms;
+			}
+			++i;
+		}
+	}
+	if (!killDownloadSessionTimes.isEmpty()) {
+		killDownloadSessionsTimer.start(left);
+	}
+}
+
 void Application::photoUpdated(MsgId msgId, const MTPInputFile &file) {
 	if (!App::self()) return;
 
@@ -332,7 +391,8 @@ void Application::photoUpdated(MsgId msgId, const MTPInputFile &file) {
 		if (peer == App::self()->id) {
 			MTP::send(MTPphotos_UploadProfilePhoto(file, MTP_string(""), MTP_inputGeoPointEmpty(), MTP_inputPhotoCrop(MTP_double(0), MTP_double(0), MTP_double(100))), rpcDone(&Application::selfPhotoDone), rpcFail(&Application::peerPhotoFail, peer));
 		} else {
-			MTP::send(MTPmessages_EditChatPhoto(MTP_int(peer & 0xFFFFFFFF), MTP_inputChatUploadedPhoto(file, MTP_inputPhotoCrop(MTP_double(0), MTP_double(0), MTP_double(100)))), rpcDone(&Application::chatPhotoDone, peer), rpcFail(&Application::peerPhotoFail, peer));
+			History *hist = App::history(peer);
+			hist->sendRequestId = MTP::send(MTPmessages_EditChatPhoto(MTP_int(peer & 0xFFFFFFFF), MTP_inputChatUploadedPhoto(file, MTP_inputPhotoCrop(MTP_double(0), MTP_double(0), MTP_double(100)))), rpcDone(&Application::chatPhotoDone, peer), rpcFail(&Application::peerPhotoFail, peer), 0, 0, hist->sendRequestId);
 		}
 	}
 }
@@ -341,6 +401,11 @@ void Application::onEnableDebugMode() {
 	if (!cDebug()) {
 		logsInitDebug();
 		cSetDebug(true);
+		QFile f(cWorkingDir() + qsl("tdata/withdebug"));
+		if (f.open(QIODevice::WriteOnly)) {
+			f.write("1");
+			f.close();
+		}
 	}
 	App::wnd()->hideLayer();
 }
@@ -394,7 +459,7 @@ void Application::uploadProfilePhoto(const QImage &tosend, const PeerId &peerId)
 	int32 filesize = 0;
 	QByteArray data;
 
-	ReadyLocalMedia ready(ToPreparePhoto, file, filename, filesize, data, id, id, peerId, photo, photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg);
+	ReadyLocalMedia ready(ToPreparePhoto, file, filename, filesize, data, id, id, peerId, photo, photoThumbs, MTP_documentEmpty(MTP_long(0)), jpeg, false);
 
 	connect(App::uploader(), SIGNAL(photoReady(MsgId, const MTPInputFile &)), App::app(), SLOT(photoUpdated(MsgId, const MTPInputFile &)), Qt::UniqueConnection);
 
@@ -559,9 +624,14 @@ void Application::socketError(QLocalSocket::LocalSocketError e) {
 }
 
 void Application::startApp() {
+	DEBUG_LOG(("Application Info: starting app.."));
+
+	Local::ReadMapState state = Local::readMap(QByteArray());
+
+	DEBUG_LOG(("Application Info: local map read.."));
 	App::readUserConfig();
-	if (!MTP::localKey().created()) {
-		MTP::createLocalKey(QByteArray());
+	if (!Local::oldKey().created()) {
+		Local::createOldKey();
 		cSetNeedConfigResave(true);
 	}
 	if (cNeedConfigResave()) {
@@ -569,27 +639,33 @@ void Application::startApp() {
 		App::writeUserConfig();
 		cSetNeedConfigResave(false);
 	}
+	DEBUG_LOG(("Application Info: user config read.."));
 
 	window->createWinId();
 	window->init();
 
+	DEBUG_LOG(("Application Info: window created.."));
 	readSupportTemplates();
 
-	MTP::setLayer(mtpLayerMax);
 	MTP::start();
 	
 	MTP::setStateChangedHandler(mtpStateChanged);
 	MTP::setSessionResetHandler(mtpSessionReset);
 
+	DEBUG_LOG(("Application Info: MTP started.."));
+
+	initImageLinkManager();
 	App::initMedia();
 
+	DEBUG_LOG(("Application Info: showing."));
+
 	if (MTP::authedId()) {
 		window->setupMain(false);
 	} else {
 		window->setupIntro(false);
 	}
 
-	window->psFirstShow();
+	window->firstShow();
 
 	if (cStartToSettings()) {
 		window->showSettings();
@@ -623,11 +699,11 @@ void Application::readClients() {
 			int32 from = 0, l = cmds.length();
 			for (int32 to = cmds.indexOf(QChar(';'), from); to >= from; to = (from < l) ? cmds.indexOf(QChar(';'), from) : -1) {
 				QStringRef cmd(&cmds, from, to - from);
-				if (cmd.indexOf("CMD:") == 0) {
+				if (cmd.startsWith(qsl("CMD:"))) {
 					execExternal(cmds.mid(from + 4, to - from - 4));
-					QByteArray response(QString("RES:%1;").arg(QCoreApplication::applicationPid()).toUtf8());
+					QByteArray response(qsl("RES:%1;").arg(QCoreApplication::applicationPid()).toUtf8());
 					i->first->write(response.data(), response.size());
-				} else if (cmd.indexOf("SEND:") == 0) {
+				} else if (cmd.startsWith(qsl("SEND:"))) {
 					if (cSendPaths().isEmpty()) {
 						toSend.append(_escapeFrom7bit(cmds.mid(from + 5, to - from - 5)));
 					}
@@ -694,6 +770,7 @@ Application::~Application() {
 	socket.close();
 	closeApplication();
 	App::deinitMedia();
+	deinitImageLinkManager();
 	mainApp = 0;
 	delete updateReply;
 	delete ::uploader;
@@ -706,6 +783,7 @@ Application::~Application() {
 	delete window;
 
 	style::stopManager();
+	Local::stop();
 }
 
 Application *Application::app() {

Telegram/SourceFiles/application.h

@@ -1,6 +1,6 @@
 /*
 This file is part of Telegram Desktop,
-an unofficial desktop messaging app, see https://telegram.org
+an official desktop messaging app, see https://telegram.org
 
 Telegram Desktop is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -70,11 +70,18 @@ public:
 
 	void writeUserConfigIn(uint64 ms);
 
+	void killDownloadSessionsStart(int32 dc);
+	void killDownloadSessionsStop(int32 dc);
+
+	void checkLocalTime();
+
 signals:
 
 	void peerPhotoDone(PeerId peer);
 	void peerPhotoFail(PeerId peer);
 
+	void adjustSingleTimers();
+
 public slots:
 
 	void startUpdateCheck(bool forceWait = false);
@@ -100,10 +107,16 @@ public slots:
 	void onEnableDebugMode();
 	void onWriteUserConfig();
 
+	void killDownloadSessions();
+	void onAppStateChanged(Qt::ApplicationState state);
+
 private:
 
 	QMap<MsgId, PeerId> photoUpdates;
 
+	QMap<int32, uint64> killDownloadSessionTimes;
+	SingleTimer killDownloadSessionsTimer;
+
 	void startApp();
 
 	typedef QPair<QLocalSocket*, QByteArray> ClientSocket;
@@ -123,10 +136,10 @@ private:
 	mtpRequestId updateRequestId;
 	QNetworkAccessManager updateManager;
 	QNetworkReply *updateReply;
-	QTimer updateCheckTimer;
+	SingleTimer updateCheckTimer;
 	QThread *updateThread;
 	PsUpdateDownloader *updateDownloader;
 
 	QTimer writeUserConfigTimer;
-	
+
 };