letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Ensure Uri permission is revoked.

Browse Source
This commit is contained in:
Benoit Marty
2024-06-06 09:36:45 +02:00
parent 32ab6639f7
commit 37934eee7e
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
View File

@@ -22,6 +22,7 @@ import android.content.Intent
import android.content.pm.PackageManager
import android.content.pm.ResolveInfo
import android.net.Uri
import android.os.Build
import com.squareup.anvil.annotations.ContributesBinding
import io.element.android.libraries.androidutils.compat.getParcelableArrayListExtraCompat
import io.element.android.libraries.androidutils.compat.getParcelableExtraCompat
@@ -36,12 +37,13 @@ import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeText
import io.element.android.libraries.core.mimetype.MimeTypes.isMimeTypeVideo
import io.element.android.libraries.di.AppScope
import io.element.android.libraries.di.ApplicationContext
import timber.log.Timber
import javax.inject.Inject
interface ShareIntentHandler {
suspend fun handleIncomingShareIntent(
intent: Intent,
onFile: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onFiles: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean
}
@@ -62,7 +64,7 @@ class DefaultShareIntentHandler @Inject constructor(
*/
override suspend fun handleIncomingShareIntent(
intent: Intent,
onFile: suspend (List<FileToShare>) -> Boolean,
onFiles: suspend (List<FileToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean {
val type = intent.resolveType(context) ?: return false
@@ -74,7 +76,12 @@ class DefaultShareIntentHandler @Inject constructor(
type.isMimeTypeApplication() ||
type.isMimeTypeFile() ||
type.isMimeTypeText() ||
type.isMimeTypeAny() -> onFile(getIncomingFiles(intent, type))
type.isMimeTypeAny() -> {
val files = getIncomingFiles(intent, type)
val result = onFiles(files)
revokeUriPermissions(files.map { it.uri })
result
}
else -> false
}
}
@@ -109,6 +116,7 @@ class DefaultShareIntentHandler @Inject constructor(
try {
context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
} catch (e: Exception) {
Timber.w(e, "Unable to grant Uri permission")
return@resolve
}
data.action = null
@@ -122,4 +130,18 @@ class DefaultShareIntentHandler @Inject constructor(
)
}
}
private fun revokeUriPermissions(uris: List<Uri>) {
uris.forEach { uri ->
try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
context.revokeUriPermission(context.packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
} else {
context.revokeUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
}
} catch (e: Exception) {
Timber.w(e, "Unable to revoke Uri permission")
}
}
}
}

2
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/SharePresenter.kt
View File

@@ -74,7 +74,7 @@ class SharePresenter @AssistedInject constructor(
suspend {
val result = shareIntentHandler.handleIncomingShareIntent(
intent,
onFile = { filesToShare ->
onFiles = { filesToShare ->
roomIds
.map { roomId ->
val room = matrixClient.getRoom(roomId) ?: return@map false

4
features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt
View File

@@ -27,9 +27,9 @@ class FakeShareIntentHandler(
) : ShareIntentHandler {
override suspend fun handleIncomingShareIntent(
intent: Intent,
onFile: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onFiles: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean {
return onIncomingShareIntent(intent, onFile, onPlainText)
return onIncomingShareIntent(intent, onFiles, onPlainText)
}
}