Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix quality issues

Browse source
This commit is contained in:
Benoit Marty 2024-06-05 18:52:57 +02:00 • committed by Benoit Marty
parent ebe7ab2d2b
commit 32ab6639f7
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -102,18 +102,17 @@ class DefaultShareIntentHandler @Inject constructor(
} }
val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(data, PackageManager.MATCH_DEFAULT_ONLY) val resInfoList: List<ResolveInfo> = context.packageManager.queryIntentActivitiesCompat(data, PackageManager.MATCH_DEFAULT_ONLY)
uriList.forEach { uriList.forEach {
for (resolveInfo in resInfoList) { resInfoList.forEach resolve@{ resolveInfo ->
val packageName: String = resolveInfo.activityInfo.packageName val packageName: String = resolveInfo.activityInfo.packageName
// Replace implicit intent by an explicit to fix crash on some devices like Xiaomi. // Replace implicit intent by an explicit to fix crash on some devices like Xiaomi.
// see https://juejin.cn/post/7031736325422186510 // see https://juejin.cn/post/7031736325422186510
try { try {
context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
} catch (e: Exception) { } catch (e: Exception) {
continue return@resolve
} }
data.action = null data.action = null
data.component = ComponentName(packageName, resolveInfo.activityInfo.name) data.component = ComponentName(packageName, resolveInfo.activityInfo.name)
break
} }
} }
return uriList.map { uri -> return uriList.map { uri ->

2
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareNode.kt
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 20244 New Vector Ltd * Copyright (c) 2024 New Vector Ltd
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

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

@ -104,7 +104,7 @@ class SharePresenter @AssistedInject constructor(
} }
) )
if (!result) { if (!result) {
throw Exception("Failed to handle incoming share intent") error("Failed to handle incoming share intent")
} }
roomIds roomIds
}.runCatchingUpdatingState(shareActionState) }.runCatchingUpdatingState(shareActionState)