Fix incorrect display of unavailable attachments in chat

Lainaaa · Lainaaa · commit 4481313eb5ce · 2025-10-06T17:11:24.000+03:00
diff --git a/Adamant/Modules/Chat/View/Managers/ChatAction.swift b/Adamant/Modules/Chat/View/Managers/ChatAction.swift
@@ -24,4 +24,5 @@ enum ChatAction {
     case cancelUploading(messageId: String)
     case autoDownloadContentIfNeeded(messageId: String, files: [ChatFile])
     case forceDownloadAllFiles(messageId: String, files: [ChatFile])
+    case showDialog(title: String)
 }
diff --git a/Adamant/Modules/Chat/View/Managers/ChatDataSourceManager.swift b/Adamant/Modules/Chat/View/Managers/ChatDataSourceManager.swift
@@ -223,6 +223,8 @@ extension ChatDataSourceManager {
             )
         case let .forceDownloadAllFiles(messageId, files):
             viewModel.forceDownloadAllFiles(messageId: messageId, files: files)
+        case let .showDialog(title):
+            viewModel.dialog.send(.alert(title))
         }
     }
 }
diff --git a/Adamant/Modules/Chat/View/Subviews/ChatMedia/Container/ChatMediaContainerView.swift b/Adamant/Modules/Chat/View/Subviews/ChatMedia/Container/ChatMediaContainerView.swift
@@ -154,6 +154,11 @@ final class ChatMediaContainerView: UIView {
             actionHandler(.openFile(messageId: model.id, file: file))
             return
         }
