Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop int…

…o dev
kirsan31 · Mar 18, 2019 · c539aa6 · c539aa6
2 parents eb41739 + fd538bc
commit c539aa6
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 31 deletions.
diff --git a/Telegram/Resources/uwp/AppX/AppxManifest.xml b/Telegram/Resources/uwp/AppX/AppxManifest.xml
@@ -9,7 +9,7 @@
   <Identity Name="TelegramMessengerLLP.TelegramDesktop"
     ProcessorArchitecture="ARCHITECTURE"
     Publisher="CN=536BC709-8EE1-4478-AF22-F0F0F26FF64A"
-    Version="1.5.18.0" />
+    Version="1.6.0.0" />
   <Properties>
     <DisplayName>Telegram Desktop</DisplayName>
     <PublisherDisplayName>Telegram Messenger LLP</PublisherDisplayName>

diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,18,0
- PRODUCTVERSION 1,5,18,0
+ FILEVERSION 1,6,0,0
+ PRODUCTVERSION 1,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -52,10 +52,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop"
-            VALUE "FileVersion", "1.5.18.0"
+            VALUE "FileVersion", "1.6.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.5.18.0"
+            VALUE "ProductVersion", "1.6.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,5,18,0
- PRODUCTVERSION 1,5,18,0
+ FILEVERSION 1,6,0,0
+ PRODUCTVERSION 1,6,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Desktop Updater"
-            VALUE "FileVersion", "1.5.18.0"
+            VALUE "FileVersion", "1.6.0.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2019"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "1.5.18.0"
+            VALUE "ProductVersion", "1.6.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
@@ -15,7 +15,7 @@ For license and copyright information please follow this link:
 #define TDESKTOP_ALPHA_VERSION (0ULL)
 #endif // TDESKTOP_OFFICIAL_TARGET
 
-constexpr auto AppVersion = 1005018;
-constexpr auto AppVersionStr = "1.5.18 mod";
-constexpr auto AppBetaVersion = true;
+constexpr auto AppVersion = 1006000;
+constexpr auto AppVersionStr = "1.6 mod";
+constexpr auto AppBetaVersion = false;
 constexpr auto AppAlphaVersion = TDESKTOP_ALPHA_VERSION;
diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_reader.cpp
@@ -336,19 +336,32 @@ bool Reader::Slices::headerWontBeFilled() const {
 }
 
 void Reader::Slices::applyHeaderCacheData() {
-	if (_header.parts.empty() || _headerMode != HeaderMode::Unknown) {
+	using namespace rpl::mappers;
+
+	const auto applyWhile = [&](auto &&predicate) {
+		for (const auto &[offset, part] : _header.parts) {
+			const auto index = offset / kInSlice;
+			if (!predicate(index)) {
+				break;
+			}
+			_data[index].addPart(
+				offset - index * kInSlice,
+				base::duplicate(part));
+		}
+	};
+	if (_header.parts.empty()) {
+		return;
+	} else if (_headerMode == HeaderMode::Good) {
+		// Always apply data to first block if it is cached in the header.
+		applyWhile(_1 == 0);
+	} else if (_headerMode != HeaderMode::Unknown) {
 		return;
 	} else if (isFullInHeader()) {
 		headerDone(true);
-		return;
-	}
-	for (const auto &[offset, part] : _header.parts) {
-		const auto index = offset / kInSlice;
-		_data[index].addPart(
-			offset - index * kInSlice,
-			base::duplicate(part));
+	} else {
+		applyWhile(_1 < int(_data.size()));
+		headerDone(true);
 	}
-	headerDone(true);
 }
 
 void Reader::Slices::processCacheResult(

diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -1661,7 +1661,7 @@ void OverlayWidget::showPhoto(not_null<PhotoData*> photo, not_null<PeerData*> co
 
 	refreshMediaViewer();
 
-	displayPhoto(photo, 0);
+	displayPhoto(photo, nullptr);
 	preloadData(0);
 	activateControls();
 }
@@ -1763,9 +1763,7 @@ void OverlayWidget::displayDocument(DocumentData *doc, HistoryItem *item) {
 	_radial.stop();
 
 	refreshMediaViewer();
-	if ((item ? item->fullId() : FullMsgId()) != _msgid) {
-		refreshCaption(item);
-	}
+	refreshCaption(item);
 	if (_doc) {
 		if (_doc->sticker()) {
 			if (const auto image = _doc->getStickerLarge()) {
@@ -3112,7 +3110,7 @@ bool OverlayWidget::moveToEntity(const Entity &entity, int preloadDelta) {
 		setContext(std::nullopt);
 	}
 	clearStreaming();
-	_streamingStartPaused = true;
+	_streamingStartPaused = false;
 	if (auto photo = base::get_if<not_null<PhotoData*>>(&entity.data)) {
 		displayPhoto(*photo, entity.item);
 	} else if (auto document = base::get_if<not_null<DocumentData*>>(&entity.data)) {

diff --git a/Telegram/build/version b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         1005018
-AppVersionStrMajor 1.5
-AppVersionStrSmall 1.5.18
-AppVersionStr      1.5.18
-BetaChannel        1
+AppVersion         1006000
+AppVersionStrMajor 1.6
+AppVersionStrSmall 1.6
+AppVersionStr      1.6.0
+BetaChannel        0
 AlphaVersion       0
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,8 @@
+1.6 (18.03.19)
+
+- Play video files and listen to music without waiting for them to fully download.
+- Press CTRL+0 (CMD+0 on macOS) to jump to your Saved Messages.
+
 1.5.18 beta (15.03.19)
 
 - Bug fixes and other minor improvements.