Remove useless parameter id

2025-03-16 19:28:54 +03:00 · 2020-12-10 13:36:00 +01:00 · 2020-12-10 13:36:00 +01:00 · 5e2f091ec1
commit 5e2f091ec1
parent 75071cf1d9
10 changed files with 13 additions and 30 deletions
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/file/FileService.kt
@ -41,20 +41,15 @@ interface FileService {
     * Download a file.
     * Result will be a decrypted file, stored in the cache folder. url parameter will be used to create unique filename to avoid name collision.
     */
-    fun downloadFile(
-            id: String,
-            fileName: String,
-            mimeType: String?,
-            url: String?,
-            elementToDecrypt: ElementToDecrypt?,
-            callback: MatrixCallback<File>): Cancelable
+    fun downloadFile(fileName: String,
+                     mimeType: String?,
+                     url: String?,
+                     elementToDecrypt: ElementToDecrypt?,
+                     callback: MatrixCallback<File>): Cancelable

-    fun downloadFile(
-            id: String,
-            messageContent: MessageWithAttachmentContent,
-            callback: MatrixCallback<File>): Cancelable =
+    fun downloadFile(messageContent: MessageWithAttachmentContent,
+                     callback: MatrixCallback<File>): Cancelable =
            downloadFile(
-                    id = id,
                    fileName = messageContent.getFileName(),
                    mimeType = messageContent.mimeType,
                    url = messageContent.getFileUrl(),
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/DefaultFileService.kt
@ -79,8 +79,7 @@ internal class DefaultFileService @Inject constructor(
     * Download file in the cache folder, and eventually decrypt it
     * TODO looks like files are copied 3 times
     */
-    override fun downloadFile(id: String,
-                              fileName: String,
+    override fun downloadFile(fileName: String,
                              mimeType: String?,
                              url: String?,
                              elementToDecrypt: ElementToDecrypt?,
--- a/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
+++ b/vector/src/main/java/im/vector/app/core/glide/VectorGlideModelLoader.kt
@ -109,10 +109,9 @@ class VectorGlideDataFetcher(private val activeSessionHolder: ActiveSessionHolde
        }
        // Use the file vector service, will avoid flickering and redownload after upload
        fileService.downloadFile(
-                mimeType = data.mimeType,
-                id = data.eventId,
-                url = data.url,
                fileName = data.filename,
+                mimeType = data.mimeType,
+                url = data.url,
                elementToDecrypt = data.elementToDecrypt,
                callback = object : MatrixCallback<File> {
                    override fun onSuccess(data: File) {
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@ -1654,7 +1654,6 @@ class RoomDetailFragment @Inject constructor(
            shareText(requireContext(), action.messageContent.body)
        } else if (action.messageContent is MessageWithAttachmentContent) {
            session.fileService().downloadFile(
-                    id = action.eventId,
                    messageContent = action.messageContent,
                    callback = object : MatrixCallback<File> {
                        override fun onSuccess(data: File) {
@ -1685,7 +1684,6 @@ class RoomDetailFragment @Inject constructor(
            return
        }
        session.fileService().downloadFile(
-                id = action.eventId,
                messageContent = action.messageContent,
                callback = object : MatrixCallback<File> {
                    override fun onSuccess(data: File) {
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
@ -1030,7 +1030,6 @@ class RoomDetailViewModel @AssistedInject constructor(
            }
        } else {
            session.fileService().downloadFile(
-                    id = action.eventId,
                    messageContent = action.messageFileContent,
                    callback = object : MatrixCallback<File> {
                        override fun onSuccess(data: File) {
--- a/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/BaseAttachmentProvider.kt
@ -153,11 +153,10 @@ abstract class BaseAttachmentProvider<Type>(
        } else {
            target.onVideoFileLoading(info.uid)
            fileService.downloadFile(
-                    id = data.eventId,
-                    mimeType = data.mimeType,
-                    elementToDecrypt = data.elementToDecrypt,
                    fileName = data.filename,
+                    mimeType = data.mimeType,
                    url = data.url,
+                    elementToDecrypt = data.elementToDecrypt,
                    callback = object : MatrixCallback<File> {
                        override fun onSuccess(data: File) {
                            target.onVideoFileReady(info.uid, data)
--- a/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/DataAttachmentRoomProvider.kt
@ -77,10 +77,9 @@ class DataAttachmentRoomProvider(
    override fun getFileForSharing(position: Int, callback: (File?) -> Unit) {
        val item = getItem(position)
        fileService.downloadFile(
-                id = item.eventId,
                fileName = item.filename,
                mimeType = item.mimeType,
-                url = item.url ?: "",
+                url = item.url,
                elementToDecrypt = item.elementToDecrypt,
                callback = object : MatrixCallback<File> {
                    override fun onSuccess(data: File) {
--- a/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/media/RoomEventsAttachmentProvider.kt
@ -125,7 +125,6 @@ class RoomEventsAttachmentProvider(
                    as? MessageWithAttachmentContent
                    ?: return@let
            fileService.downloadFile(
-                    id = timelineEvent.eventId,
                    fileName = messageContent.body,
                    mimeType = messageContent.mimeType,
                    url = messageContent.getFileUrl(),
--- a/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
+++ b/vector/src/main/java/im/vector/app/features/media/VideoContentRenderer.kt
@ -75,7 +75,6 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:

                activeSessionHolder.getActiveSession().fileService()
                        .downloadFile(
-                                id = data.eventId,
                                fileName = data.filename,
                                mimeType = data.mimeType,
                                url = data.url,
@ -114,7 +113,6 @@ class VideoContentRenderer @Inject constructor(private val activeSessionHolder:

                activeSessionHolder.getActiveSession().fileService()
                        .downloadFile(
-                                id = data.eventId,
                                fileName = data.filename,
                                mimeType = data.mimeType,
                                url = data.url,
--- a/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/uploads/RoomUploadsViewModel.kt
@ -131,7 +131,6 @@ class RoomUploadsViewModel @AssistedInject constructor(
            try {
                val file = awaitCallback<File> {
                    session.fileService().downloadFile(
-                            id = action.uploadEvent.eventId,
                            messageContent = action.uploadEvent.contentWithAttachmentContent,
                            callback = it
                    )
@ -148,7 +147,6 @@ class RoomUploadsViewModel @AssistedInject constructor(
            try {
                val file = awaitCallback<File> {
                    session.fileService().downloadFile(
-                            id = action.uploadEvent.eventId,
                            messageContent = action.uploadEvent.contentWithAttachmentContent,
                            callback = it)
                }