+        
+        if model.status == .unableToDownload {
+            actionHandler(.showDialog(title: FileManagerError.unableToDownloadCorrupted.localizedDescription))
+            return
+        }
 
         guard case .needToDownload = model.status else {
             return
diff --git a/Adamant/Services/FilesNetworkManager/Models/FileManagerError.swift b/Adamant/Services/FilesNetworkManager/Models/FileManagerError.swift
@@ -18,22 +18,25 @@ enum FileManagerError: Error {
     case cantUploadFile
     case cantEncryptFile
     case cantDecryptFile
+    case unableToDownloadCorrupted
     case apiError(error: ApiServiceError)
 }
 
 extension FileManagerError: LocalizedError {
     var errorDescription: String? {
         switch self {
-        case .cantDownloadFile:
-            return .localized("FileManagerError.CantDownloadFile")
-        case .cantUploadFile:
-            return .localized("FileManagerError.CantUploadFile")
-        case .cantEncryptFile:
-            return .localized("FileManagerError.CantEncryptFile")
-        case .cantDecryptFile:
-            return .localized("FileManagerError.CantDecryptFile")
-        case let .apiError(error: error):
-            return error.localizedDescription
+            case .cantDownloadFile:
+                return .localized("FileManagerError.CantDownloadFile")
+            case .cantUploadFile:
+                return .localized("FileManagerError.CantUploadFile")
+            case .cantEncryptFile:
+                return .localized("FileManagerError.CantEncryptFile")
+            case .cantDecryptFile:
+                return .localized("FileManagerError.CantDecryptFile")
+            case .unableToDownloadCorrupted:
+                return .localized("FileManagerError.UnableToDownloadCorrupted")
+            case let .apiError(error: error):
+                return error.localizedDescription
         }
     }
 }
diff --git a/CommonKit/Sources/CommonKit/Assets/Localization/de.lproj/Localizable.strings b/CommonKit/Sources/CommonKit/Assets/Localization/de.lproj/Localizable.strings
@@ -1354,36 +1354,5 @@
 /* FileManager error 'Can't decrypt file' */
 "FileManagerError.CantDecryptFile" = "Datei kann nicht entschlüsselt werden";
 
-/* File validation error 'Too many files' */
-"FileValidationError.TooManyFiles" = "Zu viele Dateien. Höchstens erlaubt: %lld";
-
-/* File validation error 'File size exceeds limit' */
-"FileValidationError.FileSizeExceedsLimit" = "Dateigröße überschreitet das Limit. Maximal erlaubt: %lld MB";
-
-/* File validation error 'File not found' */
-"FileValidationError.FileNotFound" = "Datei nicht gefunden";
-
-/* File picker error 'Cant select file' */
-"FileValidationError.CantSelectFile" = "Datei kann nicht ausgewählt werden: %@";
-
-/* Chat drop view title */
-"Chat.Drop.Title" = "Dateien hier ablegen";
-
-/* Chat unknown */
-"Chat.unknown.title" = "Unbekannt";
-
-/* No active nodes */
-"Chat.Alert.Title.NoActiveNodes" = "Keine aktiven ADM-Knoten";
-"Chat.Alert.NoActiveNodes" = "Es können keine neuen Nachrichten angefordert werden - Keine aktiven ADM-Blockchain-Knoten. Da Sie einige von ihnen deaktiviert haben, sollten Sie die Knotenliste überprüfen.";
-
-/* Timestamp in the future */
-"Chat.Alert.Title.TimestampIsInTheFuture" = "Gerätezeit prüfen";
-"Chat.Alert.TimestampIsInTheFuture" = "Es können keine neuen Nachrichten angefordert werden - keine aktiven ADM-Blockchain-Knoten. Da Sie einige von ihnen deaktiviert haben, sollten Sie die Knotenliste überprüfen.";
-"Chat.Alert.TimeSettings" = "Zeiteinstellung";
-
-/* Review Nodes List */
-"Chat.Alert.ReviewNodesList" = "ADM-Knotenliste überprüfen";
-
-"Chat.Timestamp.InFuture.Error" = "Ein Netzwerkknoten hat die Nachricht abgelehnt, weil die Zeit auf Ihrem Gerät vorgeht.\nÜberprüfen Sie die Uhrzeit des Geräts oder versuchen Sie erneut, eine Nachricht zu senden.";
-
-"LearnMore" = "Lernen Sie mehr";
+/* FileManager error 'Unable to download corrupted file' */
+"FileManagerError.UnableToDownloadCorrupted" = "Download nicht möglich.\nDatei(en) könnten beschädigt sein.";
diff --git a/CommonKit/Sources/CommonKit/Assets/Localization/en.lproj/Localizable.strings b/CommonKit/Sources/CommonKit/Assets/Localization/en.lproj/Localizable.strings
@@ -1330,36 +1330,5 @@
 /* FileManager error 'Can't decrypt file' */
 "FileManagerError.CantDecryptFile" = "Can't decrypt file";
 
-/* File validation error 'Too many files' */
-"FileValidationError.TooManyFiles" = "Too many files. Maximum allowed: %lld";
-
-/* File validation error 'File size exceeds limit' */
-"FileValidationError.FileSizeExceedsLimit" = "Send files up to %lld MB";
-
-/* File validation error 'File not found' */
-"FileValidationError.FileNotFound" = "File not found";
-
-/* File picker error 'Cant select file' */
-"FileValidationError.CantSelectFile" = "Can't select file: %@";
-
-/* Chat drop view title */
-"Chat.Drop.Title" = "Drop files here";
-
-/* Chat unknown */
-"Chat.unknown.title" = "Unknown";
-
-/* No active nodes */
-"Chat.Alert.Title.NoActiveNodes" = "No active ADM nodes";
-"Chat.Alert.NoActiveNodes" = "Unable to request new messages—No active ADM blockchain nodes. As you’ve deactivated some of them, consider reviewing the node list.";
-
-/* Timestamp in the future */
-"Chat.Alert.Title.TimestampIsInTheFuture" = "Check device time";
-"Chat.Alert.TimestampIsInTheFuture" = "A network node rejected the message because the time on your device is ahead. Check the device's time or try sending a message again.";
-"Chat.Alert.TimeSettings" = "Time setting";
-
-/* Review Nodes List */
-"Chat.Alert.ReviewNodesList" = "Review ADM node list";
-
-"Chat.Timestamp.InFuture.Error" = "A network node rejected the message because the time on your device is ahead.\nCheck the device's time or try sending a message again.";
-
-"LearnMore" = "Learn more";
+/* FileManager error 'Unable to download corrupted file' */
+"FileManagerError.UnableToDownloadCorrupted" = "Unable to download.\nFile(s) could be corrupted.";
diff --git a/CommonKit/Sources/CommonKit/Assets/Localization/ru.lproj/Localizable.strings b/CommonKit/Sources/CommonKit/Assets/Localization/ru.lproj/Localizable.strings
@@ -1332,38 +1332,7 @@
 "FileManagerError.CantEncryptFile" = "Не удалось зашифровать файл";
 
 /* FileManager error 'Can't decrypt file' */
-"FileManagerError.CantDecryptFile" = "Не удалось расшифровать файл";
+"FileManagerError.CantDecryptFile" = "Не удается расшифровать файл";
 
-/* File validation error 'Too many files' */
-"FileValidationError.TooManyFiles" = "Превышено максимально допустимое количество файлов (%lld)";
-
-/* File validation error 'File size exceeds limit' */
-"FileValidationError.FileSizeExceedsLimit" = "Превышен размер файла. Отправляйте файлы до  %lld МБ";
-
-/* File validation error 'File not found' */
-"FileValidationError.FileNotFound" = "Файл не найден";
-
-/* File picker error 'Cant select file' */
-"FileValidationError.CantSelectFile" = "Невозможно выбрать файл: %@";
-
-/* Chat drop view title */
-"Chat.Drop.Title" = "Перетащите файлы сюда";
-
-/* Chat unknown */
-"Chat.unknown.title" = "Неизвестный";
-
-/* No active nodes */
-"Chat.Alert.Title.NoActiveNodes" = "Нет активных узлов ADM";
-"Chat.Alert.NoActiveNodes" = "Не удается получить новые сообщения — нет активных узлов блокчейна ADM. Поскольку вы отключили некоторые из них, посмотрите список узлов еще раз.";
-
-/* Timestamp in the future */
-"Chat.Alert.Title.TimestampIsInTheFuture" = "Проверьте время на устройстве";
-"Chat.Alert.TimestampIsInTheFuture" = "Узел сети отклонил сообщение, потому что время на вашем устройстве спешит. Проверьте время на устройстве или попробуйте отправить сообщение снова.";
-"Chat.Alert.TimeSettings" = "Настроить время";
-
-/* Review Nodes List */
-"Chat.Alert.ReviewNodesList" = "К списку узлов ADM";
-
-"Chat.Timestamp.InFuture.Error" = "Узел сети отклонил сообщение, потому что время на вашем устройстве спешит.\nПроверьте время на устройстве или попробуйте отправить сообщение снова.";
-
-"LearnMore" = "Узнать больше";
+/* FileManager error 'Unable to download corrupted file' */
+"FileManagerError.UnableToDownloadCorrupted" = "Невозможно загрузить.\nФайл(ы) могут быть повреждены.";
diff --git a/CommonKit/Sources/CommonKit/Assets/Localization/zh.lproj/Localizable.strings b/CommonKit/Sources/CommonKit/Assets/Localization/zh.lproj/Localizable.strings
@@ -1358,3 +1358,6 @@
 "Chat.Timestamp.InFuture.Error" = "由于您设备上的时间超前，网络节点拒绝了信息。\n请检查设备的时间或再次尝试发送信息。";
 
 "LearnMore" = "了解更多";
+
+/* FileManager error 'Unable to download corrupted file' */
+"FileManagerError.UnableToDownloadCorrupted" = "无法下载。\n文件可能已损坏。"";

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,5 @@ enum ChatAction {`
`24`	`24`	`case cancelUploading(messageId: String)`
`25`	`25`	`case autoDownloadContentIfNeeded(messageId: String, files: [ChatFile])`
`26`	`26`	`case forceDownloadAllFiles(messageId: String, files: [ChatFile])`
	`27`	`+ case showDialog(title: String)`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,6 +223,8 @@ extension ChatDataSourceManager {`
`223`	`223`	`)`
`224`	`224`	`case let .forceDownloadAllFiles(messageId, files):`
`225`	`225`	`viewModel.forceDownloadAllFiles(messageId: messageId, files: files)`
	`226`	`+ case let .showDialog(title):`
	`227`	`+ viewModel.dialog.send(.alert(title))`
`226`	`228`	`}`
`227`	`229`	`}`
`228`	`230`	`}`