Skip to content

Commit c387abc

Browse files
committed
fix git conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 35255cd commit c387abc

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

app/src/main/java/com/nextcloud/utils/extensions/OCFileExtensions.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,12 @@ fun List<OCFile>.hasSameContentAs(other: List<OCFile>): Boolean {
3737

3838
fun List<OCFile>.filterFilenames(): List<OCFile> = distinctBy { it.fileName }
3939

40-
fun List<OCFile>.filterTempFilter(): List<OCFile> = filterNot { it.isTempFile() }
41-
4240
fun OCFile.isTempFile(): Boolean {
4341
val context = MainApp.getAppContext()
4442
val appTempPath = FileStorageUtils.getAppTempDirectoryPath(context)
4543
return storagePath?.startsWith(appTempPath) == true
4644
}
4745

48-
fun List<OCFile>.filterHiddenFiles(): List<OCFile> = filterNot { it.isHidden }.distinct()
49-
50-
fun List<OCFile>.filterByMimeType(mimeType: String): List<OCFile> =
51-
filter { it.isFolder || it.mimeType.startsWith(mimeType) }
52-
53-
fun List<OCFile>.limitToPersonalFiles(userId: String): List<OCFile> = filter { file ->
54-
file.ownerId?.let { ownerId ->
55-
ownerId == userId && !file.isSharedWithMe && !file.mounted()
56-
} == true
57-
}
58-
5946
fun OCFile.mediaSize(defaultThumbnailSize: Float): Pair<Int, Int> {
6047
val width = (imageDimension?.width?.toInt() ?: defaultThumbnailSize.toInt())
6148
val height = (imageDimension?.height?.toInt() ?: defaultThumbnailSize.toInt())

0 commit comments

Comments
 (0)