From 6b671191e9b3599fdd93eb3518be031264b0d46a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Kr=C3=BCger?= Date: Thu, 28 Apr 2022 17:14:10 +0200 Subject: [PATCH] Fix ktlint warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tim Krüger --- .../talk/adapters/SharedItemsAdapter.kt | 1 - .../talk/repositories/SharedItemsRepository.kt | 3 ++- .../nextcloud/talk/utils/FileViewerUtils.kt | 18 ++++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) 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 07cf78af6..c18ec7b61 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/SharedItemsAdapter.kt @@ -49,7 +49,6 @@ class SharedItemsAdapter : RecyclerView.Adapter() .setImageRequest(imageRequest) .build() holder.binding.image.controller = draweeController - } else { when (currentItem.mimeType) { "video/mp4", diff --git a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt b/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt index d908c9ee4..900946724 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/SharedItemsRepository.kt @@ -50,7 +50,8 @@ class SharedItemsRepository { return ApiUtils.getUrlForFilePreviewWithFileId( parameters!!.baseUrl, fileId, - sharedApplication!!.resources.getDimensionPixelSize(R.dimen.maximum_file_preview_size)) + sharedApplication!!.resources.getDimensionPixelSize(R.dimen.maximum_file_preview_size) + ) } data class Parameters( 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 b7aabc628..4b3638956 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileViewerUtils.kt @@ -10,10 +10,12 @@ import android.util.Log import android.view.View import android.widget.ProgressBar import androidx.core.content.FileProvider +import androidx.emoji.widget.EmojiTextView import androidx.work.Data import androidx.work.OneTimeWorkRequest import androidx.work.WorkInfo import androidx.work.WorkManager +import com.facebook.drawee.view.SimpleDraweeView import com.nextcloud.talk.R import com.nextcloud.talk.activities.FullScreenImageActivity import com.nextcloud.talk.activities.FullScreenMediaActivity @@ -21,13 +23,11 @@ import com.nextcloud.talk.activities.FullScreenTextViewerActivity import com.nextcloud.talk.adapters.messages.MagicPreviewMessageViewHolder import com.nextcloud.talk.jobs.DownloadFileToCacheWorker import com.nextcloud.talk.models.database.CapabilitiesUtil +import com.nextcloud.talk.models.database.UserEntity import com.nextcloud.talk.models.json.chat.ChatMessage import com.nextcloud.talk.utils.AccountUtils.canWeOpenFilesApp import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ACCOUNT import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_FILE_ID -import androidx.emoji.widget.EmojiTextView -import com.facebook.drawee.view.SimpleDraweeView -import com.nextcloud.talk.models.database.UserEntity import java.io.File import java.util.concurrent.ExecutionException @@ -230,7 +230,12 @@ class FileViewerUtils(private val context: Context, private val userEntity: User fun isSupportedForInternalViewer(mimetype: String?): Boolean { return when (mimetype) { - "image/png", "image/jpeg", "image/gif", "audio/mpeg", "audio/wav", "audio/ogg", "video/mp4", "video/quicktime", "video/ogg", "text/markdown", "text/plain" -> true + "image/png", "image/jpeg", + "image/gif", "audio/mpeg", + "audio/wav", "audio/ogg", + "video/mp4", "video/quicktime", + "video/ogg", "text/markdown", + "text/plain" -> true else -> false } } @@ -329,7 +334,8 @@ class FileViewerUtils(private val context: Context, private val userEntity: User openFileByMimetype(fileName, mimetype) } else { Log.d( - TAG, "file " + fileName + + TAG, + "file " + fileName + " was downloaded but it's not opened because view is not shown on screen" ) } @@ -388,4 +394,4 @@ class FileViewerUtils(private val context: Context, private val userEntity: User const val KEY_ID = "id" } -} \ No newline at end of file +}