dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-06-07 04:32:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into stable-android

Browse Source
This commit is contained in:
Evgeny Poberezkin
2025-01-13 08:41:11 +00:00
parent 6d55518c15 161143add0
commit 2c8e33749e
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
+3 -3
View File
@@ -399,9 +399,9 @@ fun ChatItemView(
val groupInfo = cItem.memberToModerate(cInfo)?.first
if (groupInfo != null) {
ModerateItemAction(cItem, questionText = moderateMessageQuestionText(cInfo.featureEnabled(ChatFeature.FullDelete), 1), showMenu, deleteMessage)
} else if (cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group && cInfo.groupInfo.membership.memberRole == GroupMemberRole.Member && !live) {
ReportItemAction(cItem, composeState, showMenu)
}
} // else if (cItem.meta.itemDeleted == null && cInfo is ChatInfo.Group && cInfo.groupInfo.membership.memberRole == GroupMemberRole.Member && !live) {
// ReportItemAction(cItem, composeState, showMenu)
// }
}
if (cItem.canBeDeletedForSelf) {
Divider()
apps/multiplatform/gradle.properties
+4 -4
View File
@@ -24,11 +24,11 @@ android.nonTransitiveRClass=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.jvm.target=11
android.version_name=6.2.3
android.version_code=265
android.version_name=6.2.4
android.version_code=268
desktop.version_name=6.2.3
desktop.version_code=85
desktop.version_name=6.2.4
desktop.version_code=87
kotlin.version=1.9.23
gradle.plugin.version=8.2.0