AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

#337 show images again in the internal viewer

Browse Source
This commit is contained in:
Julian Raufelder 2021-07-15 14:21:56 +02:00
parent 2b5fed6e68
commit 1a96a4dd46
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
presentation/src/main/java/org/cryptomator/presentation/presenter/BrowseFilesPresenter.kt
View File

@ -433,7 +433,7 @@ class BrowseFilesPresenter @Inject constructor( //
Intents.textEditorIntent() // Intents.textEditorIntent() //
.withTextFile(cloudFile) .withTextFile(cloudFile)
) )
} else if (!lowerFileName.endsWith(".gif") && mimeTypes.fromFilename(cloudFile.name) ?: (MimeType.WILDCARD_MIME_TYPE).mediatype == "image") { } else if (!lowerFileName.endsWith(".gif") && isImageMediaType(cloudFile.name)) {
val cloudFileNodes = previewCloudFileNodes val cloudFileNodes = previewCloudFileNodes
val imagePreviewStore = ImagePreviewFilesStore( // val imagePreviewStore = ImagePreviewFilesStore( //
cloudFileNodes, // cloudFileNodes, //
@ -448,6 +448,10 @@ class BrowseFilesPresenter @Inject constructor( //
} }
} }
private fun isImageMediaType(filename: String): Boolean {
return (mimeTypes.fromFilename(filename) ?: MimeType.WILDCARD_MIME_TYPE).mediatype == "image"
}
private fun viewExternalFile(cloudFile: CloudFileModel) { private fun viewExternalFile(cloudFile: CloudFileModel) {
val viewFileIntent = Intent(Intent.ACTION_VIEW) val viewFileIntent = Intent(Intent.ACTION_VIEW)
fileUtil.contentUriFor(cloudFile).let { fileUtil.contentUriFor(cloudFile).let {
@ -475,8 +479,7 @@ class BrowseFilesPresenter @Inject constructor( //
view?.renderedCloudNodes() view?.renderedCloudNodes()
?.filterIsInstance<CloudFileModel>() ?.filterIsInstance<CloudFileModel>()
?.filterTo(previewCloudFiles) { ?.filterTo(previewCloudFiles) {
!it.name.endsWith(".gif") // !it.name.endsWith(".gif") && isImageMediaType(it.name)
&& mimeTypes.fromFilename(it.name) ?: (MimeType.WILDCARD_MIME_TYPE).mediatype == "image"
} }
return previewCloudFiles return previewCloudFiles
} }