From 4b113527b218f83e7fa9f0ee7513e5ddf4a96b70 Mon Sep 17 00:00:00 2001
From: Arseny Smirnov <arseny30@gmail.com>
Date: Wed, 12 Jun 2019 17:28:00 +0300
Subject: [PATCH] Files: new remote (persistent) id version

GitOrigin-RevId: 9935066e24e9fff6c4b82b57b55ea2d517119b4b
---
 td/telegram/Photo.hpp             |  2 ++
 td/telegram/files/FileManager.cpp | 28 +++++++++++++++++++++++-----
 td/telegram/files/FileManager.h   |  5 ++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/td/telegram/Photo.hpp b/td/telegram/Photo.hpp
index dbe1fe78..1abe1c9b 100644
--- a/td/telegram/Photo.hpp
+++ b/td/telegram/Photo.hpp
@@ -54,6 +54,8 @@ void OfflineInputPeer::parse(ParserT &parser) {
     case DialogType::None:
       parser.set_error("Invalid chat id");
       break;
+    default:
+      break;
   }
 }
 
diff --git a/td/telegram/files/FileManager.cpp b/td/telegram/files/FileManager.cpp
index cdb6e770..61e8304c 100644
--- a/td/telegram/files/FileManager.cpp
+++ b/td/telegram/files/FileManager.cpp
@@ -2564,6 +2564,7 @@ string FileManager::get_persistent_id(const FullRemoteFileLocation &location) {
   auto binary = serialize(location_copy);
 
   binary = zero_encode(binary);
+  binary.push_back(narrow_cast<td::uint8>(Version::Next) - 1);
   binary.push_back(PERSISTENT_ID_VERSION);
   return base64url_encode(binary);
 }
@@ -2587,9 +2588,12 @@ Result<FileId> FileManager::from_persistent_id(CSlice persistent_id, FileType fi
   if (binary.empty()) {
     return Status::Error(10, "Remote file id can't be empty");
   }
-  if (binary.back() == PERSISTENT_ID_VERSION) {
+  if (binary.back() == PERSISTENT_ID_VERSION_OLD) {
     return from_persistent_id_v2(binary, file_type);
   }
+  if (binary.back() == PERSISTENT_ID_VERSION) {
+    return from_persistent_id_v3(binary, file_type);
+  }
   if (binary.back() == PERSISTENT_ID_VERSION_MAP) {
     return from_persistent_id_map(binary, file_type);
   }
@@ -2617,13 +2621,14 @@ Result<FileId> FileManager::from_persistent_id_map(Slice binary, FileType file_t
   return register_file(std::move(data), FileLocationSource::FromUser, "from_persistent_id_map", false).move_as_ok();
 }
 
-Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_type) {
-  binary.remove_suffix(1);
+Result<FileId> FileManager::from_persistent_id_v23(Slice binary, FileType file_type, int32 version) {
+  if (version < 0 || version >= static_cast<int32>(Version::Next)) {
+    return Status::Error("Invalid remote id");
+  }
   auto decoded_binary = zero_decode(binary);
   FullRemoteFileLocation remote_location;
   logevent::WithVersion<TlParser> parser(decoded_binary);
-  //TODO(now): encode version?
-  parser.set_version(static_cast<int32>(Version::Initial));
+  parser.set_version(version);
   parse(remote_location, parser);
   parser.fetch_end();
   auto status = parser.get_status();
@@ -2644,6 +2649,19 @@ Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_ty
       register_file(std::move(data), FileLocationSource::FromUser, "from_persistent_id_v2", false).move_as_ok();
   return file_id;
 }
+Result<FileId> FileManager::from_persistent_id_v2(Slice binary, FileType file_type) {
+  binary.remove_suffix(1);
+  return from_persistent_id_v23(binary, file_type, 0);
+}
+Result<FileId> FileManager::from_persistent_id_v3(Slice binary, FileType file_type) {
+  binary.remove_suffix(1);
+  if (binary.empty()) {
+    return Status::Error("Invalid remote id");
+  }
+  auto version = static_cast<uint8>(binary.back());
+  binary.remove_suffix(1);
+  return from_persistent_id_v23(binary, file_type, version);
+}
 
 FileView FileManager::get_file_view(FileId file_id) const {
   auto file_node = get_file_node(file_id);
diff --git a/td/telegram/files/FileManager.h b/td/telegram/files/FileManager.h
index 9a2271c8..34b7ab1f 100644
--- a/td/telegram/files/FileManager.h
+++ b/td/telegram/files/FileManager.h
@@ -452,8 +452,9 @@ class FileManager : public FileLoadManager::Callback {
   FileId parse_file(ParserT &parser);
 
  private:
-  static constexpr char PERSISTENT_ID_VERSION = 2;
+  static constexpr char PERSISTENT_ID_VERSION_OLD = 2;
   static constexpr char PERSISTENT_ID_VERSION_MAP = 3;
+  static constexpr char PERSISTENT_ID_VERSION = 4;
 
   Result<FileId> check_input_file_id(FileType type, Result<FileId> result, bool is_encrypted, bool allow_zero,
                                      bool is_secure) TD_WARN_UNUSED_RESULT;
@@ -559,6 +560,8 @@ class FileManager : public FileLoadManager::Callback {
 
   Result<FileId> from_persistent_id_map(Slice binary, FileType file_type);
   Result<FileId> from_persistent_id_v2(Slice binary, FileType file_type);
+  Result<FileId> from_persistent_id_v3(Slice binary, FileType file_type);
+  Result<FileId> from_persistent_id_v23(Slice binary, FileType file_type, int32 version);
 
   string fix_file_extension(Slice file_name, Slice file_type, Slice file_extension);
   string get_file_name(FileType file_type, Slice path);