mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-06-07 08:52:40 +00:00
Merge branch 'master' into group-knocking
This commit is contained in:
+1
-1
@@ -967,7 +967,7 @@ object ChatController {
|
||||
|
||||
suspend fun apiReportMessage(rh: Long?, groupId: Long, chatItemId: Long, reportReason: ReportReason, reportText: String): List<AChatItem>? {
|
||||
val r = sendCmd(rh, CC.ApiReportMessage(groupId, chatItemId, reportReason, reportText))
|
||||
if (r is API.Result && r.res is CR.NewChatItems) r.res.chatItems
|
||||
if (r is API.Result && r.res is CR.NewChatItems) return r.res.chatItems
|
||||
apiErrorAlert("apiReportMessage", generalGetString(MR.strings.error_creating_report), r)
|
||||
return null
|
||||
}
|
||||
|
||||
@@ -25,10 +25,10 @@ kotlin.mpp.androidSourceSetLayoutVersion=2
|
||||
kotlin.jvm.target=11
|
||||
|
||||
android.version_name=6.3.4
|
||||
android.version_code=287
|
||||
android.version_code=288
|
||||
|
||||
desktop.version_name=6.3.4
|
||||
desktop.version_code=100
|
||||
desktop.version_code=101
|
||||
|
||||
kotlin.version=1.9.23
|
||||
gradle.plugin.version=8.2.0
|
||||
|
||||
Reference in New Issue
Block a user