Skip to content

Commit ca8ed38

Browse files
authored
Merge pull request #6094 from nextcloud/bugfix/noid/use_EXTRA_SHORTCUT_ID_onlyWhenSupported
Bugfix/noid/use extra shortcut id only when supported
2 parents 4c077f9 + 7c5e3b1 commit ca8ed38

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ class ConversationsListActivity : BaseActivity() {
329329

330330
// Share sheet shortcut tap: Android delivers ACTION_SEND with EXTRA_SHORTCUT_ID.
331331
// Extract the room token from the shortcut ID so we can pre-select the conversation.
332-
if (hasActivityActionSendIntent()) {
332+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && hasActivityActionSendIntent()) {
333333
val shortcutId = intent.getStringExtra(Intent.EXTRA_SHORTCUT_ID)
334334
if (shortcutId != null) {
335335
pendingDirectShareToken = DirectShareHelper.extractTokenFromShortcutId(shortcutId)

app/src/main/java/com/nextcloud/talk/ui/chat/ChatMessageScaffold.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ private fun ChatMessageUi.hasMentionChips(): Boolean =
144144
message.contains("{$key}") && parameter["type"] in mentionChipTypes
145145
}
146146

147-
@Suppress("Detekt.LongMethod")
147+
@Suppress("Detekt.LongMethod", "LongParameterList")
148148
@Composable
149149
fun MessageScaffold(
150150
uiMessage: ChatMessageUi,
@@ -313,6 +313,7 @@ private fun MessageBubbleWithReactions(
313313
}
314314
}
315315

316+
@Suppress("LongParameterList")
316317
@Composable
317318
private fun MessageBubbleContent(
318319
uiMessage: ChatMessageUi,

0 commit comments

Comments
 (0)