Skip to content

Commit 63923ac

Browse files
author
zerox80
committed
Fix Detekt issues
1 parent a6c681c commit 63923ac

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

opencloudApp/src/main/java/eu/opencloud/android/presentation/files/details/FileDetailsFragment.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ package eu.opencloud.android.presentation.files.details
2424

2525
import android.accounts.Account
2626
import android.content.Intent
27-
import android.graphics.Bitmap
27+
2828
import android.net.Uri
2929
import android.os.Build
3030
import android.os.Bundle
@@ -38,7 +38,7 @@ import androidx.browser.customtabs.CustomTabsIntent
3838
import androidx.core.view.isVisible
3939
import androidx.work.WorkInfo
4040
import com.google.android.material.snackbar.Snackbar
41-
import eu.opencloud.android.MainApp
41+
4242
import eu.opencloud.android.R
4343
import coil.load
4444
import eu.opencloud.android.databinding.FileDetailsFragmentBinding
@@ -430,7 +430,13 @@ class FileDetailsFragment : FileFragment() {
430430
}
431431
}
432432
if (ocFile.isImage) {
433-
imageView.load(ThumbnailsRequester.getPreviewUriForFile(OCFileWithSyncInfo(ocFile, null), fileDetailsViewModel.getAccount()), ThumbnailsRequester.getCoilImageLoader(fileDetailsViewModel.getAccount())) {
433+
imageView.load(
434+
ThumbnailsRequester.getPreviewUriForFile(
435+
OCFileWithSyncInfo(ocFile, null),
436+
fileDetailsViewModel.getAccount()
437+
),
438+
ThumbnailsRequester.getCoilImageLoader(fileDetailsViewModel.getAccount())
439+
) {
434440
placeholder(MimetypeIconUtil.getFileTypeIconId(ocFile.mimeType, ocFile.fileName))
435441
error(MimetypeIconUtil.getFileTypeIconId(ocFile.mimeType, ocFile.fileName))
436442
crossfade(true)

opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/FileListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ package eu.opencloud.android.presentation.files.filelist
2525

2626
import android.accounts.Account
2727
import android.content.Context
28-
import android.graphics.Bitmap
28+
2929
import android.graphics.Color
3030
import android.view.LayoutInflater
3131
import android.view.View

opencloudApp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ class MainFileListFragment : Fragment(),
606606
dialog.dismiss()
607607
}
608608

609-
val thumbnailBottomSheet = fileOptionsBottomSheetSingleFile.findViewById<ImageView>(R.id.thumbnail_bottom_sheet)
609+
610610

611611
val fileSizeBottomSheet = fileOptionsBottomSheetSingleFile.findViewById<TextView>(R.id.file_size_bottom_sheet)
612612
fileSizeBottomSheet.text = DisplayUtils.bytesToHumanReadable(file.length, requireContext(), true)

opencloudApp/src/main/java/eu/opencloud/android/presentation/sharing/ShareFileFragment.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,15 @@ class ShareFileFragment : Fragment(), ShareUserListAdapter.ShareUserAdapterListe
240240
)
241241
)
242242
if (file!!.isImage) {
243-
binding.shareFileIcon.load(ThumbnailsRequester.getPreviewUriForFile(file!!, account!!), ThumbnailsRequester.getCoilImageLoader(account!!)) {
243+
binding.shareFileIcon.load(
244+
ThumbnailsRequester.getPreviewUriForFile(file!!, account!!),
245+
ThumbnailsRequester.getCoilImageLoader(account!!)
246+
) {
244247
placeholder(MimetypeIconUtil.getFileTypeIconId(file!!.mimeType, file!!.fileName))
245248
error(MimetypeIconUtil.getFileTypeIconId(file!!.mimeType, file!!.fileName))
246249
crossfade(true)
247250
}
248251
}
249-
// Name
250252
binding.shareFileName.text = file?.fileName
251253

252254
// Size

opencloudApp/src/main/java/eu/opencloud/android/presentation/thumbnails/ThumbnailsRequester.kt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import coil.disk.DiskCache
2828
import coil.memory.MemoryCache
2929
import coil.util.DebugLogger
3030
import eu.opencloud.android.MainApp.Companion.appContext
31-
import eu.opencloud.android.R
3231
import eu.opencloud.android.data.ClientManager
3332
import java.util.concurrent.ConcurrentHashMap
3433
import eu.opencloud.android.domain.files.model.OCFile
@@ -49,7 +48,6 @@ import org.koin.core.component.KoinComponent
4948
import org.koin.core.component.inject
5049
import timber.log.Timber
5150
import java.util.Locale
52-
import kotlin.math.roundToInt
5351

5452
object ThumbnailsRequester : KoinComponent {
5553
private val clientManager: ClientManager by inject()
@@ -89,25 +87,21 @@ object ThumbnailsRequester : KoinComponent {
8987
return "$baseUrl/index.php/avatar/${android.net.Uri.encode(username)}/384"
9088
}
9189

92-
fun getPreviewUriForFile(file: OCFile, account: Account, etag: String? = null): String {
93-
return getPreviewUri(file.remotePath, etag ?: file.etag, account)
94-
}
90+
fun getPreviewUriForFile(file: OCFile, account: Account, etag: String? = null): String =
91+
getPreviewUri(file.remotePath, etag ?: file.etag, account)
9592

96-
fun getPreviewUriForFile(fileWithSyncInfo: OCFileWithSyncInfo, account: Account): String {
97-
return getPreviewUriForFile(fileWithSyncInfo.file, account)
98-
}
93+
fun getPreviewUriForFile(fileWithSyncInfo: OCFileWithSyncInfo, account: Account): String =
94+
getPreviewUriForFile(fileWithSyncInfo.file, account)
9995

100-
fun getPreviewUriForSpaceSpecial(spaceSpecial: SpaceSpecial): String {
101-
return String.format(Locale.US, SPACE_SPECIAL_PREVIEW_URI, spaceSpecial.webDavUrl, 1024, 1024, spaceSpecial.eTag)
102-
}
96+
fun getPreviewUriForSpaceSpecial(spaceSpecial: SpaceSpecial): String =
97+
String.format(Locale.US, SPACE_SPECIAL_PREVIEW_URI, spaceSpecial.webDavUrl, 1024, 1024, spaceSpecial.eTag)
10398

10499
private fun getPreviewUri(remotePath: String?, etag: String?, account: Account): String {
105100
val accountManager = AccountManager.get(appContext)
106101
val baseUrl = accountManager.getUserData(account, eu.opencloud.android.lib.common.accounts.AccountUtils.Constants.KEY_OC_BASE_URL)
107-
108102
val path = if (remotePath?.startsWith("/") == true) remotePath else "/$remotePath"
109103
val encodedPath = Uri.encode(path, "/")
110-
104+
111105
return String.format(Locale.US, FILE_PREVIEW_URI, baseUrl, encodedPath, 1024, 1024, etag)
112106
}
113107

0 commit comments

Comments
 (0)