Set correct cache tags for different file types.

Telegram/SourceFiles/data/data_document.cpp

@@ -771,13 +771,15 @@ void DocumentData::save(
 				&_urlLocation,
 				size,
 				fromCloud,
-				autoLoading);
+				autoLoading,
+				cacheTag());
 		} else if (!_access && !_url.isEmpty()) {
 			_loader = new webFileLoader(
 				_url,
 				toFile,
 				fromCloud,
-				autoLoading);
+				autoLoading,
+				cacheTag());
 		} else {
 			_loader = new mtpFileLoader(
 				_dc,
@@ -790,7 +792,8 @@ void DocumentData::save(
 				size,
 				(saveToCache() ? LoadToCacheAsWell : LoadToFileOnly),
 				fromCloud,
-				autoLoading);
+				autoLoading,
+				cacheTag());
 		}
 
 		_loader->connect(_loader, SIGNAL(progress(FileLoader*)), App::main(), SLOT(documentLoadProgress(FileLoader*)));
@@ -1098,6 +1101,19 @@ Storage::Cache::Key DocumentData::cacheKey() const {
 	}
 }
 
+uint8 DocumentData::cacheTag() const {
+	if (type == StickerDocument) {
+		return Data::kStickerCacheTag;
+	} else if (isVoiceMessage()) {
+		return Data::kVoiceMessageCacheTag;
+	} else if (isVideoMessage()) {
+		return Data::kVideoMessageCacheTag;
+	} else if (isAnimation()) {
+		return Data::kAnimationCacheTag;
+	}
+	return 0;
+}
+
 QString DocumentData::composeNameString() const {
 	if (auto songData = song()) {
 		return ComposeNameString(

Telegram/SourceFiles/data/data_document.h

@@ -180,6 +180,7 @@ public:
 
 	MediaKey mediaKey() const;
 	Storage::Cache::Key cacheKey() const;
+	uint8 cacheTag() const;
 
 	static QString ComposeNameString(
 		const QString &filename,

Telegram/SourceFiles/data/data_media_types.cpp

@@ -357,7 +357,9 @@ bool MediaPhoto::updateSentMedia(const MTPMessageMedia &media) {
 		}
 		Auth().data().cache().putIfEmpty(
 			Data::StorageCacheKey(key),
-			image->savedData());
+			Storage::Cache::Database::TaggedValue(
+				image->savedData(),
+				Data::kImageCacheTag));
 	};
 	auto &sizes = photo.c_photo().vsizes.v;
 	auto max = 0;

Telegram/SourceFiles/data/data_types.h

@@ -41,6 +41,12 @@ Storage::Cache::Key StorageCacheKey(const StorageImageLocation &location);
 Storage::Cache::Key WebDocumentCacheKey(const WebFileLocation &location);
 Storage::Cache::Key UrlCacheKey(const QString &location);
 
+constexpr auto kImageCacheTag = uint8(0x01);
+constexpr auto kStickerCacheTag = uint8(0x02);
+constexpr auto kVoiceMessageCacheTag = uint8(0x03);
+constexpr auto kVideoMessageCacheTag = uint8(0x04);
+constexpr auto kAnimationCacheTag = uint8(0x05);
+
 } // namespace Data
 
 struct MessageGroupId {