Merge branch 'master' into master-android

2024-12-17 17:20:21 +01:00 · 2024-03-11 09:27:17 +00:00
parent 9cde37c6f5 6c78bbc178
commit de65d0e0a2
125 changed files with 5009 additions and 2888 deletions
@@ -73,7 +73,7 @@ class SimplexApp: Application(), LifecycleEventObserver {

  override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
    Log.d(TAG, "onStateChanged: $event")
-    withBGApi {
+    withLongRunningApi {
      when (event) {
        Lifecycle.Event.ON_START -> {
          isAppOnForeground = true
@@ -14,17 +14,27 @@ import chat.simplex.common.views.helpers.*
 import java.io.BufferedOutputStream
 import java.io.File
 import chat.simplex.res.MR
+import kotlin.math.min

 actual fun ClipboardManager.shareText(text: String) {
-  val sendIntent: Intent = Intent().apply {
-    action = Intent.ACTION_SEND
-    putExtra(Intent.EXTRA_TEXT, text)
-    type = "text/plain"
-    flags = FLAG_ACTIVITY_NEW_TASK
+  var text = text
+  for (i in 10 downTo 1) {
+    try {
+      val sendIntent: Intent = Intent().apply {
+        action = Intent.ACTION_SEND
+        putExtra(Intent.EXTRA_TEXT, text)
+        type = "text/plain"
+        flags = FLAG_ACTIVITY_NEW_TASK
+      }
+      val shareIntent = Intent.createChooser(sendIntent, null)
+      shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+      androidAppContext.startActivity(shareIntent)
+      break
+    } catch (e: Exception) {
+      Log.e(TAG, "Failed to share text: ${e.stackTraceToString()}")
+      text = text.substring(0, min(i * 1000, text.length))
+    }
  }
-  val shareIntent = Intent.createChooser(sendIntent, null)
-  shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
-  androidAppContext.startActivity(shareIntent)
 }

 actual fun shareFile(text: String, fileSource: CryptoFile) {
@@ -114,7 +114,8 @@ actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
    Handler(Looper.getMainLooper()).post {
      AlertManager.shared.showAlertMsg(
        title = generalGetString(MR.strings.app_was_crashed),
-        text = e.stackTraceToString()
+        text = e.stackTraceToString(),
+        shareText = true
      )
    }
  }
@@ -1123,11 +1123,19 @@ data class Connection(
  val viaGroupLink: Boolean,
  val customUserProfileId: Long? = null,
  val connectionCode: SecurityCode? = null,
+  val pqSupport: Boolean,
+  val pqEncryption: Boolean,
+  val pqSndEnabled: Boolean? = null,
+  val pqRcvEnabled: Boolean? = null,
  val connectionStats: ConnectionStats? = null
 ) {
  val id: ChatId get() = ":$connId"
+
+  val connPQEnabled: Boolean
+    get() = pqSndEnabled == true && pqRcvEnabled == true
+
  companion object {
-    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null)
+    val sampleData = Connection(connId = 1, agentConnId = "abc", connStatus = ConnStatus.Ready, connLevel = 0, viaGroupLink = false, peerChatVRange = VersionRange(1, 1), customUserProfileId = null, pqSupport = false, pqEncryption = false)
  }
 }

@@ -1822,7 +1830,7 @@ data class ChatItem (
      is CIContent.SndGroupInvitation -> false
      is CIContent.RcvDirectEventContent -> when (content.rcvDirectEvent) {
        is RcvDirectEvent.ContactDeleted -> false
-        is RcvDirectEvent.ProfileUpdated -> true
+        is RcvDirectEvent.ProfileUpdated -> false
      }
      is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
        is RcvGroupEvent.MemberAdded -> false
@@ -1853,6 +1861,10 @@ data class ChatItem (
      is CIContent.SndModerated -> false
      is CIContent.RcvModerated -> false
      is CIContent.RcvBlocked -> false
+      is CIContent.SndDirectE2EEInfo -> false
+      is CIContent.RcvDirectE2EEInfo -> false
+      is CIContent.SndGroupE2EEInfo -> false
+      is CIContent.RcvGroupE2EEInfo -> false
      is CIContent.InvalidJSON -> false
    }

@@ -2283,6 +2295,10 @@ sealed class CIContent: ItemContent {
  @Serializable @SerialName("sndModerated") object SndModerated: CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvModerated") object RcvModerated: CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvBlocked") object RcvBlocked: CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndDirectE2EEInfo") class SndDirectE2EEInfo(val e2eeInfo: E2EEInfo): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvDirectE2EEInfo") class RcvDirectE2EEInfo(val e2eeInfo: E2EEInfo): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndGroupE2EEInfo") class SndGroupE2EEInfo(val e2eeInfo: E2EEInfo): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvGroupE2EEInfo") class RcvGroupE2EEInfo(val e2eeInfo: E2EEInfo): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("invalidJSON") data class InvalidJSON(val json: String): CIContent() { override val msgContent: MsgContent? get() = null }

  override val text: String get() = when (this) {
@@ -2312,6 +2328,10 @@ sealed class CIContent: ItemContent {
      is SndModerated -> generalGetString(MR.strings.moderated_description)
      is RcvModerated -> generalGetString(MR.strings.moderated_description)
      is RcvBlocked -> generalGetString(MR.strings.blocked_by_admin_item_description)
+      is SndDirectE2EEInfo -> directE2EEInfoToText(e2eeInfo)
+      is RcvDirectE2EEInfo -> directE2EEInfoToText(e2eeInfo)
+      is SndGroupE2EEInfo -> e2eeInfoNoPQText
+      is RcvGroupE2EEInfo -> e2eeInfoNoPQText
      is InvalidJSON -> "invalid data"
    }

@@ -2330,6 +2350,15 @@ sealed class CIContent: ItemContent {
    }

  companion object {
+    fun directE2EEInfoToText(e2EEInfo: E2EEInfo): String =
+      if (e2EEInfo.pqEnabled) {
+        generalGetString(MR.strings.e2ee_info_pq)
+      } else {
+        e2eeInfoNoPQText
+      }
+
+    private val e2eeInfoNoPQText: String = generalGetString(MR.strings.e2ee_info_no_pq)
+
    fun featureText(feature: Feature, enabled: String, param: Int?): String =
      if (feature.hasParam) {
        "${feature.text}: ${timeText(param)}"
@@ -2744,6 +2773,9 @@ enum class CIGroupInvitationStatus {
  @SerialName("expired") Expired;
 }

+@Serializable
+class E2EEInfo (val pqEnabled: Boolean) {}
+
 object MsgContentSerializer : KSerializer<MsgContent> {
  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgContent", PolymorphicKind.SEALED) {
    element("MCText", buildClassSerialDescriptor("MCText") {
@@ -3097,6 +3129,7 @@ sealed class RcvConnEvent {
  @Serializable @SerialName("switchQueue") class SwitchQueue(val phase: SwitchPhase): RcvConnEvent()
  @Serializable @SerialName("ratchetSync") class RatchetSync(val syncStatus: RatchetSyncState): RcvConnEvent()
  @Serializable @SerialName("verificationCodeReset") object VerificationCodeReset: RcvConnEvent()
+  @Serializable @SerialName("pqEnabled") class PQEnabled(val enabled: Boolean): RcvConnEvent()

  val text: String get() = when (this) {
    is SwitchQueue -> when (phase) {
@@ -3105,6 +3138,11 @@ sealed class RcvConnEvent {
    }
    is RatchetSync -> ratchetSyncStatusToText(syncStatus)
    is VerificationCodeReset -> generalGetString(MR.strings.rcv_conn_event_verification_code_reset)
+    is PQEnabled -> if (enabled) {
+      generalGetString(MR.strings.conn_event_enabled_pq)
+    } else {
+      generalGetString(MR.strings.conn_event_disabled_pq)
+    }
  }
 }

@@ -3122,6 +3160,7 @@ fun ratchetSyncStatusToText(ratchetSyncStatus: RatchetSyncState): String {
 sealed class SndConnEvent {
  @Serializable @SerialName("switchQueue") class SwitchQueue(val phase: SwitchPhase, val member: GroupMemberRef? = null): SndConnEvent()
  @Serializable @SerialName("ratchetSync") class RatchetSync(val syncStatus: RatchetSyncState, val member: GroupMemberRef? = null): SndConnEvent()
+  @Serializable @SerialName("pqEnabled") class PQEnabled(val enabled: Boolean): SndConnEvent()

  val text: String
    get() = when (this) {
@@ -3150,6 +3189,12 @@ sealed class SndConnEvent {
        }
        ratchetSyncStatusToText(syncStatus)
      }
+
+      is PQEnabled -> if (enabled) {
+        generalGetString(MR.strings.conn_event_enabled_pq)
+      } else {
+        generalGetString(MR.strings.conn_event_disabled_pq)
+      }
    }
 }

@@ -156,6 +156,7 @@ class AppPreferences {
  val confirmDBUpgrades = mkBoolPreference(SHARED_PREFS_CONFIRM_DB_UPGRADES, false)
  val selfDestruct = mkBoolPreference(SHARED_PREFS_SELF_DESTRUCT, false)
  val selfDestructDisplayName = mkStrPreference(SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME, null)
+  val pqExperimentalEnabled = mkBoolPreference(SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED, false)

  val currentTheme = mkStrPreference(SHARED_PREFS_CURRENT_THEME, DefaultTheme.SYSTEM.name)
  val systemDarkTheme = mkStrPreference(SHARED_PREFS_SYSTEM_DARK_THEME, DefaultTheme.SIMPLEX.name)
@@ -312,6 +313,7 @@ class AppPreferences {
    private const val SHARED_PREFS_CONFIRM_DB_UPGRADES = "ConfirmDBUpgrades"
    private const val SHARED_PREFS_SELF_DESTRUCT = "LocalAuthenticationSelfDestruct"
    private const val SHARED_PREFS_SELF_DESTRUCT_DISPLAY_NAME = "LocalAuthenticationSelfDestructDisplayName"
+    private const val SHARED_PREFS_PQ_EXPERIMENTAL_ENABLED = "PQExperimentalEnabled"
    private const val SHARED_PREFS_CURRENT_THEME = "CurrentTheme"
    private const val SHARED_PREFS_SYSTEM_DARK_THEME = "SystemDarkTheme"
    private const val SHARED_PREFS_THEMES = "Themes"
@@ -451,7 +453,21 @@ object ChatController {
        }
        try {
          val msg = recvMsg(ctrl)
-          if (msg != null) processReceivedMsg(msg)
+          if (msg != null) {
+            val finishedWithoutTimeout = withTimeoutOrNull(60_000L) {
+              processReceivedMsg(msg)
+            }
+            if (finishedWithoutTimeout == null) {
+              Log.e(TAG, "Timeout reached while processing received message: " + msg.resp.responseType)
+              if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
+                AlertManager.shared.showAlertMsg(
+                  title = generalGetString(MR.strings.possible_slow_function_title),
+                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.resp.responseType + "\n" + Exception().stackTraceToString()),
+                  shareText = true
+                )
+              }
+            }
+          }
        } catch (e: Exception) {
          Log.e(TAG, "ChatController recvMsg/processReceivedMsg exception: " + e.stackTraceToString());
        } catch (e: Throwable) {
@@ -617,14 +633,17 @@ object ChatController {
    throw Error("failed to set remote hosts folder: ${r.responseType} ${r.details}")
  }

-  suspend fun apiSetXFTPConfig(cfg: XFTPFileConfig?) {
-    val r = sendCmd(null, CC.ApiSetXFTPConfig(cfg))
-    if (r is CR.CmdOk) return
-    throw Error("apiSetXFTPConfig bad response: ${r.responseType} ${r.details}")
-  }
-
  suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetEncryptLocalFiles(enable))

+  suspend fun apiSetPQEncryption(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetPQEncryption(enable))
+
+  suspend fun apiSetContactPQ(rh: Long?, contactId: Long, enable: Boolean): Contact? {
+    val r = sendCmd(rh, CC.ApiSetContactPQ(contactId, enable))
+    if (r is CR.ContactPQAllowed) return r.contact
+    apiErrorAlert("apiSetContactPQ", "Error allowing contact PQ", r)
+    return null
+  }
+
  suspend fun apiExportArchive(config: ArchiveConfig) {
    val r = sendCmd(null, CC.ApiExportArchive(config))
    if (r is CR.CmdOk) return
@@ -1685,7 +1704,7 @@ object ChatController {
          chatModel.networkStatuses[s.agentConnId] = s.networkStatus
        }
      }
-      is CR.NewChatItem -> {
+      is CR.NewChatItem -> withBGApi {
        val cInfo = r.chatItem.chatInfo
        val cItem = r.chatItem.chatItem
        if (active(r.user)) {
@@ -1700,7 +1719,7 @@ object ChatController {
            ((mc is MsgContent.MCImage && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV)
                || (mc is MsgContent.MCVideo && file.fileSize <= MAX_VIDEO_SIZE_AUTO_RCV)
                || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))) {
-          withBGApi { receiveFile(rhId, r.user, file.fileId, auto = true) }
+          receiveFile(rhId, r.user, file.fileId, auto = true)
        }
        if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
          ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
@@ -2008,6 +2027,10 @@ object ChatController {
          }
        }
      }
+      is CR.ContactPQEnabled ->
+        if (active(r.user)) {
+          chatModel.updateContact(rhId, r.contact)
+        }
      is CR.ChatCmdError -> when {
        r.chatError is ChatError.ChatErrorAgent && r.chatError.agentError is AgentErrorType.CRITICAL -> {
          chatModel.processedCriticalError.newError(r.chatError.agentError, r.chatError.agentError.offerRestart)
@@ -2157,10 +2180,6 @@ object ChatController {
    }
  }

-  fun getXFTPCfg(): XFTPFileConfig {
-    return XFTPFileConfig(minFileSize = 0)
-  }
-
  fun getNetCfg(): NetCfg {
    val useSocksProxy = appPrefs.networkUseSocksProxy.get()
    val proxyHostPort  = appPrefs.networkProxyHostPort.get()
@@ -2269,8 +2288,9 @@ sealed class CC {
  class SetTempFolder(val tempFolder: String): CC()
  class SetFilesFolder(val filesFolder: String): CC()
  class SetRemoteHostsFolder(val remoteHostsFolder: String): CC()
-  class ApiSetXFTPConfig(val config: XFTPFileConfig?): CC()
  class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
+  class ApiSetPQEncryption(val enable: Boolean): CC()
+  class ApiSetContactPQ(val contactId: Long, val enable: Boolean): CC()
  class ApiExportArchive(val config: ArchiveConfig): CC()
  class ApiImportArchive(val config: ArchiveConfig): CC()
  class ApiDeleteStorage: CC()
@@ -2399,8 +2419,9 @@ sealed class CC {
    is SetTempFolder -> "/_temp_folder $tempFolder"
    is SetFilesFolder -> "/_files_folder $filesFolder"
    is SetRemoteHostsFolder -> "/remote_hosts_folder $remoteHostsFolder"
-    is ApiSetXFTPConfig -> if (config != null) "/_xftp on ${json.encodeToString(config)}" else "/_xftp off"
    is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
+    is ApiSetPQEncryption -> "/pq ${onOff(enable)}"
+    is ApiSetContactPQ -> "/_pq @$contactId ${onOff(enable)}"
    is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
    is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
    is ApiDeleteStorage -> "/_db delete"
@@ -2534,8 +2555,9 @@ sealed class CC {
    is SetTempFolder -> "setTempFolder"
    is SetFilesFolder -> "setFilesFolder"
    is SetRemoteHostsFolder -> "setRemoteHostsFolder"
-    is ApiSetXFTPConfig -> "apiSetXFTPConfig"
    is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
+    is ApiSetPQEncryption -> "apiSetPQEncryption"
+    is ApiSetContactPQ -> "apiSetContactPQ"
    is ApiExportArchive -> "apiExportArchive"
    is ApiImportArchive -> "apiImportArchive"
    is ApiDeleteStorage -> "apiDeleteStorage"
@@ -2700,9 +2722,6 @@ sealed class ChatPagination {
@Serializable
 class ComposedMessage(val fileSource: CryptoFile?, val quotedItemId: Long?, val msgContent: MsgContent)

-@Serializable
-class XFTPFileConfig(val minFileSize: Long)
-
@Serializable
 class ArchiveConfig(val archivePath: String, val disableCompression: Boolean? = null, val parentTempDirectory: String? = null)

@@ -4004,6 +4023,10 @@ sealed class CR {
  @Serializable @SerialName("remoteCtrlSessionCode") class RemoteCtrlSessionCode(val remoteCtrl_: RemoteCtrlInfo?, val sessionCode: String): CR()
  @Serializable @SerialName("remoteCtrlConnected") class RemoteCtrlConnected(val remoteCtrl: RemoteCtrlInfo): CR()
  @Serializable @SerialName("remoteCtrlStopped") class RemoteCtrlStopped(val rcsState: RemoteCtrlSessionState, val rcStopReason: RemoteCtrlStopReason): CR()
+  // pq
+  @Serializable @SerialName("contactPQAllowed") class ContactPQAllowed(val user: UserRef, val contact: Contact, val pqEncryption: Boolean): CR()
+  @Serializable @SerialName("contactPQEnabled") class ContactPQEnabled(val user: UserRef, val contact: Contact, val pqEnabled: Boolean): CR()
+  // misc
  @Serializable @SerialName("versionInfo") class VersionInfo(val versionInfo: CoreVersionInfo, val chatMigrations: List<UpMigration>, val agentMigrations: List<UpMigration>): CR()
  @Serializable @SerialName("cmdOk") class CmdOk(val user: UserRef?): CR()
  @Serializable @SerialName("chatCmdError") class ChatCmdError(val user_: UserRef?, val chatError: ChatError): CR()
@@ -4153,6 +4176,8 @@ sealed class CR {
    is RemoteCtrlSessionCode -> "remoteCtrlSessionCode"
    is RemoteCtrlConnected -> "remoteCtrlConnected"
    is RemoteCtrlStopped -> "remoteCtrlStopped"
+    is ContactPQAllowed -> "contactPQAllowed"
+    is ContactPQEnabled -> "contactPQEnabled"
    is VersionInfo -> "versionInfo"
    is CmdOk -> "cmdOk"
    is ChatCmdError -> "chatCmdError"
@@ -4317,6 +4342,8 @@ sealed class CR {
          "\nsessionCode: $sessionCode"
    is RemoteCtrlConnected -> json.encodeToString(remoteCtrl)
    is RemoteCtrlStopped -> noDetails()
+    is ContactPQAllowed -> withUser(user, "contact: ${contact.id}\npqEncryption: $pqEncryption")
+    is ContactPQEnabled -> withUser(user, "contact: ${contact.id}\npqEnabled: $pqEnabled")
    is VersionInfo -> "version ${json.encodeToString(versionInfo)}\n\n" +
        "chat migrations: ${json.encodeToString(chatMigrations.map { it.upName })}\n\n" +
        "agent migrations: ${json.encodeToString(agentMigrations.map { it.upName })}"
@@ -91,8 +91,8 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
    if (appPlatform.isDesktop) {
      controller.apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
    }
-    controller.apiSetXFTPConfig(controller.getXFTPCfg())
    controller.apiSetEncryptLocalFiles(controller.appPrefs.privacyEncryptLocalFiles.get())
+    controller.apiSetPQEncryption(controller.appPrefs.pqExperimentalEnabled.get())
    // If we migrated successfully means previous re-encryption process on database level finished successfully too
    if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)
    val user = chatController.apiGetActiveUser(null)
@@ -58,6 +58,7 @@ fun ChatInfoView(
  val currentUser = remember { chatModel.currentUser }.value
  val connStats = remember(contact.id, connectionStats) { mutableStateOf(connectionStats) }
  val developerTools = chatModel.controller.appPrefs.developerTools.get()
+  val pqExperimentalEnabled = chatModel.controller.appPrefs.pqExperimentalEnabled.get()
  if (chat != null && currentUser != null) {
    val contactNetworkStatus = remember(chatModel.networkStatuses.toMap(), contact) {
      mutableStateOf(chatModel.contactNetworkStatus(contact))
@@ -80,6 +81,7 @@ fun ChatInfoView(
      localAlias,
      connectionCode,
      developerTools,
+      pqExperimentalEnabled,
      onLocalAliasChanged = {
        setContactAlias(chat, it, chatModel)
      },
@@ -138,6 +140,17 @@ fun ChatInfoView(
          }
        })
      },
+      allowContactPQ = {
+         showAllowContactPQAlert(allowContactPQ = {
+           withBGApi {
+             val ct = chatModel.controller.apiSetContactPQ(chatRh, contact.contactId, true)
+             if (ct != null) {
+               chatModel.updateContact(chatRh, contact)
+             }
+             close.invoke()
+           }
+         })
+      },
      verifyClicked = {
        ModalManager.end.showModalCloseable { close ->
          remember { derivedStateOf { (chatModel.getContactChat(contact.contactId)?.chatInfo as? ChatInfo.Direct)?.contact } }.value?.let { ct ->
@@ -288,6 +301,7 @@ fun ChatInfoLayout(
  localAlias: String,
  connectionCode: String?,
  developerTools: Boolean,
+  pqExperimentalEnabled: Boolean,
  onLocalAliasChanged: (String) -> Unit,
  openPreferences: () -> Unit,
  deleteContact: () -> Unit,
@@ -296,6 +310,7 @@ fun ChatInfoLayout(
  abortSwitchContactAddress: () -> Unit,
  syncContactConnection: () -> Unit,
  syncContactConnectionForce: () -> Unit,
+  allowContactPQ: () -> Unit,
  verifyClicked: () -> Unit,
 ) {
  val cStats = connStats.value
@@ -345,6 +360,18 @@ fun ChatInfoLayout(
      SectionDividerSpaced()
    }

+    val conn = contact.activeConn
+    if (pqExperimentalEnabled && conn != null) {
+      SectionView("Quantum resistant E2E encryption") {
+        InfoRow("E2E encryption", if (conn.connPQEnabled) "Quantum resistant" else "Standard")
+        if (!conn.pqEncryption) {
+          AllowContactPQButton(allowContactPQ)
+          SectionTextFooter("After allowing quantum resistant e2e encryption, it will be enabled after several messages if your contact also allows it.")
+        }
+        SectionDividerSpaced()
+      }
+    }
+
    if (contact.contactLink != null) {
      SectionView(stringResource(MR.strings.address_section_title).uppercase()) {
        SimpleXLinkQRCode(contact.contactLink)
@@ -601,6 +628,17 @@ fun SynchronizeConnectionButtonForce(syncConnectionForce: () -> Unit) {
  )
 }

+@Composable
+fun AllowContactPQButton(allowContactPQ: () -> Unit) {
+  SettingsActionItem(
+    painterResource(MR.images.ic_warning),
+    "Allow PQ encryption",
+    click = allowContactPQ,
+    textColor = WarningOrange,
+    iconColor = WarningOrange
+  )
+}
+
@Composable
 fun VerifyCodeButton(contactVerified: Boolean, onClick: () -> Unit) {
  SettingsActionItem(
@@ -704,6 +742,16 @@ fun showSyncConnectionForceAlert(syncConnectionForce: () -> Unit) {
  )
 }

+fun showAllowContactPQAlert(allowContactPQ: () -> Unit) {
+  AlertManager.shared.showAlertDialog(
+    title = "Allow quantum resistant encryption?",
+    text = "This is an experimental feature, it is not recommended to enable it for important chats.",
+    confirmText = "Allow",
+    onConfirm = allowContactPQ,
+    destructive = true,
+  )
+}
+
@Preview
@Composable
 fun PreviewChatInfoLayout() {
@@ -721,6 +769,7 @@ fun PreviewChatInfoLayout() {
      localAlias = "",
      connectionCode = "123",
      developerTools = false,
+      pqExperimentalEnabled = false,
      connStats = remember { mutableStateOf(null) },
      contactNetworkStatus = NetworkStatus.Connected(),
      onLocalAliasChanged = {},
@@ -732,6 +781,7 @@ fun PreviewChatInfoLayout() {
      abortSwitchContactAddress = {},
      syncContactConnection = {},
      syncContactConnectionForce = {},
+      allowContactPQ = {},
      verifyClicked = {},
    )
  }
@@ -267,7 +267,7 @@ fun ComposeView(
  fun loadLinkPreview(url: String, wait: Long? = null) {
    if (pendingLinkUrl.value == url) {
      composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(null))
-      withLongRunningApi(slow = 30_000, deadlock = 60_000) {
+      withLongRunningApi(slow = 60_000) {
        if (wait != null) delay(wait)
        val lp = getLinkPreview(url)
        if (lp != null && pendingLinkUrl.value == url) {
@@ -551,7 +551,7 @@ fun ComposeView(
  }

  fun sendMessage(ttl: Int?) {
-    withLongRunningApi(slow = 30_000, deadlock = 60_000) {
+    withLongRunningApi(slow = 120_000) {
      sendMessageAsync(null, false, ttl)
    }
  }
@@ -54,7 +54,7 @@ fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolea
    },
    inviteMembers = {
      allowModifyMembers = false
-      withLongRunningApi(slow = 30_000, deadlock = 120_000) {
+      withLongRunningApi(slow = 120_000) {
        for (contactId in selectedContacts) {
          val member = chatModel.controller.apiAddMember(rhId, groupInfo.groupId, contactId, selectedRole.value)
          if (member != null) {
@@ -152,7 +152,7 @@ fun leaveGroupDialog(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, cl
    text = generalGetString(MR.strings.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
    confirmText = generalGetString(MR.strings.leave_group_button),
    onConfirm = {
-      withBGApi {
+      withLongRunningApi(60_000) {
        chatModel.controller.leaveGroup(rhId, groupInfo.groupId)
        close?.invoke()
      }
@@ -424,69 +424,47 @@ private fun MemberVerifiedShield() {

@Composable
 private fun DropDownMenuForMember(rhId: Long?, member: GroupMember, groupInfo: GroupInfo, showMenu: MutableState<Boolean>) {
-  // revert from this:
-  DefaultDropdownMenu(showMenu) {
-    if (member.canBeRemoved(groupInfo)) {
-      ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
-        removeMemberAlert(rhId, groupInfo, member)
-        showMenu.value = false
-      })
+  if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
+    val canBlockForAll = member.canBlockForAll(groupInfo)
+    val canRemove = member.canBeRemoved(groupInfo)
+    if (canBlockForAll || canRemove) {
+      DefaultDropdownMenu(showMenu) {
+        if (canBlockForAll) {
+          if (member.blockedByAdmin) {
+            ItemAction(stringResource(MR.strings.unblock_for_all), painterResource(MR.images.ic_do_not_touch), onClick = {
+              unblockForAllAlert(rhId, groupInfo, member)
+              showMenu.value = false
+            })
+          } else {
+            ItemAction(stringResource(MR.strings.block_for_all), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
+              blockForAllAlert(rhId, groupInfo, member)
+              showMenu.value = false
+            })
+          }
+        }
+        if (canRemove) {
+          ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
+            removeMemberAlert(rhId, groupInfo, member)
+            showMenu.value = false
+          })
+        }
+      }
    }
-    if (member.memberSettings.showMessages) {
-      ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
-        blockMemberAlert(rhId, groupInfo, member)
-        showMenu.value = false
-      })
-    } else {
-      ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
-        unblockMemberAlert(rhId, groupInfo, member)
-        showMenu.value = false
-      })
+  } else if (!member.blockedByAdmin) {
+    DefaultDropdownMenu(showMenu) {
+      if (member.memberSettings.showMessages) {
+        ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
+          blockMemberAlert(rhId, groupInfo, member)
+          showMenu.value = false
+        })
+      } else {
+        ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
+          unblockMemberAlert(rhId, groupInfo, member)
+          showMenu.value = false
+        })
+      }
    }
  }
-  // revert to this: vvv
-//    if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
-//      val canBlockForAll = member.canBlockForAll(groupInfo)
-//      val canRemove = member.canBeRemoved(groupInfo)
-//      if (canBlockForAll || canRemove) {
-//        DefaultDropdownMenu(showMenu) {
-//          if (canBlockForAll) {
-//            if (member.blockedByAdmin) {
-//              ItemAction(stringResource(MR.strings.unblock_for_all), painterResource(MR.images.ic_do_not_touch), onClick = {
-//                unblockForAllAlert(rhId, groupInfo, member)
-//                showMenu.value = false
-//              })
-//            } else {
-//              ItemAction(stringResource(MR.strings.block_for_all), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
-//                blockForAllAlert(rhId, groupInfo, member)
-//                showMenu.value = false
-//              })
-//            }
-//          }
-//          if (canRemove) {
-//            ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
-//              removeMemberAlert(rhId, groupInfo, member)
-//              showMenu.value = false
-//            })
-//          }
-//        }
-//      }
-//    } else if (!member.blockedByAdmin) {
-//      DefaultDropdownMenu(showMenu) {
-//        if (member.memberSettings.showMessages) {
-//          ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
-//            blockMemberAlert(rhId, groupInfo, member)
-//            showMenu.value = false
-//          })
-//        } else {
-//          ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
-//            unblockMemberAlert(rhId, groupInfo, member)
-//            showMenu.value = false
-//          })
-//        }
-//      }
-//    }
-  // ^^^
 }

@Composable
@@ -387,25 +387,11 @@ fun GroupMemberInfoLayout(
      }
    }

-    // revert from this:
-    SectionDividerSpaced(maxBottomPadding = false)
-    SectionView {
-      if (member.memberSettings.showMessages) {
-        BlockMemberButton(blockMember)
-      } else {
-        UnblockMemberButton(unblockMember)
-      }
-      if (member.canBeRemoved(groupInfo)) {
-        RemoveMemberButton(removeMember)
-      }
+    if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
+      AdminDestructiveSection()
+    } else {
+      NonAdminBlockSection()
    }
-    // revert to this: vvv
-//    if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
-//      AdminDestructiveSection()
-//    } else {
-//      NonAdminBlockSection()
-//    }
-    // ^^^

    if (developerTools) {
      SectionDividerSpaced()
@@ -94,7 +94,7 @@ fun CIFileView(
            FileProtocol.LOCAL -> {}
          }
        file.fileStatus is CIFileStatus.RcvComplete || (file.fileStatus is CIFileStatus.SndStored && file.fileProtocol == FileProtocol.LOCAL) -> {
-          withLongRunningApi(slow = 60_000, deadlock = 600_000) {
+          withLongRunningApi(slow = 600_000) {
            var filePath = getLoadedFilePath(file)
            if (chatModel.connectedToRemote() && filePath == null) {
              file.loadRemoteFile(true)
@@ -41,7 +41,7 @@ fun CIVideoView(
    val filePath = remember(file, CIFile.cachedRemoteFileRequests.toList()) { mutableStateOf(getLoadedFilePath(file)) }
    if (chatModel.connectedToRemote()) {
      LaunchedEffect(file) {
-        withLongRunningApi(slow = 60_000, deadlock = 600_000) {
+        withLongRunningApi(slow = 600_000) {
          if (file != null && file.loaded && getLoadedFilePath(file) == null) {
            file.loadRemoteFile(false)
            filePath.value = getLoadedFilePath(file)
@@ -213,7 +213,7 @@ fun ChatItemView(
                      showMenu.value = false
                    }
                    if (chatModel.connectedToRemote() && fileSource == null) {
-                      withLongRunningApi(slow = 60_000, deadlock = 600_000) {
+                      withLongRunningApi(slow = 600_000) {
                        cItem.file?.loadRemoteFile(true)
                        fileSource = getLoadedFileSource(cItem.file)
                        shareIfExists()
@@ -452,6 +452,11 @@ fun ChatItemView(
          is CIContent.SndModerated -> DeletedItem()
          is CIContent.RcvModerated -> DeletedItem()
          is CIContent.RcvBlocked -> DeletedItem()
+          // TODO proper items
+          is CIContent.SndDirectE2EEInfo -> CIEventView(buildAnnotatedString { append(cItem.content.text) })
+          is CIContent.RcvDirectE2EEInfo -> CIEventView(buildAnnotatedString { append(cItem.content.text) })
+          is CIContent.SndGroupE2EEInfo -> CIEventView(buildAnnotatedString { append(cItem.content.text) })
+          is CIContent.RcvGroupE2EEInfo -> CIEventView(buildAnnotatedString { append(cItem.content.text) })
          is CIContent.InvalidJSON -> CIInvalidJSONView(c.json)
        }
      }
@@ -12,6 +12,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
@@ -22,6 +23,7 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.painterResource
+import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow

@@ -189,6 +191,7 @@ class AlertManager {
    title: String, text: String? = null,
    confirmText: String = generalGetString(MR.strings.ok),
    hostDevice: Pair<Long?, String>? = null,
+    shareText: Boolean? = null
  ) {
    showAlert {
      AlertDialog(
@@ -202,10 +205,19 @@ class AlertManager {
              delay(200)
              focusRequester.requestFocus()
            }
+            // Can pass shareText = false to prevent showing Share button if it's needed in a specific case
+            val showShareButton = text != null && (shareText == true || (shareText == null && text.length > 500))
            Row(
              Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING),
-              horizontalArrangement = Arrangement.Center
+              horizontalArrangement = if (showShareButton) Arrangement.SpaceBetween else Arrangement.Center
            ) {
+              val clipboard = LocalClipboardManager.current
+              if (showShareButton && text != null) {
+                TextButton(onClick = {
+                  clipboard.shareText(text)
+                  hideAlert()
+                }) { Text(stringResource(MR.strings.share_verb)) }
+              }
              TextButton(
                onClick = {
                  hideAlert()
@@ -16,7 +16,7 @@ class ProcessedErrors <T: AgentErrorType>(val interval: Long) {

  fun newError(error: T, offerRestart: Boolean) {
    timer.cancel()
-    timer = withLongRunningApi(slow = 70_000, deadlock = 130_000) {
+    timer = withLongRunningApi(slow = 130_000) {
      val delayBeforeNext = (lastShownTimestamp + interval) - System.currentTimeMillis()
      if ((lastShownOfferRestart || !offerRestart) && delayBeforeNext >= 0) {
        delay(delayBeforeNext)
@@ -37,30 +37,22 @@ fun withBGApi(action: suspend CoroutineScope.() -> Unit): Job =
    CoroutineScope(singleThreadDispatcher).launch(block = { wrapWithLogging(action, it) })
  }

-fun withLongRunningApi(slow: Long = Long.MAX_VALUE, deadlock: Long = Long.MAX_VALUE, action: suspend CoroutineScope.() -> Unit): Job =
+fun withLongRunningApi(slow: Long = Long.MAX_VALUE, action: suspend CoroutineScope.() -> Unit): Job =
  Exception().let {
-    CoroutineScope(Dispatchers.Default).launch(block = { wrapWithLogging(action, it, slow = slow, deadlock = deadlock) })
+    CoroutineScope(Dispatchers.Default).launch(block = { wrapWithLogging(action, it, slow = slow) })
  }

-private suspend fun wrapWithLogging(action: suspend CoroutineScope.() -> Unit, exception: java.lang.Exception, slow: Long = 10_000, deadlock: Long = 60_000) = coroutineScope {
+private suspend fun wrapWithLogging(action: suspend CoroutineScope.() -> Unit, exception: java.lang.Exception, slow: Long = 20_000) = coroutineScope {
  val start = System.currentTimeMillis()
-  val job = launch {
-    delay(deadlock)
-    Log.e(TAG, "Possible deadlock of the thread, not finished after ${deadlock / 1000}s:\n${exception.stackTraceToString()}")
-    AlertManager.shared.showAlertMsg(
-      title = generalGetString(MR.strings.possible_deadlock_title),
-      text = generalGetString(MR.strings.possible_deadlock_desc).format(deadlock / 1000, exception.stackTraceToString()),
-    )
-  }
  action()
-  job.cancel()
-  if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
-    val end = System.currentTimeMillis()
-    if (end - start > slow) {
-      Log.e(TAG, "Possible problem with execution of the thread, took ${(end - start) / 1000}s:\n${exception.stackTraceToString()}")
+  val end = System.currentTimeMillis()
+  if (end - start > slow) {
+    Log.e(TAG, "Possible problem with execution of the thread, took ${(end - start) / 1000}s:\n${exception.stackTraceToString()}")
+    if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
      AlertManager.shared.showAlertMsg(
        title = generalGetString(MR.strings.possible_slow_function_title),
        text = generalGetString(MR.strings.possible_slow_function_desc).format((end - start) / 1000, exception.stackTraceToString()),
+        shareText = true
      )
    }
  }
@@ -58,6 +58,14 @@ fun DeveloperView(
        SettingsPreferenceItem(painterResource(MR.images.ic_report), stringResource(MR.strings.show_internal_errors), appPreferences.showInternalErrors)
        SettingsPreferenceItem(painterResource(MR.images.ic_avg_pace), stringResource(MR.strings.show_slow_api_calls), appPreferences.showSlowApiCalls)
      }
+
+      SectionSpacer()
+      SectionView("Experimental".uppercase()) {
+        SettingsPreferenceItem(painterResource(MR.images.ic_vpn_key_filled), "Post-quantum E2EE", m.controller.appPrefs.pqExperimentalEnabled, onChange = { enable ->
+          withBGApi { m.controller.apiSetPQEncryption(enable) }
+        })
+        SectionTextFooter("In this version applies only to new contacts.")
+      }
    }
    SectionBottomSpacer()
  }
@@ -96,7 +96,7 @@ fun PrivacySettingsView(
    val currentUser = chatModel.currentUser.value
    if (currentUser != null) {
      fun setSendReceiptsContacts(enable: Boolean, clearOverrides: Boolean) {
-        withLongRunningApi(slow = 30_000, deadlock = 60_000) {
+        withLongRunningApi(slow = 60_000) {
          val mrs = UserMsgReceiptSettings(enable, clearOverrides)
          chatModel.controller.apiSetUserContactReceipts(currentUser, mrs)
          chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
@@ -119,7 +119,7 @@ fun PrivacySettingsView(
      }

      fun setSendReceiptsGroups(enable: Boolean, clearOverrides: Boolean) {
-        withLongRunningApi(slow = 30_000, deadlock = 60_000) {
+        withLongRunningApi(slow = 60_000) {
          val mrs = UserMsgReceiptSettings(enable, clearOverrides)
          chatModel.controller.apiSetUserGroupReceipts(currentUser, mrs)
          chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
@@ -1588,8 +1588,6 @@
    <string name="remote_ctrl_error_busy">سطح المكتب مشغول</string>
    <string name="remote_ctrl_error_bad_version">يحتوي سطح المكتب على إصدار غير مدعوم. يُرجى التأكد من استخدام نفس الإصدار على كلا الجهازين</string>
    <string name="past_member_vName">العضو السابق %1$s</string>
-    <string name="possible_deadlock_title">مأزق</string>
-    <string name="possible_deadlock_desc">يستغرق تنفيذ التعليمات البرمجية وقتًا طويلاً جدًا: %1$d ثانية. من المحتمل أن التطبيق مجمّد: %2$s</string>
    <string name="possible_slow_function_title">وظيفة بطيئة</string>
    <string name="developer_options_section">خيارات المطور</string>
    <string name="profile_update_event_member_name_changed">تغيّر العضو %1$s إلى %2$s</string>
@@ -54,6 +54,9 @@
  <string name="decryption_error">Decryption error</string>
  <string name="encryption_renegotiation_error">Encryption re-negotiation error</string>

+  <string name="e2ee_info_no_pq">This conversation is protected by end-to-end encryption with perfect forward secrecy, repudiation and break-in recovery.</string>
+  <string name="e2ee_info_pq">This conversation is protected by quantum resistant end-to-end encryption. It has perfect forward secrecy, repudiation and quantum resistant break-in recovery.</string>
+
  <!-- NoteFolder - ChatModel.kt -->
  <string name="note_folder_local_display_name">Private notes</string>

@@ -147,8 +150,6 @@
  <string name="smp_server_test_delete_file">Delete file</string>
  <string name="error_deleting_user">Error deleting user profile</string>
  <string name="error_updating_user_privacy">Error updating user privacy</string>
-  <string name="possible_deadlock_title">Deadlock</string>
-  <string name="possible_deadlock_desc">Execution of code takes too long time: %1$d seconds. Probably, the app is frozen: %2$s</string>
  <string name="possible_slow_function_title">Slow function</string>
  <string name="possible_slow_function_desc">Execution of function takes too long time: %1$d seconds: %2$s</string>

@@ -1241,6 +1242,8 @@
  <string name="snd_conn_event_ratchet_sync_started">agreeing encryption for %s…</string>
  <string name="snd_conn_event_ratchet_sync_agreed">encryption agreed for %s</string>
  <string name="rcv_conn_event_verification_code_reset">security code changed</string>
+  <string name="conn_event_enabled_pq">quantum resistant e2e encryption</string>
+  <string name="conn_event_disabled_pq">standard end-to-end encryption</string>

  <!-- GroupMemberRole -->
  <string name="group_member_role_observer">observer</string>
@@ -1555,7 +1555,6 @@
    <string name="chat_is_stopped_you_should_transfer_database">Чатът е спрян. Ако вече сте използвали тази база данни на друго устройство, трябва да я прехвърлите обратно, преди да стартирате чата отново.</string>
    <string name="remote_ctrl_error_bad_invitation">Настолното устройство има грешен код за връзка</string>
    <string name="remote_ctrl_error_bad_version">Настолното устройство е с неподдържана версия. Моля, уверете се, че използвате една и съща версия и на двете устройства</string>
-    <string name="possible_deadlock_desc">Изпълнението на кода отнема твърде много време: %1$d секунди. Вероятно приложението е замразено: %2$s</string>
    <string name="possible_slow_function_title">Бавна функция</string>
    <string name="possible_slow_function_desc">Изпълнението на функцията отнема твърде много време: %1$d секунди: %2$s</string>
    <string name="show_internal_errors">Покажи вътрешните грешки</string>
@@ -1591,5 +1590,4 @@
 \nПрепоръчително е да рестартирате приложението.</string>
    <string name="developer_options_section">Опции за разработчици</string>
    <string name="show_slow_api_calls">Показване на бавни API заявки</string>
-    <string name="possible_deadlock_title">Грешка в заключено положение</string>
 </resources>
@@ -1672,9 +1672,7 @@
    <string name="possible_slow_function_title">Langsame Funktion</string>
    <string name="show_slow_api_calls">Zeige langsame API-Aufrufe an</string>
    <string name="group_member_status_unknown_short">unbekannt</string>
-    <string name="possible_deadlock_title">Blockade</string>
    <string name="developer_options_section">Optionen für Entwickler</string>
-    <string name="possible_deadlock_desc">Die Code-Ausführung dauert zu lange: %1$d Sekunden. Wahrscheinlich ist die App eingefroren: %2$s</string>
    <string name="group_member_status_unknown">unbekannter Gruppenmitglieds-Status</string>
    <string name="v5_5_private_notes_descr">Mit verschlüsselten Dateien und Medien.</string>
    <string name="v5_5_private_notes">Private Notizen</string>
@@ -1559,11 +1559,9 @@
    <string name="remote_host_error_bad_state"><![CDATA[État médiocre de la connexion au mobile <b>%s</b>.]]></string>
    <string name="remote_ctrl_was_disconnected_title">Connexion interrompue</string>
    <string name="remote_ctrl_error_bad_state">État médiocre de la connexion avec le bureau</string>
-    <string name="possible_deadlock_title">Impasse</string>
    <string name="remote_ctrl_error_bad_version">La version de l\'ordinateur de bureau n\'est pas prise en charge. Veillez à utiliser la même version sur les deux appareils.</string>
    <string name="remote_ctrl_error_disconnected">Le bureau a été déconnecté</string>
    <string name="developer_options_section">Options pour les développeurs</string>
-    <string name="possible_deadlock_desc">Le code prend trop de temps à s\'exécuter : %1$d secondes. Il est probable que l\'application soit figée : %2$s</string>
    <string name="agent_internal_error_title">Erreur interne</string>
    <string name="remote_host_error_bad_version"><![CDATA[La version du mobile <b>%s</b> n\'est pas prise en charge. Veillez à utiliser la même version sur les deux appareils.]]></string>
    <string name="show_internal_errors">Afficher les erreurs internes</string>
@@ -1583,9 +1583,7 @@
    <string name="possible_slow_function_title">Lassú funkció</string>
    <string name="show_slow_api_calls">Lassú API-hívások megjelenítése</string>
    <string name="remote_host_error_inactive"><![CDATA[A(z) <b>%s</b> mobil eszköz inaktív]]></string>
-    <string name="possible_deadlock_title">Elakadt</string>
    <string name="developer_options_section">Fejlesztői beállítások</string>
-    <string name="possible_deadlock_desc">A kód végrehajtása túl sokáig tart: %1$d másodperc. Valószínűleg az alkalmazás lefagyott: %2$s</string>
    <string name="possible_slow_function_desc">A funkció végrehajtása túl sokáig tart: %1$d másodperc: %2$s</string>
    <string name="remote_host_error_busy"><![CDATA[A(z) <b>%s</b> mobil eszköz elfoglalt]]></string>
    <string name="past_member_vName">Legutóbbi tag %1$s</string>
@@ -1591,9 +1591,7 @@
    <string name="possible_slow_function_title">Funzione lenta</string>
    <string name="show_slow_api_calls">Mostra chiamate API lente</string>
    <string name="group_member_status_unknown_short">sconosciuto</string>
-    <string name="possible_deadlock_desc">L\'esecuzione del codice impiega troppo tempo: %1$d secondi. Probabilmente l\'app è congelata: %2$s</string>
    <string name="group_member_status_unknown">stato sconosciuto</string>
-    <string name="possible_deadlock_title">Stallo</string>
    <string name="developer_options_section">Opzioni sviluppatore</string>
    <string name="v5_5_private_notes">Note private</string>
    <string name="v5_5_new_interface_languages">Interfaccia in ungherese e turco</string>
@@ -1571,9 +1571,7 @@
    <string name="remote_ctrl_error_busy">PC版が処理中</string>
    <string name="remote_ctrl_error_disconnected">PC版が切断されました</string>
    <string name="remote_ctrl_error_bad_version">ご利用のPC版のバージョンがサポートされてません。両端末が同じバージョンかどうか、ご確認ください。</string>
-    <string name="possible_deadlock_title">デッドロック状態</string>
    <string name="developer_options_section">開発者向けの設定</string>
-    <string name="possible_deadlock_desc">処理時間が異常にかかるようです: %1$d 秒。アプリが固まった恐れがあります: %2$s</string>
    <string name="remote_host_error_busy"><![CDATA[携帯版 <b>%s</b> がただいま処理中]]></string>
    <string name="possible_slow_function_desc">機能の処理時間が以上にかかってます: %1$d 秒: %2$s</string>
    <string name="show_internal_errors">内部エラーを表示</string>
@@ -1574,7 +1574,6 @@
    <string name="remote_host_error_missing"><![CDATA[Mobiel <b>%s</b> ontbreekt]]></string>
    <string name="remote_host_error_bad_state"><![CDATA[De verbinding met de mobiel <b>%s</b> is in slechte staat]]></string>
    <string name="remote_ctrl_error_disconnected">De verbinding met desktop is verbroken</string>
-    <string name="possible_deadlock_title">Impasse</string>
    <string name="possible_slow_function_desc">Uitvoering van functie duurt te lang: %1$d seconden: %2$s</string>
    <string name="possible_slow_function_title">Langzame functie</string>
    <string name="developer_options_section">Ontwikkelaars opties</string>
@@ -1588,7 +1587,6 @@
    <string name="restart_chat_button">Chat opnieuw starten</string>
    <string name="remote_host_error_timeout"><![CDATA[Time-out bereikt tijdens het verbinden met de mobiel <b>%s</b>]]></string>
    <string name="remote_ctrl_error_bad_state">De verbinding met de desktop is in slechte staat</string>
-    <string name="possible_deadlock_desc">Het uitvoeren van de code duurt te lang: %1$d seconden. Waarschijnlijk is de app vastgelopen: %2$s</string>
    <string name="remote_ctrl_error_bad_invitation">Desktop heeft verkeerde uitnodigingscode</string>
    <string name="remote_host_error_bad_version"><![CDATA[Mobiel <b>%s</b> heeft een niet-ondersteunde versie. Zorg ervoor dat u op beide apparaten dezelfde versie gebruikt]]></string>
    <string name="remote_ctrl_error_timeout">Time-out bereikt tijdens het verbinden met de desktop</string>
@@ -1606,7 +1606,6 @@
    <string name="remote_ctrl_error_bad_version">Komputer ma niewspieraną wersję. Proszę upewnić się, że używasz tych samych wersji na obu urządzeniach</string>
    <string name="blocked_by_admin_items_description">%d wiadomości zablokowanych przez admina</string>
    <string name="error_creating_message">Błąd tworzenia wiadomości</string>
-    <string name="possible_deadlock_desc">Wykonanie kodu zajmuje za dużo czasu: %1$d sekund. Prawdopodobnie aplikacja jest zamrożona: %2$s</string>
    <string name="possible_slow_function_desc">Wykonanie kodu zajmuje za dużo czasu: %1$d sekund: %2$s</string>
    <string name="note_folder_local_display_name">Prywatne notatki</string>
    <string name="group_member_status_unknown">nieznany status</string>
@@ -1621,7 +1620,6 @@
    <string name="remote_host_error_inactive"><![CDATA[Telefon <b>%s</b> jest nieaktywny]]></string>
    <string name="remote_host_error_bad_version"><![CDATA[Telefon <b>%s</b> ma niewspieraną wersję. Proszę, upewnij się, że używasz tej samej wersji na obydwu urządzeniach]]></string>
    <string name="group_member_status_unknown_short">nieznany</string>
-    <string name="possible_deadlock_title">Blokada</string>
    <string name="profile_update_event_contact_name_changed">kontakt %1$s zmieniony na %2$s</string>
    <string name="profile_update_event_removed_address">usunięto adres kontaktu</string>
    <string name="profile_update_event_removed_picture">usunięto zdjęcie profilu</string>
@@ -1680,8 +1680,6 @@
    <string name="error_showing_message">ошибка отображения сообщения</string>
    <string name="error_showing_content">ошибка отображения содержания</string>
    <string name="remote_ctrl_disconnected_with_reason">Отсоединён по причине: %s</string>
-    <string name="possible_deadlock_title">Взаимная блокировка</string>
-    <string name="possible_deadlock_desc">Выполнение задачи занимает долгое время: %1$d секунд. Возможно, приложение заблокировано: %2$s</string>
    <string name="possible_slow_function_desc">Выполнение задачи занимает долгое время: %1$d секунд: %2$s</string>
    <string name="possible_slow_function_title">Медленный вызов</string>
    <string name="profile_update_event_contact_name_changed">контакт %1$s изменён на %2$s</string>
@@ -1586,8 +1586,6 @@
    <string name="remote_host_error_bad_state"><![CDATA[到移动主机 <b>%s</b>的连接状态不佳]]></string>
    <string name="remote_host_error_timeout"><![CDATA[连接到移动主机<b>%s</b>时超时]]></string>
    <string name="failed_to_create_user_invalid_desc">显示名无效。请另选一个名称。</string>
-    <string name="possible_deadlock_title">死锁</string>
-    <string name="possible_deadlock_desc">代码执行花费的时间过久：%1$d秒。应用可能卡住了：%2$s</string>
    <string name="possible_slow_function_title">慢函数</string>
    <string name="show_slow_api_calls">显示缓慢的 API 调用</string>
    <string name="past_member_vName">过往成员 %1$s</string>
@@ -39,7 +39,8 @@ fun showApp() {
          WindowExceptionHandler { e ->
            AlertManager.shared.showAlertMsg(
              title = generalGetString(MR.strings.app_was_crashed),
-              text = e.stackTraceToString()
+              text = e.stackTraceToString(),
+              shareText = true
            )
            Log.e(TAG, "App crashed, thread name: " + Thread.currentThread().name + ", exception: " + e.stackTraceToString())
            window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
@@ -42,7 +42,7 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
    }
    var fileSource = getLoadedFileSource(cItem.file)
    if (chatModel.connectedToRemote() && fileSource == null) {
-      withLongRunningApi(slow = 60_000, deadlock = 600_000) {
+      withLongRunningApi(slow = 600_000) {
        cItem.file?.loadRemoteFile(true)
        fileSource = getLoadedFileSource(cItem.file)
        saveIfExists()
@@ -51,7 +51,7 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
  })
 }

-actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) = withLongRunningApi(slow = 60_000, deadlock = 600_000) {
+actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) = withLongRunningApi(slow = 600_000) {
  var fileSource = getLoadedFileSource(cItem.file)
  if (chatModel.connectedToRemote() && fileSource == null) {
    cItem.file?.loadRemoteFile(true)
@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2

-android.version_name=5.5.3
-android.version_code=181
+android.version_name=5.5.6
+android.version_code=187

-desktop.version_name=5.5.3
-desktop.version_code=29
+desktop.version_name=5.5.6
+desktop.version_code=32

 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2