diff --git a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt b/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt
index 6a685df17..f5ca1ffff 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt
@@ -74,9 +74,7 @@ class SharedItemsAdapter : RecyclerView.Adapter<SharedItemsAdapter.ViewHolder>()
             val fileViewerUtils = FileViewerUtils(it.context, currentItem.userEntity)
 
             fileViewerUtils.openFile(
-                currentItem.id,
-                currentItem.name,
-                currentItem.fileSize,
+                FileViewerUtils.FileInfo(currentItem.id, currentItem.name, currentItem.fileSize),
                 currentItem.path,
                 currentItem.link,
                 currentItem.mimeType,
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt b/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
index 431dd8fe9..455ab2609 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
@@ -75,17 +75,11 @@ class SharedItemsListAdapter : RecyclerView.Adapter<SharedItemsListAdapter.ViewH
             val fileViewerUtils = FileViewerUtils(it.context, currentItem.userEntity)
 
             fileViewerUtils.openFile(
-                currentItem.id,
-                currentItem.name,
-                currentItem.fileSize,
+                FileViewerUtils.FileInfo(currentItem.id, currentItem.name, currentItem.fileSize),
                 currentItem.path,
                 currentItem.link,
                 currentItem.mimeType,
-                FileViewerUtils.ProgressUi(
-                    holder.binding.progressBar,
-                    null,
-                    holder.binding.fileImage
-                )
+                FileViewerUtils.ProgressUi(holder.binding.progressBar, null, holder.binding.fileImage)
             )
         }
     }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
index a2785bafb..b0334a231 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt
@@ -71,9 +71,7 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
         val fileSize = Integer.valueOf(size)
 
         openFile(
-            fileId,
-            fileName,
-            fileSize,
+            FileInfo(fileId, fileName, fileSize),
             path,
             link,
             mimetype,
@@ -82,25 +80,21 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
     }
 
     fun openFile(
-        fileId: String,
-        fileName: String,
-        fileSize: Int,
+        fileInfo: FileInfo,
         path: String,
         link: String,
         mimetype: String,
         progressUi: ProgressUi
     ) {
-        if (isSupportedForInternalViewer(mimetype) || canBeHandledByExternalApp(mimetype, fileName)) {
+        if (isSupportedForInternalViewer(mimetype) || canBeHandledByExternalApp(mimetype, fileInfo.fileName)) {
             openOrDownloadFile(
-                fileName,
-                fileId,
+                fileInfo,
                 path,
-                fileSize,
                 mimetype,
                 progressUi
             )
         } else {
-            openFileInFilesApp(link, fileId)
+            openFileInFilesApp(link, fileInfo.fileId)
         }
     }
 
@@ -113,22 +107,18 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
     }
 
     private fun openOrDownloadFile(
-        fileName: String,
-        fileId: String,
+        fileInfo: FileInfo,
         path: String,
-        fileSize: Int,
         mimetype: String,
         progressUi: ProgressUi
     ) {
-        val file = File(context.cacheDir, fileName)
+        val file = File(context.cacheDir, fileInfo.fileName)
         if (file.exists()) {
-            openFileByMimetype(fileName!!, mimetype!!)
+            openFileByMimetype(fileInfo.fileName!!, mimetype!!)
         } else {
             downloadFileToCache(
-                fileName,
-                fileId,
+                fileInfo,
                 path,
-                fileSize,
                 mimetype,
                 progressUi
             )
@@ -263,26 +253,24 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
 
     @SuppressLint("LongLogTag")
     private fun downloadFileToCache(
-        fileName: String,
-        fileId: String,
+        fileInfo: FileInfo,
         path: String,
-        fileSize: Int,
         mimetype: String,
         progressUi: ProgressUi
     ) {
         // check if download worker is already running
-        val workers = WorkManager.getInstance(context).getWorkInfosByTag(fileId!!)
+        val workers = WorkManager.getInstance(context).getWorkInfosByTag(fileInfo.fileId!!)
         try {
             for (workInfo in workers.get()) {
                 if (workInfo.state == WorkInfo.State.RUNNING || workInfo.state == WorkInfo.State.ENQUEUED) {
-                    Log.d(TAG, "Download worker for $fileId is already running or scheduled")
+                    Log.d(TAG, "Download worker for $fileInfo.fileId is already running or scheduled")
                     return
                 }
             }
         } catch (e: ExecutionException) {
-            Log.e(TAG, "Error when checking if worker already exsists", e)
+            Log.e(TAG, "Error when checking if worker already exists", e)
         } catch (e: InterruptedException) {
-            Log.e(TAG, "Error when checking if worker already exsists", e)
+            Log.e(TAG, "Error when checking if worker already exists", e)
         }
         val downloadWorker: OneTimeWorkRequest
         val data: Data = Data.Builder()
@@ -292,20 +280,20 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
                 DownloadFileToCacheWorker.KEY_ATTACHMENT_FOLDER,
                 CapabilitiesUtil.getAttachmentFolder(userEntity)
             )
-            .putString(DownloadFileToCacheWorker.KEY_FILE_NAME, fileName)
+            .putString(DownloadFileToCacheWorker.KEY_FILE_NAME, fileInfo.fileName)
             .putString(DownloadFileToCacheWorker.KEY_FILE_PATH, path)
-            .putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileSize)
+            .putInt(DownloadFileToCacheWorker.KEY_FILE_SIZE, fileInfo.fileSize)
             .build()
         downloadWorker = OneTimeWorkRequest.Builder(DownloadFileToCacheWorker::class.java)
             .setInputData(data)
-            .addTag(fileId)
+            .addTag(fileInfo.fileId)
             .build()
         WorkManager.getInstance().enqueue(downloadWorker)
         progressUi.progressBar?.visibility = View.VISIBLE
         WorkManager.getInstance(context).getWorkInfoByIdLiveData(downloadWorker.id)
             .observeForever { workInfo: WorkInfo? ->
                 updateViewsByProgress(
-                    fileName,
+                    fileInfo.fileName,
                     mimetype,
                     workInfo!!,
                     progressUi
@@ -392,6 +380,12 @@ class FileViewerUtils(private val context: Context, private val userEntity: User
         val previewImage: SimpleDraweeView
     )
 
+    data class FileInfo(
+        val fileId: String,
+        val fileName: String,
+        val fileSize: Int
+    )
+
     companion object {
         private val TAG = FileViewerUtils::class.simpleName
         const val KEY_ID = "id"