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

Fix open Microsoft files URI in intent (#150)

Browse Source
This commit is contained in:
Julian Raufelder 2022-07-11 17:30:16 +02:00
parent d22f1a4459
commit ff9d116762
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -540,7 +540,7 @@ class BrowseFilesPresenter @Inject constructor( //
}.also {
openedCloudFile = cloudFile
openedCloudFileMd5 = calculateDigestFromUri(it)
viewFileIntent.setDataAndType(uriToOpenedFile, mimeTypes.fromFilename(cloudFile.name)?.toString())
viewFileIntent.setDataAndType(it, mimeTypes.fromFilename(cloudFile.name)?.toString())
viewFileIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
if (sharedPreferencesHandler.keepUnlockedWhileEditing()) {
openWritableFileNotification = OpenWritableFileNotification(context(), it)

5
presentation/src/main/java/org/cryptomator/presentation/util/FileUtil.kt
View File

@ -122,8 +122,9 @@ class FileUtil @Inject constructor(private val context: Context, private val mim
private fun getPublicDecryptedFileStorage(): File? {
return try {
val mediaDir = context.getExternalMediaDirs().first { dir -> dir.startsWith("/storage/emulated/0") }
val publicDecryptedFileStorage = File(mediaDir, "decrypted")
if (publicDecryptedFileStorage.canWrite()) {
if (mediaDir.canWrite()) {
val publicDecryptedFileStorage = File(mediaDir, "decrypted")
publicDecryptedFileStorage.mkdir()
publicDecryptedFileStorage
} else {
Timber.tag("FileUtil").e("Media storage isn't writable")