Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename classes for clarity.

Browse source
This commit is contained in:
Benoit Marty 2024-06-06 09:40:54 +02:00
parent 9a6eec3494
commit f9508f8472
4 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
View file

@ -41,9 +41,14 @@ import timber.log.Timber
import javax.inject.Inject
interface ShareIntentHandler {
data class UriToShare(
val uri: Uri,
val mimeType: String,
)
suspend fun handleIncomingShareIntent(
intent: Intent,
onFiles: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onUris: suspend (List<UriToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean
}
@ -52,11 +57,6 @@ interface ShareIntentHandler {
class DefaultShareIntentHandler @Inject constructor(
@ApplicationContext private val context: Context,
) : ShareIntentHandler {
data class FileToShare(
val uri: Uri,
val mimeType: String,
)
/**
* This methods aims to handle incoming share intents.
*
@ -64,7 +64,7 @@ class DefaultShareIntentHandler @Inject constructor(
*/
override suspend fun handleIncomingShareIntent(
intent: Intent,
onFiles: suspend (List<FileToShare>) -> Boolean,
onUris: suspend (List<ShareIntentHandler.UriToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean {
val type = intent.resolveType(context) ?: return false
@ -78,7 +78,7 @@ class DefaultShareIntentHandler @Inject constructor(
type.isMimeTypeText() ||
type.isMimeTypeAny() -> {
val files = getIncomingFiles(intent, type)
val result = onFiles(files)
val result = onUris(files)
revokeUriPermissions(files.map { it.uri })
result
}
@ -99,32 +99,32 @@ class DefaultShareIntentHandler @Inject constructor(
* Use this function to retrieve files which are shared from another application or internally
* by using android.intent.action.SEND or android.intent.action.SEND_MULTIPLE actions.
*/
private fun getIncomingFiles(data: Intent, type: String): List<FileToShare> {
private fun getIncomingFiles(intent: Intent, type: String): List<ShareIntentHandler.UriToShare> {
val uriList = mutableListOf<Uri>()
if (data.action == Intent.ACTION_SEND) {
data.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)?.let { uriList.add(it) }
} else if (data.action == Intent.ACTION_SEND_MULTIPLE) {
val extraUriList: List<Uri>? = data.getParcelableArrayListExtraCompat(Intent.EXTRA_STREAM)
if (intent.action == Intent.ACTION_SEND) {
intent.getParcelableExtraCompat<Uri>(Intent.EXTRA_STREAM)?.let { uriList.add(it) }
} else if (intent.action == Intent.ACTION_SEND_MULTIPLE) {
val extraUriList: List<Uri>? = intent.getParcelableArrayListExtraCompat(Intent.EXTRA_STREAM)
extraUriList?.let { uriList.addAll(it) }
}
val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(data, PackageManager.MATCH_DEFAULT_ONLY)
uriList.forEach {
val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(intent, PackageManager.MATCH_DEFAULT_ONLY)
uriList.forEach { uri ->
resInfoList.forEach resolve@{ resolveInfo ->
val packageName: String = resolveInfo.activityInfo.packageName
// Replace implicit intent by an explicit to fix crash on some devices like Xiaomi.
// see https://juejin.cn/post/7031736325422186510
try {
context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
context.grantUriPermission(packageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
} catch (e: Exception) {
Timber.w(e, "Unable to grant Uri permission")
return@resolve
}
data.action = null
data.component = ComponentName(packageName, resolveInfo.activityInfo.name)
intent.action = null
intent.component = ComponentName(packageName, resolveInfo.activityInfo.name)
}
}
return uriList.map { uri ->
FileToShare(
ShareIntentHandler.UriToShare(
uri = uri,
mimeType = type
)

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,
onFiles = { filesToShare ->
onUris = { filesToShare ->
roomIds
.map { roomId ->
val room = matrixClient.getRoom(roomId) ?: return@map false

6
features/share/impl/src/test/kotlin/io/element/android/features/share/impl/FakeShareIntentHandler.kt
View file

@ -21,15 +21,15 @@ import android.content.Intent
class FakeShareIntentHandler(
private val onIncomingShareIntent: suspend (
Intent,
suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
suspend (List<ShareIntentHandler.UriToShare>) -> Boolean,
suspend (String) -> Boolean,
) -> Boolean = { _, _, _ -> false },
) : ShareIntentHandler {
override suspend fun handleIncomingShareIntent(
intent: Intent,
onFiles: suspend (List<DefaultShareIntentHandler.FileToShare>) -> Boolean,
onUris: suspend (List<ShareIntentHandler.UriToShare>) -> Boolean,
onPlainText: suspend (String) -> Boolean,
): Boolean {
return onIncomingShareIntent(intent, onFiles, onPlainText)
return onIncomingShareIntent(intent, onUris, onPlainText)
}
}

2
features/share/impl/src/test/kotlin/io/element/android/features/share/impl/SharePresenterTest.kt
View file

@ -126,7 +126,7 @@ class SharePresenterTest {
shareIntentHandler = FakeShareIntentHandler { _, onFile, _ ->
onFile(
listOf(
DefaultShareIntentHandler.FileToShare(
ShareIntentHandler.UriToShare(
uri = Uri.parse("content://image.jpg"),
mimeType = MimeTypes.Jpeg,
)