android, desktop: moved to Compose 1.6.0

2024-01-26 23:06:02 +07:00
65 changed files with 334 additions and 1184 deletions
--- a/apps/ios/SimpleX.xcodeproj/project.pbxproj
+++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj
@@ -29,11 +29,6 @@
 		5C116CDC27AABE0400E66D01 /* ContactRequestView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C116CDB27AABE0400E66D01 /* ContactRequestView.swift */; };
 		5C13730B28156D2700F43030 /* ContactConnectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C13730A28156D2700F43030 /* ContactConnectionView.swift */; };
 		5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */; };
-		5C29C3A52B6D09B2003DF84C /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C29C3A02B6D09B2003DF84C /* libgmpxx.a */; };
-		5C29C3A62B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C29C3A12B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a */; };
-		5C29C3A72B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C29C3A22B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a */; };
-		5C29C3A82B6D09B2003DF84C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C29C3A32B6D09B2003DF84C /* libgmp.a */; };
-		5C29C3A92B6D09B2003DF84C /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C29C3A42B6D09B2003DF84C /* libffi.a */; };
 		5C2E260727A2941F00F70299 /* SimpleXAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260627A2941F00F70299 /* SimpleXAPI.swift */; };
 		5C2E260B27A30CFA00F70299 /* ChatListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260A27A30CFA00F70299 /* ChatListView.swift */; };
 		5C2E260F27A30FDC00F70299 /* ChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C2E260E27A30FDC00F70299 /* ChatView.swift */; };
@@ -66,6 +61,11 @@
 		5C7505A527B679EE00BE3227 /* NavLinkPlain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7505A427B679EE00BE3227 /* NavLinkPlain.swift */; };
 		5C7505A827B6D34800BE3227 /* ChatInfoToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C7505A727B6D34800BE3227 /* ChatInfoToolbar.swift */; };
 		5C764E89279CBCB3000C6508 /* ChatModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C764E88279CBCB3000C6508 /* ChatModel.swift */; };
+		5C83A1AD2B5EF67D00AE0A4A /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C83A1A82B5EF67D00AE0A4A /* libgmp.a */; };
+		5C83A1AE2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C83A1A92B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a */; };
+		5C83A1AF2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C83A1AA2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a */; };
+		5C83A1B02B5EF67D00AE0A4A /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C83A1AB2B5EF67D00AE0A4A /* libffi.a */; };
+		5C83A1B12B5EF67D00AE0A4A /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C83A1AC2B5EF67D00AE0A4A /* libgmpxx.a */; };
 		5C8F01CD27A6F0D8007D2C8D /* CodeScanner in Frameworks */ = {isa = PBXBuildFile; productRef = 5C8F01CC27A6F0D8007D2C8D /* CodeScanner */; };
 		5C93292F29239A170090FFF9 /* ProtocolServersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C93292E29239A170090FFF9 /* ProtocolServersView.swift */; };
 		5C93293129239BED0090FFF9 /* ProtocolServerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C93293029239BED0090FFF9 /* ProtocolServerView.swift */; };
@@ -278,11 +278,6 @@
 		5C245F3C2B501E98001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C245F3D2B501F13001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = "tr.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C245F3E2B501F13001CC39F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		5C29C3A02B6D09B2003DF84C /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5C29C3A12B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a"; sourceTree = "<group>"; };
-		5C29C3A22B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5C29C3A32B6D09B2003DF84C /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
-		5C29C3A42B6D09B2003DF84C /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		5C2E260627A2941F00F70299 /* SimpleXAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXAPI.swift; sourceTree = "<group>"; };
 		5C2E260A27A30CFA00F70299 /* ChatListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatListView.swift; sourceTree = "<group>"; };
 		5C2E260E27A30FDC00F70299 /* ChatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatView.swift; sourceTree = "<group>"; };
@@ -330,6 +325,11 @@
 		5C7505A427B679EE00BE3227 /* NavLinkPlain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavLinkPlain.swift; sourceTree = "<group>"; };
 		5C7505A727B6D34800BE3227 /* ChatInfoToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatInfoToolbar.swift; sourceTree = "<group>"; };
 		5C764E88279CBCB3000C6508 /* ChatModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatModel.swift; sourceTree = "<group>"; };
+		5C83A1A82B5EF67D00AE0A4A /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		5C83A1A92B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a"; sourceTree = "<group>"; };
+		5C83A1AA2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a"; sourceTree = "<group>"; };
+		5C83A1AB2B5EF67D00AE0A4A /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		5C83A1AC2B5EF67D00AE0A4A /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
 		5C84FE9129A216C800D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5C84FE9329A2179C00D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = "nl.lproj/SimpleX--iOS--InfoPlist.strings"; sourceTree = "<group>"; };
 		5C84FE9429A2179C00D95B1A /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -514,13 +514,13 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				5C29C3A62B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a in Frameworks */,
-				5C29C3A52B6D09B2003DF84C /* libgmpxx.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
+				5C83A1B02B5EF67D00AE0A4A /* libffi.a in Frameworks */,
+				5C83A1AD2B5EF67D00AE0A4A /* libgmp.a in Frameworks */,
+				5C83A1AE2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a in Frameworks */,
+				5C83A1AF2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5C29C3A92B6D09B2003DF84C /* libffi.a in Frameworks */,
-				5C29C3A82B6D09B2003DF84C /* libgmp.a in Frameworks */,
-				5C29C3A72B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a in Frameworks */,
+				5C83A1B12B5EF67D00AE0A4A /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -582,11 +582,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5C29C3A42B6D09B2003DF84C /* libffi.a */,
-				5C29C3A32B6D09B2003DF84C /* libgmp.a */,
-				5C29C3A02B6D09B2003DF84C /* libgmpxx.a */,
-				5C29C3A22B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz-ghc9.6.3.a */,
-				5C29C3A12B6D09B2003DF84C /* libHSsimplex-chat-5.5.2.0-B3iqnZovI7Z5cYCa3ekeAz.a */,
+				5C83A1AB2B5EF67D00AE0A4A /* libffi.a */,
+				5C83A1A82B5EF67D00AE0A4A /* libgmp.a */,
+				5C83A1AC2B5EF67D00AE0A4A /* libgmpxx.a */,
+				5C83A1A92B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3-ghc9.6.3.a */,
+				5C83A1AA2B5EF67D00AE0A4A /* libHSsimplex-chat-5.5.0.4-HTW6wkBBAjO2GDtnvnI9O3.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -1509,7 +1509,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1531,7 +1531,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1552,7 +1552,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1574,7 +1574,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1633,7 +1633,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1646,7 +1646,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1665,7 +1665,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1678,7 +1678,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1697,7 +1697,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1721,7 +1721,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1743,7 +1743,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 196;
+				CURRENT_PROJECT_VERSION = 194;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1767,7 +1767,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.5.2;
+				MARKETING_VERSION = 5.5;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
--- a/apps/multiplatform/android/src/main/AndroidManifest.xml
+++ b/apps/multiplatform/android/src/main/AndroidManifest.xml
@@ -103,14 +103,11 @@
      </intent-filter>
    </activity-alias>

-    <activity android:name=".views.call.CallActivity"
+
+    <activity android:name=".views.call.IncomingCallActivity"
        android:showOnLockScreen="true"
        android:exported="false"
-        android:launchMode="singleInstance"
-        android:supportsPictureInPicture="true"
-        android:autoRemoveFromRecents="true"
-        android:screenOrientation="portrait"
-        android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"/>
+        android:launchMode="singleTask"/>

    <provider
        android:name="androidx.core.content.FileProvider"
@@ -136,18 +133,6 @@
        android:stopWithTask="false"></service>

    <!-- SimplexService restart on reboot -->
-
-    <service
-        android:name=".CallService"
-        android:enabled="true"
-        android:exported="false"
-        android:stopWithTask="false"/>
-
-    <receiver
-        android:name=".CallService$CallActionReceiver"
-        android:enabled="true"
-        android:exported="false" />
-
    <receiver
        android:name=".SimplexService$StartReceiver"
        android:enabled="true"
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/CallService.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/CallService.kt
@@ -1,176 +0,0 @@
-package chat.simplex.app
-
-import android.app.*
-import android.content.*
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.os.*
-import androidx.compose.ui.graphics.asAndroidBitmap
-import androidx.core.app.NotificationCompat
-import androidx.core.content.ContextCompat
-import chat.simplex.app.model.NtfManager.EndCallAction
-import chat.simplex.app.views.call.CallActivity
-import chat.simplex.common.model.NotificationPreviewMode
-import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.CallState
-import chat.simplex.common.views.helpers.*
-import chat.simplex.res.MR
-import kotlinx.datetime.Instant
-
-class CallService: Service() {
-  private var wakeLock: PowerManager.WakeLock? = null
-  private var notificationManager: NotificationManager? = null
-  private var serviceNotification: Notification? = null
-
-  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-    Log.d(TAG, "onStartCommand startId: $startId")
-    if (intent != null) {
-      val action = intent.action
-      Log.d(TAG, "intent action $action")
-      when (action) {
-        Action.START.name -> startService()
-        else -> Log.e(TAG, "No action in the intent")
-      }
-    } else {
-      Log.d(TAG, "null intent. Probably restarted by the system.")
-    }
-    startForeground(CALL_SERVICE_ID, serviceNotification)
-    return START_STICKY
-  }
-
-  override fun onCreate() {
-    super.onCreate()
-    Log.d(TAG, "Call service created")
-    notificationManager = createNotificationChannel()
-    updateNotification()
-    startForeground(CALL_SERVICE_ID, serviceNotification)
-  }
-
-  override fun onDestroy() {
-    Log.d(TAG, "Call service destroyed")
-    try {
-      wakeLock?.let {
-        while (it.isHeld) it.release() // release all, in case acquired more than once
-      }
-      wakeLock = null
-    } catch (e: Exception) {
-      Log.d(TAG, "Exception while releasing wakelock: ${e.message}")
-    }
-    super.onDestroy()
-  }
-
-  private fun startService() {
-    Log.d(TAG, "CallService startService")
-    if (wakeLock != null) return
-    wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-      newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKE_LOCK_TAG).apply {
-        acquire()
-      }
-    }
-  }
-
-  fun updateNotification() {
-    val call = chatModel.activeCall.value
-    val previewMode = appPreferences.notificationPreviewMode.get()
-    val title = if (previewMode == NotificationPreviewMode.HIDDEN.name)
-      generalGetString(MR.strings.notification_preview_somebody)
-    else
-      call?.contact?.profile?.displayName ?: ""
-    val text = generalGetString(if (call?.supportsVideo() == true) MR.strings.call_service_notification_video_call else MR.strings.call_service_notification_audio_call)
-    val image = call?.contact?.image
-    val largeIcon = if (image == null || previewMode == NotificationPreviewMode.HIDDEN.name)
-      BitmapFactory.decodeResource(resources, R.drawable.icon)
-    else
-      base64ToBitmap(image).asAndroidBitmap()
-
-    serviceNotification = createNotification(title, text, largeIcon, call?.connectedAt)
-    startForeground(CALL_SERVICE_ID, serviceNotification)
-  }
-
-  private fun createNotificationChannel(): NotificationManager? {
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-      val channel = NotificationChannel(CALL_NOTIFICATION_CHANNEL_ID, CALL_NOTIFICATION_CHANNEL_NAME, NotificationManager.IMPORTANCE_DEFAULT)
-      notificationManager.createNotificationChannel(channel)
-      return notificationManager
-    }
-    return null
-  }
-
-  private fun createNotification(title: String, text: String, icon: Bitmap, connectedAt: Instant? = null): Notification {
-    val pendingIntent: PendingIntent = Intent(this, CallActivity::class.java).let { notificationIntent ->
-      PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
-    }
-
-    val endCallPendingIntent: PendingIntent = Intent(this, CallActionReceiver::class.java).let { notificationIntent ->
-      notificationIntent.setAction(EndCallAction)
-      PendingIntent.getBroadcast(this, 1, notificationIntent, PendingIntent.FLAG_CANCEL_CURRENT or PendingIntent.FLAG_IMMUTABLE)
-    }
-
-    val builder =  NotificationCompat.Builder(this, CALL_NOTIFICATION_CHANNEL_ID)
-      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(icon)
-      .setColor(0x88FFFF)
-      .setContentTitle(title)
-      .setContentText(text)
-      .setContentIntent(pendingIntent)
-      .setSilent(true)
-      .addAction(R.drawable.ntf_icon, generalGetString(MR.strings.call_service_notification_end_call), endCallPendingIntent)
-    if (connectedAt != null) {
-      builder.setUsesChronometer(true)
-      builder.setWhen(connectedAt.epochSeconds * 1000)
-    }
-
-    return builder.build()
-  }
-
-  override fun onBind(intent: Intent): IBinder {
-    return CallServiceBinder()
-  }
-
-  inner class CallServiceBinder : Binder() {
-    fun getService() = this@CallService
-  }
-
-  enum class Action {
-    START,
-  }
-
-  class CallActionReceiver: BroadcastReceiver() {
-    override fun onReceive(context: Context?, intent: Intent?) {
-      when (intent?.action) {
-        EndCallAction -> {
-          val call = chatModel.activeCall.value
-          if (call != null) {
-            withBGApi {
-              chatModel.callManager.endCall(call)
-            }
-          }
-        }
-        else -> {
-          Log.e(TAG, "Unknown action. Make sure you provided an action")
-        }
-      }
-    }
-  }
-
-companion object {
-    const val TAG = "CALL_SERVICE"
-    const val CALL_NOTIFICATION_CHANNEL_ID = "chat.simplex.app.CALL_SERVICE_NOTIFICATION"
-    const val CALL_NOTIFICATION_CHANNEL_NAME = "SimpleX Chat call service"
-    const val CALL_SERVICE_ID = 6788
-    const val WAKE_LOCK_TAG = "CallService::lock"
-
-    fun startService(): Intent {
-      Log.d(TAG, "CallService start")
-      return Intent(androidAppContext, CallService::class.java).also {
-        it.action = Action.START.name
-        ContextCompat.startForegroundService(androidAppContext, it)
-      }
-    }
-
-    fun stopService() {
-      androidAppContext.stopService(Intent(androidAppContext, CallService::class.java))
-    }
-  }
-}
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt
@@ -1,15 +1,14 @@
 package chat.simplex.app

-import android.app.*
+import android.app.Application
 import android.content.Context
+import androidx.compose.ui.platform.ClipboardManager
 import chat.simplex.common.platform.Log
-import android.content.Intent
+import android.app.UiModeManager
 import android.os.*
 import androidx.lifecycle.*
 import androidx.work.*
 import chat.simplex.app.model.NtfManager
-import chat.simplex.app.model.NtfManager.AcceptCallAction
-import chat.simplex.app.views.call.CallActivity
 import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.requiresIgnoringBattery
 import chat.simplex.common.model.*
@@ -19,7 +18,6 @@ import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.ui.theme.DefaultTheme
 import chat.simplex.common.views.call.RcvCallInvitation
-import chat.simplex.common.views.call.activeCallDestroyWebView
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
 import com.jakewharton.processphoenix.ProcessPhoenix
@@ -186,10 +184,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        SimplexService.safeStopService()
      }

-      override fun androidCallServiceSafeStop() {
-        CallService.stopService()
-      }
-
      override fun androidNotificationsModeChanged(mode: NotificationsMode) {
        if (mode.requiresIgnoringBattery && !SimplexService.isBackgroundAllowed()) {
          appPrefs.backgroundServiceNoticeShown.set(false)
@@ -260,28 +254,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        uiModeManager.setApplicationNightMode(mode)
      }

-      override fun androidStartCallActivity(acceptCall: Boolean, remoteHostId: Long?, chatId: ChatId?) {
-        val context = mainActivity.get() ?: return
-        val intent = Intent(context, CallActivity::class.java)
-          .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-        if (acceptCall) {
-          intent.setAction(AcceptCallAction)
-            .putExtra("remoteHostId", remoteHostId)
-            .putExtra("chatId", chatId)
-        }
-        intent.flags += Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT
-        context.startActivity(intent)
-      }
-
-      override fun androidPictureInPictureAllowed(): Boolean {
-        val appOps = androidAppContext.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
-        return appOps.checkOpNoThrow(AppOpsManager.OPSTR_PICTURE_IN_PICTURE, Process.myUid(), packageName) == AppOpsManager.MODE_ALLOWED
-      }
-
-      override fun androidCallEnded() {
-        activeCallDestroyWebView()
-      }
-
      override suspend fun androidAskToAllowBackgroundCalls(): Boolean {
        if (SimplexService.isBackgroundRestricted()) {
          val userChoice: CompletableDeferred<Boolean> = CompletableDeferred()
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt
@@ -34,13 +34,12 @@ import kotlin.system.exitProcess

 class SimplexService: Service() {
  private var wakeLock: PowerManager.WakeLock? = null
-  private var isCheckingNewMessages = false
+  private var isStartingService = false
  private var notificationManager: NotificationManager? = null
  private var serviceNotification: Notification? = null

  override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
    Log.d(TAG, "onStartCommand startId: $startId")
-    isServiceStarting = false
    if (intent != null) {
      val action = intent.action
      Log.d(TAG, "intent action $action")
@@ -72,7 +71,6 @@ class SimplexService: Service() {
      stopForeground(true)
      stopSelf()
    } else {
-      isServiceStarting = false
      isServiceStarted = true
      // In case of self-destruct is enabled the initialization process will not start in SimplexApp, Let's start it here
      if (DatabaseUtils.ksSelfDestructPassword.get() != null && chatModel.chatDbStatus.value == null) {
@@ -91,7 +89,6 @@ class SimplexService: Service() {
    } catch (e: Exception) {
      Log.d(TAG, "Exception while releasing wakelock: ${e.message}")
    }
-    isServiceStarting = false
    isServiceStarted = false
    stopAfterStart = false
    saveServiceState(this, ServiceState.STOPPED)
@@ -104,10 +101,10 @@ class SimplexService: Service() {

  private fun startService() {
    Log.d(TAG, "SimplexService startService")
-    if (wakeLock != null || isCheckingNewMessages) return
+    if (wakeLock != null || isStartingService) return
    val self = this
-    isCheckingNewMessages = true
-    withLongRunningApi {
+    isStartingService = true
+    withLongRunningApi(slow = 30_000, deadlock = 60_000) {
      val chatController = ChatController
      waitDbMigrationEnds(chatController)
      try {
@@ -126,7 +123,7 @@ class SimplexService: Service() {
          }
        }
      } finally {
-        isCheckingNewMessages = false
+        isStartingService = false
      }
    }
  }
@@ -265,7 +262,6 @@ class SimplexService: Service() {
    private const val SHARED_PREFS_SERVICE_STATE = "SIMPLEX_SERVICE_STATE"
    private const val WORK_NAME_ONCE = "ServiceStartWorkerOnce"

-    var isServiceStarting = false
    var isServiceStarted = false
    private var stopAfterStart = false

@@ -285,7 +281,7 @@ class SimplexService: Service() {
    fun safeStopService() {
      if (isServiceStarted) {
        androidAppContext.stopService(Intent(androidAppContext, SimplexService::class.java))
-      } else if (isServiceStarting) {
+      } else {
        stopAfterStart = true
      }
    }
@@ -295,7 +291,6 @@ class SimplexService: Service() {
      withContext(Dispatchers.IO) {
        Intent(androidAppContext, SimplexService::class.java).also {
          it.action = action.name
-          isServiceStarting = true
          ContextCompat.startForegroundService(androidAppContext, it)
        }
      }
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt
@@ -4,6 +4,7 @@ import android.app.*
 import android.app.TaskStackBuilder
 import android.content.*
 import android.content.pm.PackageManager
+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.hardware.display.DisplayManager
 import android.media.AudioAttributes
@@ -13,7 +14,7 @@ import androidx.compose.ui.graphics.asAndroidBitmap
 import androidx.core.app.*
 import chat.simplex.app.*
 import chat.simplex.app.TAG
-import chat.simplex.app.views.call.CallActivity
+import chat.simplex.app.views.call.IncomingCallActivity
 import chat.simplex.app.views.call.getKeyguardManager
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.*
@@ -33,7 +34,6 @@ object NtfManager {
  const val CallChannel: String = "chat.simplex.app.CALL_NOTIFICATION_2"
  const val AcceptCallAction: String = "chat.simplex.app.ACCEPT_CALL"
  const val RejectCallAction: String = "chat.simplex.app.REJECT_CALL"
-  const val EndCallAction: String = "chat.simplex.app.END_CALL"
  const val CallNotificationId: Int = -1
  private const val UserIdKey: String = "userId"
  private const val ChatIdKey: String = "chatId"
@@ -158,7 +158,7 @@ object NtfManager {
    val screenOff = displayManager.displays.all { it.state != Display.STATE_ON }
    var ntfBuilder =
      if ((keyguardManager.isKeyguardLocked || screenOff) && appPreferences.callOnLockScreen.get() != CallOnLockScreen.DISABLE) {
-        val fullScreenIntent = Intent(context, CallActivity::class.java)
+        val fullScreenIntent = Intent(context, IncomingCallActivity::class.java)
        val fullScreenPendingIntent = PendingIntent.getActivity(context, 0, fullScreenIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
        NotificationCompat.Builder(context, CallChannel)
          .setFullScreenIntent(fullScreenPendingIntent, true)
@@ -218,7 +218,7 @@ object NtfManager {
      .setGroup(MessageGroup)
      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(null)
+      .setLargeIcon(null as Bitmap?)
      .setColor(0x88FFFF)
      .setAutoCancel(true)
      .setVibrate(null)
--- a/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt
+++ b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt
@@ -1,18 +1,17 @@
 package chat.simplex.app.views.call

-import android.app.*
-import android.content.*
-import android.content.res.Configuration
-import android.graphics.Rect
-import android.os.*
-import android.util.Rational
-import android.view.*
+import android.app.Activity
+import android.app.KeyguardManager
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import chat.simplex.common.platform.Log
+import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.trackPipAnimationHintView
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
@@ -23,115 +22,33 @@ import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.lifecycle.Lifecycle
 import chat.simplex.app.*
 import chat.simplex.app.R
-import chat.simplex.app.TAG
-import chat.simplex.app.model.NtfManager
-import chat.simplex.app.model.NtfManager.AcceptCallAction
 import chat.simplex.common.model.*
-import chat.simplex.common.platform.*
+import chat.simplex.app.model.NtfManager.OpenChatAction
+import chat.simplex.common.platform.ntfManager
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.stringResource
-import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
-import java.lang.ref.WeakReference
-import chat.simplex.common.platform.chatModel as m

-class CallActivity: ComponentActivity(), ServiceConnection {
-
-  var boundService: CallService? = null
+class IncomingCallActivity: ComponentActivity() {

  override fun onCreate(savedInstanceState: Bundle?) {
    super.onCreate(savedInstanceState)
-    callActivity = WeakReference(this)
-    when (intent?.action) {
-      AcceptCallAction -> {
-        val remoteHostId = intent.getLongExtra("remoteHostId", -1).takeIf { it != -1L }
-        val chatId = intent.getStringExtra("chatId")
-        val invitation = (m.callInvitations.values + m.activeCallInvitation.value).lastOrNull {
-          it?.remoteHostId == remoteHostId && it?.contact?.id == chatId
-        }
-        if (invitation != null) {
-          m.callManager.acceptIncomingCall(invitation = invitation)
-        }
-      }
-    }
-
-    setContent { CallActivityView() }
-
-    if (isOnLockScreenNow()) {
-      unlockForIncomingCall()
-    }
+    setContent { IncomingCallActivityView(ChatModel) }
+    unlockForIncomingCall()
  }

  override fun onDestroy() {
    super.onDestroy()
-    if (isOnLockScreenNow()) {
-      lockAfterIncomingCall()
-    }
-    try {
-      unbindService(this)
-    } catch (e: Exception) {
-      Log.i(TAG, "Unable to unbind service: " + e.stackTraceToString())
-    }
-  }
-
-  private fun isOnLockScreenNow() = getKeyguardManager(this).isKeyguardLocked
-
-  fun setPipParams(video: Boolean, sourceRectHint: Rect? = null, viewRatio: Rational? = null) {
-    // By manually specifying source rect we exclude empty background while toggling PiP
-    val builder = PictureInPictureParams.Builder()
-        .setAspectRatio(viewRatio)
-        .setSourceRectHint(sourceRectHint)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      builder.setAutoEnterEnabled(video)
-    }
-    setPictureInPictureParams(builder.build())
-  }
-
-  override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean, newConfig: Configuration) {
-    super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
-    m.activeCallViewIsCollapsed.value = isInPictureInPictureMode
-    val layoutType = if (!isInPictureInPictureMode) {
-      LayoutType.Default
-    } else {
-      LayoutType.RemoteVideo
-    }
-    m.callCommand.add(WCallCommand.Layout(layoutType))
-  }
-
-  override fun onBackPressed() {
-    if (isOnLockScreenNow()) {
-      super.onBackPressed()
-    } else {
-      m.activeCallViewIsCollapsed.value = true
-    }
-  }
-
-  override fun onPictureInPictureRequested(): Boolean {
-    Log.d(TAG, "Requested picture-in-picture from the system")
-    return super.onPictureInPictureRequested()
-  }
-
-  override fun onUserLeaveHint() {
-    // On Android 12+ PiP is enabled automatically when a user hides the app
-    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R && callSupportsVideo() && platform.androidPictureInPictureAllowed()) {
-      enterPictureInPictureMode()
-    }
-  }
-
-  override fun onResume() {
-    super.onResume()
-    m.activeCallViewIsCollapsed.value = false
+    lockAfterIncomingCall()
  }

  private fun unlockForIncomingCall() {
@@ -155,23 +72,6 @@ class CallActivity: ComponentActivity(), ServiceConnection {
    }
  }

-  fun startServiceAndBind() {
-    /**
-     * On Android 12 there is a bug that prevents starting activity after pressing back button
-     * (the error says that it denies to start activity in background).
-     * Workaround is to bind to a service
-     * */
-    bindService(CallService.startService(), this, 0)
-  }
-
-  override fun onServiceConnected(name: ComponentName?, service: IBinder?) {
-    boundService = (service as CallService.CallServiceBinder).getService()
-  }
-
-  override fun onServiceDisconnected(name: ComponentName?) {
-    boundService = null
-  }
-
  companion object {
    const val activityFlags = WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or WindowManager.LayoutParams.FLAG_ALLOW_LOCK_WHILE_SCREEN_ON
  }
@@ -180,96 +80,38 @@ class CallActivity: ComponentActivity(), ServiceConnection {
 fun getKeyguardManager(context: Context): KeyguardManager =
  context.getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager

-private fun callSupportsVideo() = m.activeCall.value?.supportsVideo() == true || m.activeCallInvitation.value?.callType?.media == CallMediaType.Video
-
@Composable
-fun CallActivityView() {
+fun IncomingCallActivityView(m: ChatModel) {
  val switchingCall = m.switchingCall.value
  val invitation = m.activeCallInvitation.value
-  val call = remember { m.activeCall }.value
+  val call = m.activeCall.value
  val showCallView = m.showCallView.value
-  val activity = LocalContext.current as CallActivity
-  LaunchedEffect(Unit) {
-    snapshotFlow { m.activeCallViewIsCollapsed.value }
-      .collect { collapsed ->
-        when {
-          collapsed -> {
-            if (!platform.androidPictureInPictureAllowed() || !callSupportsVideo()) {
-              activity.moveTaskToBack(true)
-              activity.startActivity(Intent(activity, MainActivity::class.java))
-            } else if (!activity.isInPictureInPictureMode && activity.lifecycle.currentState == Lifecycle.State.RESUMED) {
-              // User pressed back button, show MainActivity
-              activity.startActivity(Intent(activity, MainActivity::class.java))
-              activity.enterPictureInPictureMode()
-            }
-          }
-          callSupportsVideo() && !platform.androidPictureInPictureAllowed() -> {
-            // PiP disabled by user
-            platform.androidStartCallActivity(false)
-          }
-          activity.isInPictureInPictureMode -> {
-            platform.androidStartCallActivity(false)
-          }
-        }
-      }
-  }
-  SimpleXTheme {
-    var prevCall by remember { mutableStateOf(call) }
-    KeyChangeEffect(m.activeCall.value) {
-      if (m.activeCall.value != null) {
-        prevCall = m.activeCall.value
-        activity.boundService?.updateNotification()
-      }
-    }
-    Box(Modifier.background(Color.Black)) {
-      if (call != null) {
-        val view = LocalView.current
-        ActiveCallView()
-        if (callSupportsVideo()) {
-          val scope = rememberCoroutineScope()
-          LaunchedEffect(Unit) {
-            scope.launch {
-              activity.setPipParams(callSupportsVideo(), viewRatio = Rational(view.width, view.height))
-              activity.trackPipAnimationHintView(view)
-            }
-          }
-        }
-      } else if (prevCall != null) {
-        prevCall?.let { ActiveCallOverlayDisabled(it) }
-      }
-      if (invitation != null) {
-        if (call == null) {
-          Surface(
-            Modifier
-              .fillMaxSize(),
-            color = MaterialTheme.colors.background,
-            contentColor = LocalContentColor.current
-          ) {
-            IncomingCallLockScreenAlert(invitation, m)
-          }
-        } else {
-          IncomingCallAlertView(invitation, m)
-        }
-      }
-    }
-  }
-  LaunchedEffect(call == null) {
-    if (call != null) {
-      activity.startServiceAndBind()
-    }
-  }
+  val activity = LocalContext.current as Activity
  LaunchedEffect(invitation, call, switchingCall, showCallView) {
    if (!switchingCall && invitation == null && (!showCallView || call == null)) {
-      Log.d(TAG, "CallActivityView: finishing activity")
+      Log.d(TAG, "IncomingCallActivityView: finishing activity")
      activity.finish()
    }
  }
+  SimpleXTheme {
+    Surface(
+      Modifier
+        .fillMaxSize(),
+      color = MaterialTheme.colors.background,
+      contentColor = LocalContentColor.current
+    ) {
+      if (showCallView) {
+        Box {
+          ActiveCallView()
+          if (invitation != null) IncomingCallAlertView(invitation, m)
+        }
+      } else if (invitation != null) {
+        IncomingCallLockScreenAlert(invitation, m)
+      }
+    }
+  }
 }

-/**
-* Related to lockscreen
-* */
-
@Composable
 fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatModel) {
  val cm = chatModel.callManager
@@ -293,7 +135,7 @@ fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatMo
    acceptCall = { cm.acceptIncomingCall(invitation = invitation) },
    openApp = {
      val intent = Intent(context, MainActivity::class.java)
-        .setAction(NtfManager.OpenChatAction)
+        .setAction(OpenChatAction)
        .putExtra("userId", invitation.user.userId)
        .putExtra("chatId", invitation.contact.id)
      context.startActivity(intent)
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/AppCommon.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/AppCommon.android.kt
@@ -4,7 +4,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.net.LocalServerSocket
 import android.util.Log
-import androidx.activity.ComponentActivity
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.common.*
 import chat.simplex.common.platform.*
@@ -26,8 +25,7 @@ val defaultLocale: Locale = Locale.getDefault()

@SuppressLint("StaticFieldLeak")
 lateinit var androidAppContext: Context
-var mainActivity: WeakReference<FragmentActivity> = WeakReference(null)
-var callActivity: WeakReference<ComponentActivity> = WeakReference(null)
+lateinit var mainActivity: WeakReference<FragmentActivity>

 fun initHaskell() {
  val socketName = "chat.simplex.app.local.socket.address.listen.native.cmd2" + Random.nextLong(100000)
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt
@@ -12,8 +12,6 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.*
 import androidx.compose.ui.platform.LocalView
 import chat.simplex.common.AppScreen
-import chat.simplex.common.model.clear
-import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.helpers.*
 import androidx.compose.ui.platform.LocalContext as LocalContext1
 import chat.simplex.res.MR
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/call/CallView.android.kt
@@ -28,7 +28,6 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
@@ -51,30 +50,20 @@ import kotlinx.datetime.Clock
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString

-// Should be destroy()'ed and set as null when call is ended. Otherwise, it will be a leak
-@SuppressLint("StaticFieldLeak")
-private var staticWebView: WebView? = null
-
-// WebView methods must be called on Main thread
-fun activeCallDestroyWebView() = withApi {
-  // Stop it when call ended
-  platform.androidCallServiceSafeStop()
-  staticWebView?.destroy()
-  staticWebView = null
-  Log.d(TAG, "CallView: webview was destroyed")
-}
-
@SuppressLint("SourceLockedOrientationActivity")
@Composable
 actual fun ActiveCallView() {
+  val chatModel = ChatModel
+  BackHandler(onBack = {
+    val call = chatModel.activeCall.value
+    if (call != null) withBGApi { chatModel.callManager.endCall(call) }
+  })
  val audioViaBluetooth = rememberSaveable { mutableStateOf(false) }
-  val proximityLock = remember {
-    val pm = (androidAppContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
-    if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
-      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, androidAppContext.packageName + ":proximityLock")
-    } else {
-      null
-    }
+  val ntfModeService = remember { chatModel.controller.appPrefs.notificationsMode.get() == NotificationsMode.SERVICE }
+  LaunchedEffect(Unit) {
+    // Start service when call happening since it's not already started.
+    // It's needed to prevent Android from shutting down a microphone after a minute or so when screen is off
+    if (!ntfModeService) platform.androidServiceStart()
  }
  DisposableEffect(Unit) {
    val am = androidAppContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
@@ -104,24 +93,22 @@ actual fun ActiveCallView() {
      }
    }
    am.registerAudioDeviceCallback(audioCallback, null)
+    val pm = (androidAppContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
+    val proximityLock = if (pm.isWakeLockLevelSupported(PROXIMITY_SCREEN_OFF_WAKE_LOCK)) {
+      pm.newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, androidAppContext.packageName + ":proximityLock")
+    } else {
+      null
+    }
+    proximityLock?.acquire()
    onDispose {
+      // Stop it when call ended
+      if (!ntfModeService) platform.androidServiceSafeStop()
      dropAudioManagerOverrides()
      am.unregisterAudioDeviceCallback(audioCallback)
-      if (proximityLock?.isHeld == true) {
-        proximityLock.release()
-      }
-    }
-  }
-  LaunchedEffect(chatModel.activeCallViewIsCollapsed.value) {
-    if (chatModel.activeCallViewIsCollapsed.value) {
-      if (proximityLock?.isHeld == true) proximityLock.release()
-    } else {
-      delay(1000)
-      if (proximityLock?.isHeld == false) proximityLock.acquire()
+      proximityLock?.release()
    }
  }
  val scope = rememberCoroutineScope()
-  val call = chatModel.activeCall.value
  Box(Modifier.fillMaxSize()) {
    WebRTCView(chatModel.callCommand) { apiMsg ->
      Log.d(TAG, "received from WebRTCView: $apiMsg")
@@ -169,6 +156,7 @@ actual fun ActiveCallView() {
          is WCallResponse.Ended -> {
            chatModel.activeCall.value = call.copy(callState = CallState.Ended)
            withBGApi { chatModel.callManager.endCall(call) }
+            chatModel.showCallView.value = false
          }
          is WCallResponse.Ok -> when (val cmd = apiMsg.command) {
            is WCallCommand.Answer ->
@@ -185,9 +173,8 @@ actual fun ActiveCallView() {
                chatModel.callCommand.add(WCallCommand.Media(CallMediaType.Audio, enable = false))
              }
            }
-            is WCallCommand.End -> {
-              withBGApi { chatModel.callManager.endCall(call) }
-            }
+            is WCallCommand.End ->
+              chatModel.showCallView.value = false
            else -> {}
          }
          is WCallResponse.Error -> {
@@ -196,16 +183,8 @@ actual fun ActiveCallView() {
        }
      }
    }
-    val showOverlay = when {
-      call == null -> false
-      !platform.androidPictureInPictureAllowed() -> true
-      !call.supportsVideo() -> true
-      !chatModel.activeCallViewIsCollapsed.value -> true
-      else -> false
-    }
-    if (call != null && showOverlay) {
-      ActiveCallOverlay(call, chatModel, audioViaBluetooth)
-    }
+    val call = chatModel.activeCall.value
+    if (call != null)  ActiveCallOverlay(call, chatModel, audioViaBluetooth)
  }

  val context = LocalContext.current
@@ -250,20 +229,6 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, audioViaBluetoot
  )
 }

-@Composable
-fun ActiveCallOverlayDisabled(call: Call) {
-  ActiveCallOverlayLayout(
-    call = call,
-    speakerCanBeEnabled = false,
-    enabled = false,
-    dismiss = {},
-    toggleAudio = {},
-    toggleVideo = {},
-    toggleSound = {},
-    flipCamera = {}
-  )
-}
-
 private fun setCallSound(speaker: Boolean, audioViaBluetooth: MutableState<Boolean>) {
  val am = androidAppContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
  Log.d(TAG, "setCallSound: set audio mode, speaker enabled: $speaker")
@@ -306,69 +271,59 @@ private fun dropAudioManagerOverrides() {
 private fun ActiveCallOverlayLayout(
  call: Call,
  speakerCanBeEnabled: Boolean,
-  enabled: Boolean = true,
  dismiss: () -> Unit,
  toggleAudio: () -> Unit,
  toggleVideo: () -> Unit,
  toggleSound: () -> Unit,
  flipCamera: () -> Unit
 ) {
-  Column {
-    val media = call.peerMedia ?: call.localMedia
-    CloseSheetBar({ chatModel.activeCallViewIsCollapsed.value = true }, true, tintColor = Color(0xFFFFFFD8)) {
-      if (media == CallMediaType.Video) {
-        Text(call.contact.chatViewName, Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING), color = Color(0xFFFFFFD8), style = MaterialTheme.typography.h2, overflow = TextOverflow.Ellipsis, maxLines = 1)
-      }
-    }
-    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-      when (media) {
-        CallMediaType.Video -> {
-          VideoCallInfoView(call)
-          Box(Modifier.fillMaxWidth().fillMaxHeight().weight(1f), contentAlignment = Alignment.BottomCenter) {
-            DisabledBackgroundCallsButton()
+  Column(Modifier.padding(DEFAULT_PADDING)) {
+    when (call.peerMedia ?: call.localMedia) {
+      CallMediaType.Video -> {
+        CallInfoView(call, alignment = Alignment.Start)
+        Box(Modifier.fillMaxWidth().fillMaxHeight().weight(1f), contentAlignment = Alignment.BottomCenter) {
+          DisabledBackgroundCallsButton()
+        }
+        Row(Modifier.fillMaxWidth().padding(horizontal = 6.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
+          ToggleAudioButton(call, toggleAudio)
+          Spacer(Modifier.size(40.dp))
+          IconButton(onClick = dismiss) {
+            Icon(painterResource(MR.images.ic_call_end_filled), stringResource(MR.strings.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
          }
-          Row(Modifier.fillMaxWidth().padding(horizontal = 6.dp), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.CenterVertically) {
-            ToggleAudioButton(call, enabled, toggleAudio)
-            Spacer(Modifier.size(40.dp))
-            IconButton(onClick = dismiss, enabled = enabled) {
-              Icon(painterResource(MR.images.ic_call_end_filled), stringResource(MR.strings.icon_descr_hang_up), tint = if (enabled) Color.Red else MaterialTheme.colors.secondary, modifier = Modifier.size(64.dp))
-            }
-            if (call.videoEnabled) {
-              ControlButton(call, painterResource(MR.images.ic_flip_camera_android_filled), MR.strings.icon_descr_flip_camera, enabled, flipCamera)
-              ControlButton(call, painterResource(MR.images.ic_videocam_filled), MR.strings.icon_descr_video_off, enabled, toggleVideo)
-            } else {
-              Spacer(Modifier.size(48.dp))
-              ControlButton(call, painterResource(MR.images.ic_videocam_off), MR.strings.icon_descr_video_on, enabled, toggleVideo)
-            }
+          if (call.videoEnabled) {
+            ControlButton(call, painterResource(MR.images.ic_flip_camera_android_filled), MR.strings.icon_descr_flip_camera, flipCamera)
+            ControlButton(call, painterResource(MR.images.ic_videocam_filled), MR.strings.icon_descr_video_off, toggleVideo)
+          } else {
+            Spacer(Modifier.size(48.dp))
+            ControlButton(call, painterResource(MR.images.ic_videocam_off), MR.strings.icon_descr_video_on, toggleVideo)
          }
        }
-
-        CallMediaType.Audio -> {
-          Spacer(Modifier.fillMaxHeight().weight(1f))
-          Column(
-            Modifier.fillMaxWidth(),
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Center
-          ) {
-            ProfileImage(size = 192.dp, image = call.contact.profile.image)
-            AudioCallInfoView(call)
-          }
-          Box(Modifier.fillMaxWidth().fillMaxHeight().weight(1f), contentAlignment = Alignment.BottomCenter) {
-            DisabledBackgroundCallsButton()
-          }
-          Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
-            Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
-              IconButton(onClick = dismiss, enabled = enabled) {
-                Icon(painterResource(MR.images.ic_call_end_filled), stringResource(MR.strings.icon_descr_hang_up), tint = if (enabled) Color.Red else MaterialTheme.colors.secondary, modifier = Modifier.size(64.dp))
-              }
+      }
+      CallMediaType.Audio -> {
+        Spacer(Modifier.fillMaxHeight().weight(1f))
+        Column(
+          Modifier.fillMaxWidth(),
+          horizontalAlignment = Alignment.CenterHorizontally,
+          verticalArrangement = Arrangement.Center
+        ) {
+          ProfileImage(size = 192.dp, image = call.contact.profile.image)
+          CallInfoView(call, alignment = Alignment.CenterHorizontally)
+        }
+        Box(Modifier.fillMaxWidth().fillMaxHeight().weight(1f), contentAlignment = Alignment.BottomCenter) {
+          DisabledBackgroundCallsButton()
+        }
+        Box(Modifier.fillMaxWidth().padding(bottom = DEFAULT_BOTTOM_PADDING), contentAlignment = Alignment.CenterStart) {
+          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.Center) {
+            IconButton(onClick = dismiss) {
+              Icon(painterResource(MR.images.ic_call_end_filled), stringResource(MR.strings.icon_descr_hang_up), tint = Color.Red, modifier = Modifier.size(64.dp))
            }
-            Box(Modifier.padding(start = 32.dp)) {
-              ToggleAudioButton(call, enabled, toggleAudio)
-            }
-            Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
-              Box(Modifier.padding(end = 32.dp)) {
-                ToggleSoundButton(call, speakerCanBeEnabled && enabled, toggleSound)
-              }
+          }
+          Box(Modifier.padding(start = 32.dp)) {
+            ToggleAudioButton(call, toggleAudio)
+          }
+          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+            Box(Modifier.padding(end = 32.dp)) {
+              ToggleSoundButton(call, speakerCanBeEnabled, toggleSound)
            }
          }
        }
@@ -378,7 +333,7 @@ private fun ActiveCallOverlayLayout(
 }

@Composable
-private fun ControlButton(call: Call, icon: Painter, iconText: StringResource, enabled: Boolean = true, action: () -> Unit) {
+private fun ControlButton(call: Call, icon: Painter, iconText: StringResource, action: () -> Unit, enabled: Boolean = true) {
  if (call.hasMedia) {
    IconButton(onClick = action, enabled = enabled) {
      Icon(icon, stringResource(iconText), tint = if (enabled) Color(0xFFFFFFD8) else MaterialTheme.colors.secondary, modifier = Modifier.size(40.dp))
@@ -389,26 +344,28 @@ private fun ControlButton(call: Call, icon: Painter, iconText: StringResource, e
 }

@Composable
-private fun ToggleAudioButton(call: Call, enabled: Boolean = true, toggleAudio: () -> Unit) {
+private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
  if (call.audioEnabled) {
-    ControlButton(call, painterResource(MR.images.ic_mic), MR.strings.icon_descr_audio_off, enabled, toggleAudio)
+    ControlButton(call, painterResource(MR.images.ic_mic), MR.strings.icon_descr_audio_off, toggleAudio)
  } else {
-    ControlButton(call, painterResource(MR.images.ic_mic_off), MR.strings.icon_descr_audio_on, enabled, toggleAudio)
+    ControlButton(call, painterResource(MR.images.ic_mic_off), MR.strings.icon_descr_audio_on, toggleAudio)
  }
 }

@Composable
 private fun ToggleSoundButton(call: Call, enabled: Boolean, toggleSound: () -> Unit) {
  if (call.soundSpeaker) {
-    ControlButton(call, painterResource(MR.images.ic_volume_up), MR.strings.icon_descr_speaker_off, enabled, toggleSound)
+    ControlButton(call, painterResource(MR.images.ic_volume_up), MR.strings.icon_descr_speaker_off, toggleSound, enabled)
  } else {
-    ControlButton(call, painterResource(MR.images.ic_volume_down), MR.strings.icon_descr_speaker_on, enabled, toggleSound)
+    ControlButton(call, painterResource(MR.images.ic_volume_down), MR.strings.icon_descr_speaker_on, toggleSound, enabled)
  }
 }

@Composable
-fun AudioCallInfoView(call: Call) {
-  Column(horizontalAlignment = Alignment.CenterHorizontally) {
+fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
+  @Composable fun InfoText(text: String, style: TextStyle = MaterialTheme.typography.body2) =
+    Text(text, color = Color(0xFFFFFFD8), style = style)
+  Column(horizontalAlignment = alignment) {
    InfoText(call.contact.chatViewName, style = MaterialTheme.typography.h2)
    InfoText(call.callState.text)

@@ -418,21 +375,6 @@ fun AudioCallInfoView(call: Call) {
  }
 }

-@Composable
-fun VideoCallInfoView(call: Call) {
-  Column(horizontalAlignment = Alignment.Start) {
-    InfoText(call.callState.text)
-
-    val connInfo = call.connectionInfo
-    val connInfoText = if (connInfo == null) ""  else " (${connInfo.text})"
-    InfoText(call.encryptionStatus + connInfoText)
-  }
-}
-
-@Composable
-fun InfoText(text: String, modifier: Modifier = Modifier, style: TextStyle = MaterialTheme.typography.body2) =
-  Text(text, modifier, color = Color(0xFFFFFFD8), style = style)
-
@Composable
 private fun DisabledBackgroundCallsButton() {
  var show by remember { mutableStateOf(!platform.androidIsBackgroundCallAllowed()) }
@@ -510,6 +452,7 @@ private fun DisabledBackgroundCallsButton() {

@Composable
 fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIMessage) -> Unit) {
+  val scope = rememberCoroutineScope()
  val webView = remember { mutableStateOf<WebView?>(null) }
  val permissionsState = rememberMultiplePermissionsState(
    permissions = listOf(
@@ -532,10 +475,10 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
    }
    lifecycleOwner.lifecycle.addObserver(observer)
    onDispose {
+      val wv = webView.value
+      if (wv != null) processCommand(wv, WCallCommand.End)
      lifecycleOwner.lifecycle.removeObserver(observer)
-//      val wv = webView.value
-//      if (wv != null) processCommand(wv, WCallCommand.End)
-//      webView.value?.destroy()
+      webView.value?.destroy()
      webView.value = null
    }
  }
@@ -562,7 +505,7 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
    Box(Modifier.fillMaxSize()) {
      AndroidView(
        factory = { AndroidViewContext ->
-          (staticWebView ?: WebView(androidAppContext)).apply {
+          WebView(AndroidViewContext).apply {
            layoutParams = ViewGroup.LayoutParams(
              ViewGroup.LayoutParams.MATCH_PARENT,
              ViewGroup.LayoutParams.MATCH_PARENT,
@@ -587,11 +530,7 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM
            webViewSettings.javaScriptEnabled = true
            webViewSettings.mediaPlaybackRequiresUserGesture = false
            webViewSettings.cacheMode = WebSettings.LOAD_NO_CACHE
-            if (staticWebView == null) {
-              this.loadUrl("file:android_asset/www/android/call.html")
-            } else {
-              webView.value = this
-            }
+            this.loadUrl("file:android_asset/www/android/call.html")
          }
        }
      ) { /* WebView */ }
@@ -627,7 +566,6 @@ private class LocalContentWebViewClient(val webView: MutableState<WebView?>, pri
    super.onPageFinished(view, url)
    view.evaluateJavascript("sendMessageToNative = (msg) => WebRTCInterface.postMessage(JSON.stringify(msg))", null)
    webView.value = view
-    staticWebView = view
    Log.d(TAG, "WebRTCView: webview ready")
    // for debugging
    // view.evaluateJavascript("sendMessageToNative = ({resp}) => WebRTCInterface.postMessage(JSON.stringify({command: resp}))", null)
@@ -641,7 +579,6 @@ fun PreviewActiveCallOverlayVideo() {
    ActiveCallOverlayLayout(
      call = Call(
        remoteHostId = null,
-        userProfile = Profile.sampleData,
        contact = Contact.sampleData,
        callState = CallState.Negotiated,
        localMedia = CallMediaType.Video,
@@ -668,7 +605,6 @@ fun PreviewActiveCallOverlayAudio() {
    ActiveCallOverlayLayout(
      call = Call(
        remoteHostId = null,
-        userProfile = Profile.sampleData,
        contact = Contact.sampleData,
        callState = CallState.Negotiated,
        localMedia = CallMediaType.Audio,
--- a/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.android.kt
+++ b/apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.android.kt
@@ -1,112 +1,8 @@
 package chat.simplex.common.views.chatlist

-import android.app.Activity
-import androidx.compose.foundation.*
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.*
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import chat.simplex.common.ANDROID_CALL_TOP_PADDING
-import chat.simplex.common.model.durationText
-import chat.simplex.common.platform.*
-import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.call.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.res.MR
-import dev.icerock.moko.resources.compose.painterResource
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.datetime.Clock
-
-private val CALL_INTERACTIVE_AREA_HEIGHT = 74.dp
-private val CALL_TOP_OFFSET = (-10).dp
-private val CALL_TOP_GREEN_LINE_HEIGHT = ANDROID_CALL_TOP_PADDING - CALL_TOP_OFFSET
-private val CALL_BOTTOM_ICON_OFFSET = (-15).dp
-private val CALL_BOTTOM_ICON_HEIGHT = CALL_INTERACTIVE_AREA_HEIGHT + CALL_BOTTOM_ICON_OFFSET

@Composable
-actual fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>) {
-  val onClick = { platform.androidStartCallActivity(false) }
-  Box(Modifier.offset(y = CALL_TOP_OFFSET).height(CALL_INTERACTIVE_AREA_HEIGHT)) {
-    val source = remember { MutableInteractionSource() }
-    val indication = rememberRipple(bounded = true, 3000.dp)
-    Box(Modifier.height(CALL_TOP_GREEN_LINE_HEIGHT).clickable(onClick = onClick, indication = indication, interactionSource = source)) {
-      GreenLine(call)
-    }
-    Box(
-      Modifier
-        .offset(y = CALL_BOTTOM_ICON_OFFSET)
-        .size(CALL_BOTTOM_ICON_HEIGHT)
-        .background(SimplexGreen, CircleShape)
-        .clip(CircleShape)
-        .clickable(onClick = onClick, indication = indication, interactionSource = source)
-        .align(Alignment.BottomCenter),
-      contentAlignment = Alignment.Center
-    ) {
-      val media = call.peerMedia ?: call.localMedia
-      if (media == CallMediaType.Video) {
-        Icon(painterResource(MR.images.ic_videocam_filled), null, Modifier.size(27.dp).offset(x = 2.5.dp, y = 2.dp), tint = Color.White)
-      } else {
-        Icon(painterResource(MR.images.ic_call_filled), null, Modifier.size(27.dp).offset(x = -0.5.dp, y = 2.dp), tint = Color.White)
-      }
-    }
-  }
-}
-
-@Composable
-private fun GreenLine(call: Call) {
-  Row(
-    Modifier
-      .fillMaxSize()
-      .background(SimplexGreen)
-      .padding(top = -CALL_TOP_OFFSET)
-      .padding(horizontal = DEFAULT_PADDING),
-    verticalAlignment = Alignment.CenterVertically,
-    horizontalArrangement = Arrangement.Center
-  ) {
-    ContactName(call.contact.displayName)
-    Spacer(Modifier.weight(1f))
-    CallDuration(call)
-  }
-  val window = (LocalContext.current as Activity).window
-  DisposableEffect(Unit) {
-    window.statusBarColor = SimplexGreen.toArgb()
-    onDispose {
-      window.statusBarColor = Color.Black.toArgb()
-    }
-  }
-}
-
-@Composable
-private fun ContactName(name: String) {
-  Text(name, Modifier.width(windowWidth() * 0.35f), color = Color.White, maxLines = 1, overflow = TextOverflow.Ellipsis)
-}
-
-@Composable
-private fun CallDuration(call: Call) {
-  val connectedAt = call.connectedAt
-  if (connectedAt != null) {
-    val time = remember { mutableStateOf(durationText(0)) }
-    LaunchedEffect(Unit) {
-      while (true) {
-        time.value = durationText((Clock.System.now() - connectedAt).inWholeSeconds.toInt())
-        delay(250)
-      }
-    }
-    val text = time.value
-    val sp40Or50 = with(LocalDensity.current) { if (text.length >= 6) 60.sp.toDp() else 42.sp.toDp() }
-    val offset = with(LocalDensity.current) { 7.sp.toDp() }
-    Text(text, Modifier.offset(x = offset).widthIn(min = sp40Or50), color = Color.White)
-  }
-}
+actual fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>) {}
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/App.kt
@@ -1,19 +1,16 @@
 package chat.simplex.common

 import androidx.compose.animation.core.Animatable
-import androidx.compose.foundation.*
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.views.usersettings.SetDeliveryReceiptsView
@@ -23,7 +20,8 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.CreateFirstProfile
 import chat.simplex.common.views.helpers.SimpleButton
 import chat.simplex.common.views.SplashView
-import chat.simplex.common.views.call.*
+import chat.simplex.common.views.call.ActiveCallView
+import chat.simplex.common.views.call.IncomingCallAlertView
 import chat.simplex.common.views.chat.ChatView
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.database.DatabaseErrorView
@@ -110,7 +108,6 @@ fun MainScreen() {
    val localUserCreated = chatModel.localUserCreated.value
    var showInitializationView by remember { mutableStateOf(false) }
    when {
-      chatModel.dbMigrationInProgress.value -> DefaultProgressView(stringResource(MR.strings.database_migration_in_progress))
      chatModel.chatDbStatus.value == null && showInitializationView -> DefaultProgressView(stringResource(MR.strings.opening_database))
      showChatDatabaseError -> {
        // Prevent showing keyboard on Android when: passcode enabled and database password not saved
@@ -171,17 +168,7 @@ fun MainScreen() {
      }
    } else {
      if (chatModel.showCallView.value) {
-        if (appPlatform.isAndroid) {
-          LaunchedEffect(Unit) {
-            // This if prevents running the activity in the following condition:
-            // - the activity already started before and was destroyed by collapsing active call (start audio call, press back button, go to a launcher)
-            if (!chatModel.activeCallViewIsCollapsed.value) {
-              platform.androidStartCallActivity(false)
-            }
-          }
-        } else {
-          ActiveCallView()
-        }
+        ActiveCallView()
      } else {
        // It's needed for privacy settings toggle, so it can be shown even if the app is passcode unlocked
        ModalManager.fullscreen.showPasscodeInView()
@@ -218,13 +205,9 @@ fun MainScreen() {
  }
 }

-val ANDROID_CALL_TOP_PADDING = 40.dp
-
@Composable
 fun AndroidScreen(settingsState: SettingsViewState) {
  BoxWithConstraints {
-    val call = remember { chatModel.activeCall} .value
-    val showCallArea = call != null && call.callState != CallState.WaitCapabilities && call.callState != CallState.InvitationAccepted
    var currentChatId by rememberSaveable { mutableStateOf(chatModel.chatId.value) }
    val offset = remember { Animatable(if (chatModel.chatId.value == null) 0f else maxWidth.value) }
    Box(
@@ -232,7 +215,6 @@ fun AndroidScreen(settingsState: SettingsViewState) {
        .graphicsLayer {
          translationX = -offset.value.dp.toPx()
        }
-        .padding(top = if (showCallArea) ANDROID_CALL_TOP_PADDING else 0.dp)
    ) {
      StartPartOfScreen(settingsState)
    }
@@ -259,17 +241,11 @@ fun AndroidScreen(settingsState: SettingsViewState) {
          }
      }
    }
-    Box(Modifier
-      .graphicsLayer { translationX = maxWidth.toPx() - offset.value.dp.toPx() }
-      .padding(top = if (showCallArea) ANDROID_CALL_TOP_PADDING else 0.dp)
-    ) Box2@{
+    Box(Modifier.graphicsLayer { translationX = maxWidth.toPx() - offset.value.dp.toPx() }) Box2@{
      currentChatId?.let {
        ChatView(it, chatModel, onComposed)
      }
    }
-    if (call != null && showCallArea) {
-      ActiveCallInteractiveArea(call, remember { MutableStateFlow(AnimatedViewState.GONE) })
-    }
  }
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -2,7 +2,6 @@ package chat.simplex.common.model

 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.runtime.snapshots.SnapshotStateList
 import androidx.compose.runtime.snapshots.SnapshotStateMap
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.SpanStyle
@@ -49,7 +48,6 @@ object ChatModel {
  val chatDbEncrypted = mutableStateOf<Boolean?>(false)
  val chatDbStatus = mutableStateOf<DBMigrationResult?>(null)
  val ctrlInitInProgress = mutableStateOf(false)
-  val dbMigrationInProgress = mutableStateOf(false)
  val chats = mutableStateListOf<Chat>()
  // map of connections network statuses, key is agent connection id
  val networkStatuses = mutableStateMapOf<String, NetworkStatus>()
@@ -57,7 +55,7 @@ object ChatModel {

  // current chat
  val chatId = mutableStateOf<String?>(null)
-  val chatItems = mutableStateOf(SnapshotStateList<ChatItem>())
+  val chatItems = mutableStateListOf<ChatItem>()
  // rhId, chatId
  val deletedChats = mutableStateOf<List<Pair<Long?, String>>>(emptyList())
  val chatItemStatuses = mutableMapOf<Long, CIStatus>()
@@ -96,7 +94,6 @@ object ChatModel {
  val activeCallInvitation = mutableStateOf<RcvCallInvitation?>(null)
  val activeCall = mutableStateOf<Call?>(null)
  val activeCallViewIsVisible = mutableStateOf<Boolean>(false)
-  val activeCallViewIsCollapsed = mutableStateOf<Boolean>(false)
  val callCommand = mutableStateListOf<WCallCommand>()
  val showCallView = mutableStateOf(false)
  val switchingCall = mutableStateOf(false)
@@ -270,15 +267,18 @@ object ChatModel {
    } else {
      addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
    }
+    Log.d(TAG, "TODOCHAT: addChatItem: adding to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
    withContext(Dispatchers.Main) {
      // add to current chat
      if (chatId.value == cInfo.id) {
+        Log.d(TAG, "TODOCHAT: addChatItem: chatIds are equal, size ${chatItems.size}")
        // Prevent situation when chat item already in the list received from backend
-        if (chatItems.value.none { it.id == cItem.id }) {
-          if (chatItems.value.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
-            chatItems.add(kotlin.math.max(0, chatItems.value.lastIndex), cItem)
+        if (chatItems.none { it.id == cItem.id }) {
+          if (chatItems.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+            chatItems.add(kotlin.math.max(0, chatItems.lastIndex), cItem)
          } else {
            chatItems.add(cItem)
+            Log.d(TAG, "TODOCHAT: addChatItem: added to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
          }
        }
      }
@@ -305,13 +305,14 @@ object ChatModel {
      addChat(Chat(remoteHostId = rhId, chatInfo = cInfo, chatItems = arrayListOf(cItem)))
      res = true
    }
+    Log.d(TAG, "TODOCHAT: upsertChatItem: upserting to chat ${chatId.value} from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
    return withContext(Dispatchers.Main) {
      // update current chat
      if (chatId.value == cInfo.id) {
-        val items = chatItems.value
-        val itemIndex = items.indexOfFirst { it.id == cItem.id }
+        val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
        if (itemIndex >= 0) {
-          items[itemIndex] = cItem
+          chatItems[itemIndex] = cItem
+          Log.d(TAG, "TODOCHAT: upsertChatItem: updated in chat $chatId from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
          false
        } else {
          val status = chatItemStatuses.remove(cItem.id)
@@ -321,6 +322,7 @@ object ChatModel {
            cItem
          }
          chatItems.add(ci)
+          Log.d(TAG, "TODOCHAT: upsertChatItem: added to chat $chatId from ${cInfo.id} ${cItem.id}, size ${chatItems.size}")
          true
        }
      } else {
@@ -332,10 +334,9 @@ object ChatModel {
  suspend fun updateChatItem(cInfo: ChatInfo, cItem: ChatItem, status: CIStatus? = null) {
    withContext(Dispatchers.Main) {
      if (chatId.value == cInfo.id) {
-        val items = chatItems.value
-        val itemIndex = items.indexOfFirst { it.id == cItem.id }
+        val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
        if (itemIndex >= 0) {
-          items[itemIndex] = cItem
+          chatItems[itemIndex] = cItem
        }
      } else if (status != null) {
        chatItemStatuses[cItem.id] = status
@@ -359,10 +360,10 @@ object ChatModel {
    }
    // remove from current chat
    if (chatId.value == cInfo.id) {
-      chatItems.removeAll {
-        val remove = it.id == cItem.id
-        if (remove) { AudioPlayer.stop(it) }
-        remove
+      val itemIndex = chatItems.indexOfFirst { it.id == cItem.id }
+      if (itemIndex >= 0) {
+        AudioPlayer.stop(chatItems[itemIndex])
+        chatItems.removeAt(itemIndex)
      }
    }
  }
@@ -403,7 +404,7 @@ object ChatModel {
  }

  fun removeLiveDummy() {
-    if (chatItems.value.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
+    if (chatItems.lastOrNull()?.id == ChatItem.TEMP_LIVE_CHAT_ITEM_ID) {
      chatItems.removeLast()
    }
  }
@@ -435,14 +436,14 @@ object ChatModel {
    var markedRead = 0
    if (chatId.value == cInfo.id) {
      var i = 0
-      val items = chatItems.value
-      while (i < items.size) {
-        val item = items[i]
+      Log.d(TAG, "TODOCHAT: markItemsReadInCurrentChat: marking read ${cInfo.id}, current chatId ${chatId.value}, size was ${chatItems.size}")
+      while (i < chatItems.count()) {
+        val item = chatItems[i]
        if (item.meta.itemStatus is CIStatus.RcvNew && (range == null || (range.from <= item.id && item.id <= range.to))) {
          val newItem = item.withStatus(CIStatus.RcvRead())
-          items[i] = newItem
+          chatItems[i] = newItem
          if (newItem.meta.itemLive != true && newItem.meta.itemTimed?.ttl != null) {
-            items[i] = newItem.copy(meta = newItem.meta.copy(itemTimed = newItem.meta.itemTimed.copy(
+            chatItems[i] = newItem.copy(meta = newItem.meta.copy(itemTimed = newItem.meta.itemTimed.copy(
              deleteAt = Clock.System.now() + newItem.meta.itemTimed.ttl.toDuration(DurationUnit.SECONDS)))
            )
          }
@@ -450,6 +451,7 @@ object ChatModel {
        }
        i += 1
      }
+      Log.d(TAG, "TODOCHAT: markItemsReadInCurrentChat: marked read ${cInfo.id}, current chatId ${chatId.value}, size now ${chatItems.size}")
    }
    return markedRead
  }
@@ -640,8 +642,7 @@ object ChatModel {
  }

  fun addTerminalItem(item: TerminalItem) {
-    val maxItems = if (appPreferences.developerTools.get()) 500 else 200
-    if (terminalItems.value.size >= maxItems) {
+    if (terminalItems.value.size >= 500) {
      terminalItems.value = terminalItems.value.subList(1, terminalItems.value.size)
    }
    terminalItems.value += item
@@ -2003,46 +2004,6 @@ data class ChatItem (
  }
 }

-fun MutableState<SnapshotStateList<ChatItem>>.add(index: Int, chatItem: ChatItem) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); add(index, chatItem) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.add(chatItem: ChatItem) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); add(chatItem) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.addAll(index: Int, chatItems: List<ChatItem>) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); addAll(index, chatItems) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.addAll(chatItems: List<ChatItem>) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); addAll(chatItems) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.removeAll(block: (ChatItem) -> Boolean) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); removeAll(block) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.removeAt(index: Int) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); removeAt(index) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.removeLast() {
-  value = SnapshotStateList<ChatItem>().apply { addAll(value); removeLast() }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.replaceAll(chatItems: List<ChatItem>) {
-  value = SnapshotStateList<ChatItem>().apply { addAll(chatItems) }
-}
-
-fun MutableState<SnapshotStateList<ChatItem>>.clear() {
-  value = SnapshotStateList<ChatItem>()
-}
-
-fun State<SnapshotStateList<ChatItem>>.asReversed(): MutableList<ChatItem> = value.asReversed()
-
-val State<List<ChatItem>>.size: Int get() = value.size
-
 enum class CIMergeCategory {
  MemberConnected,
  RcvGroupEvent,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -1900,8 +1900,10 @@ object ChatController {
        if (invitation != null) {
          chatModel.callManager.reportCallRemoteEnded(invitation = invitation)
        }
-        withCall(r, r.contact) { call ->
-          withBGApi { chatModel.callManager.endCall(call) }
+        withCall(r, r.contact) { _ ->
+          chatModel.callCommand.add(WCallCommand.End)
+          chatModel.activeCall.value = null
+          chatModel.showCallView.value = false
        }
      }
      is CR.ContactSwitch ->
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt
@@ -43,7 +43,7 @@ val appPreferences: AppPreferences
 val chatController: ChatController = ChatController

 fun initChatControllerAndRunMigrations() {
-  withLongRunningApi {
+  withLongRunningApi(slow = 30_000, deadlock = 60_000) {
    if (appPreferences.chatStopped.get() && appPreferences.storeDBPassphrase.get() && ksDatabasePassword.get() != null) {
      initChatController(startChat = ::showStartChatAfterRestartAlert)
    } else {
@@ -59,23 +59,10 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
    chatModel.ctrlInitInProgress.value = true
    val dbKey = useKey ?: DatabaseUtils.useDatabaseKey()
    val confirm = confirmMigrations ?: if (appPreferences.developerTools.get() && appPreferences.confirmDBUpgrades.get()) MigrationConfirmation.Error else MigrationConfirmation.YesUp
-    var migrated: Array<Any> = chatMigrateInit(dbAbsolutePrefixPath, dbKey, MigrationConfirmation.Error.value)
-    var res: DBMigrationResult = runCatching {
+    val migrated: Array<Any> = chatMigrateInit(dbAbsolutePrefixPath, dbKey, confirm.value)
+    val res: DBMigrationResult = kotlin.runCatching {
      json.decodeFromString<DBMigrationResult>(migrated[0] as String)
    }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
-    val rerunMigration = res is DBMigrationResult.ErrorMigration && when (res.migrationError) {
-      // we don't allow to run down migrations without confirmation in UI, so currently it won't be YesUpDown
-      is MigrationError.Upgrade -> confirm == MigrationConfirmation.YesUp || confirm == MigrationConfirmation.YesUpDown
-      is MigrationError.Downgrade ->  confirm == MigrationConfirmation.YesUpDown
-      is MigrationError.Error -> false
-    }
-    if (rerunMigration) {
-      chatModel.dbMigrationInProgress.value = true
-      migrated = chatMigrateInit(dbAbsolutePrefixPath, dbKey, confirm.value)
-      res = runCatching {
-        json.decodeFromString<DBMigrationResult>(migrated[0] as String)
-      }.getOrElse { DBMigrationResult.Unknown(migrated[0] as String) }
-    }
    val ctrl = if (res is DBMigrationResult.OK) {
      migrated[1] as Long
    } else null
@@ -133,7 +120,6 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
    }
  } finally {
    chatModel.ctrlInitInProgress.value = false
-    chatModel.dbMigrationInProgress.value = false
  }
 }

--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/NtfManager.kt
@@ -55,7 +55,7 @@ abstract class NtfManager {
  }

  fun openChatAction(userId: Long?, chatId: ChatId) {
-    withLongRunningApi {
+    withLongRunningApi(slow = 30_000, deadlock = 60_000) {
      awaitChatStartedIfNeeded(chatModel)
      if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
        // TODO include remote host ID in desktop notifications?
@@ -70,7 +70,7 @@ abstract class NtfManager {
  }

  fun showChatsAction(userId: Long?) {
-    withLongRunningApi {
+    withLongRunningApi(slow = 30_000, deadlock = 60_000) {
      awaitChatStartedIfNeeded(chatModel)
      if (userId != null && userId != chatModel.currentUser.value?.userId && chatModel.currentUser.value != null) {
        // TODO include remote host ID in desktop notifications?
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Platform.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Platform.kt
@@ -1,21 +1,16 @@
 package chat.simplex.common.platform

-import chat.simplex.common.model.ChatId
 import chat.simplex.common.model.NotificationsMode

 interface PlatformInterface {
  suspend fun androidServiceStart() {}
  fun androidServiceSafeStop() {}
-  fun androidCallServiceSafeStop() {}
  fun androidNotificationsModeChanged(mode: NotificationsMode) {}
  fun androidChatStartedAfterBeingOff() {}
  fun androidChatStopped() {}
  fun androidChatInitializedAndStarted() {}
  fun androidIsBackgroundCallAllowed(): Boolean = true
  fun androidSetNightModeIfSupported() {}
-  fun androidStartCallActivity(acceptCall: Boolean, remoteHostId: Long? = null, chatId: ChatId? = null) {}
-  fun androidPictureInPictureAllowed(): Boolean = true
-  fun androidCallEnded() {}
  suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
 }
 /**
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/CallManager.kt
@@ -1,6 +1,6 @@
 package chat.simplex.common.views.call

-import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.helpers.withBGApi
 import kotlinx.datetime.Clock
@@ -23,29 +23,27 @@ class CallManager(val chatModel: ChatModel) {
    }
  }

-  fun acceptIncomingCall(invitation: RcvCallInvitation) = withBGApi {
+  fun acceptIncomingCall(invitation: RcvCallInvitation) {
    val call = chatModel.activeCall.value
-    val contactInfo = chatModel.controller.apiContactInfo(invitation.remoteHostId, invitation.contact.contactId)
-    val profile = contactInfo?.second ?: invitation.user.profile.toProfile()
-    // In case the same contact calling while previous call didn't end yet (abnormal ending of call from the other side)
-    if (call == null || (call.remoteHostId == invitation.remoteHostId && call.contact.id == invitation.contact.id)) {
-      justAcceptIncomingCall(invitation = invitation, profile)
+    if (call == null) {
+      justAcceptIncomingCall(invitation = invitation)
    } else {
-      chatModel.switchingCall.value = true
-      try {
-        endCall(call = call)
-        justAcceptIncomingCall(invitation = invitation, profile)
-      } finally {
-        chatModel.switchingCall.value = false
+      withBGApi {
+        chatModel.switchingCall.value = true
+        try {
+          endCall(call = call)
+          justAcceptIncomingCall(invitation = invitation)
+        } finally {
+          chatModel.switchingCall.value = false
+        }
      }
    }
  }

-  private fun justAcceptIncomingCall(invitation: RcvCallInvitation, userProfile: Profile) {
+  private fun justAcceptIncomingCall(invitation: RcvCallInvitation) {
    with (chatModel) {
      activeCall.value = Call(
        remoteHostId = invitation.remoteHostId,
-        userProfile = userProfile,
        contact = invitation.contact,
        callState = CallState.InvitationAccepted,
        localMedia = invitation.callType.media,
@@ -70,23 +68,17 @@ class CallManager(val chatModel: ChatModel) {
  }

  suspend fun endCall(call: Call) {
-    with(chatModel) {
-      // If there is active call currently and it's with other contact, don't interrupt it
-      if (activeCall.value != null && !(activeCall.value?.remoteHostId == call.remoteHostId && activeCall.value?.contact?.id == call.contact.id)) return
-
-      // Don't destroy WebView if you plan to accept next call right after this one
-      if (!switchingCall.value) {
-        showCallView.value = false
-        activeCall.value = null
-        activeCallViewIsCollapsed.value = false
-        platform.androidCallEnded()
-      }
+    with (chatModel) {
      if (call.callState == CallState.Ended) {
        Log.d(TAG, "CallManager.endCall: call ended")
+        activeCall.value = null
+        showCallView.value = false
      } else {
        Log.d(TAG, "CallManager.endCall: ending call...")
-        //callCommand.add(WCallCommand.End)
+        callCommand.add(WCallCommand.End)
+        showCallView.value = false
        controller.apiEndCall(call.remoteHostId, call.contact)
+        activeCall.value = null
      }
    }
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/call/WebRTC.kt
@@ -7,11 +7,11 @@ import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import java.net.URI
+import java.util.*
 import kotlin.collections.ArrayList

 data class Call(
  val remoteHostId: Long?,
-  val userProfile: Profile,
  val contact: Contact,
  val callState: CallState,
  val localMedia: CallMediaType,
@@ -23,7 +23,7 @@ data class Call(
  val soundSpeaker: Boolean = localMedia == CallMediaType.Video,
  var localCamera: VideoCamera = VideoCamera.User,
  val connectionInfo: ConnectionInfo? = null,
-  var connectedAt: Instant? = null,
+  var connectedAt: Instant? = null
 ) {
  val encrypted: Boolean get() = localEncrypted && sharedKey != null
  val localEncrypted: Boolean get() = localCapabilities?.encryption ?: false
@@ -36,9 +36,6 @@ data class Call(
  }

  val hasMedia: Boolean get() = callState == CallState.OfferSent || callState == CallState.Negotiated || callState == CallState.Connected
-
-  fun supportsVideo(): Boolean = peerMedia == CallMediaType.Video || localMedia == CallMediaType.Video
-
 }

 enum class CallState {
@@ -78,7 +75,6 @@ sealed class WCallCommand {
  @Serializable @SerialName("media") data class Media(val media: CallMediaType, val enable: Boolean): WCallCommand()
  @Serializable @SerialName("camera") data class Camera(val camera: VideoCamera): WCallCommand()
  @Serializable @SerialName("description") data class Description(val state: String, val description: String): WCallCommand()
-  @Serializable @SerialName("layout") data class Layout(val layout: LayoutType): WCallCommand()
  @Serializable @SerialName("end") object End: WCallCommand()
 }

@@ -171,13 +167,6 @@ enum class VideoCamera {
  val flipped: VideoCamera get() = if (this == User) Environment else User
 }

-@Serializable
-enum class LayoutType {
-  @SerialName("default") Default,
-  @SerialName("localVideo") LocalVideo,
-  @SerialName("remoteVideo") RemoteVideo
-}
-
@Serializable
 data class ConnectionState(
  val connectionState: String,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -67,12 +67,14 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
    launch {
      snapshotFlow { chatModel.chatId.value }
        .distinctUntilChanged()
+        .onEach { Log.d(TAG, "TODOCHAT: chatId: activeChatId ${activeChat.value?.id} == new chatId $it ${activeChat.value?.id == it} ") }
        .filterNotNull()
        .collect { chatId ->
          if (activeChat.value?.id != chatId) {
            // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
            // Also for situation when chatId changes after clicking in notification, etc
            activeChat.value = chatModel.getChat(chatId)
+            Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
          }
          markUnreadChatAsRead(activeChat, chatModel)
        }
@@ -92,10 +94,12 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
        }
      }
        .distinctUntilChanged()
+        .onEach { Log.d(TAG, "TODOCHAT: chats: activeChatId ${activeChat.value?.id} == new chatId ${it?.id} ${activeChat.value?.id == it?.id} ") }
        // Only changed chatInfo is important thing. Other properties can be skipped for reducing recompositions
-        .filter { it != null && it.chatInfo != activeChat.value?.chatInfo }
+        .filter { it != null && it?.chatInfo != activeChat.value?.chatInfo }
        .collect {
          activeChat.value = it
+          Log.d(TAG, "TODOCHAT: chats: activeChatId became ${activeChat.value?.id}")
        }
    }
  }
@@ -146,6 +150,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
          },
          attachmentOption,
          attachmentBottomSheetState,
+          chatModel.chatItems,
          searchText,
          useLinkPreviews = useLinkPreviews,
          linkMode = chatModel.simplexLinkMode.value,
@@ -223,17 +228,19 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
          loadPrevMessages = {
            if (chatModel.chatId.value != activeChat.value?.id) return@ChatLayout
            val c = chatModel.getChat(chatModel.chatId.value ?: return@ChatLayout)
-            val firstId = chatModel.chatItems.value.firstOrNull()?.id
+            val firstId = chatModel.chatItems.firstOrNull()?.id
            if (c != null && firstId != null) {
              withBGApi {
+                Log.d(TAG, "TODOCHAT: loadPrevMessages: loading for ${c.id}, current chatId ${ChatModel.chatId.value}, size was ${ChatModel.chatItems.size}")
                apiLoadPrevMessages(c, chatModel, firstId, searchText.value)
+                Log.d(TAG, "TODOCHAT: loadPrevMessages: loaded for ${c.id}, current chatId ${ChatModel.chatId.value}, size now ${ChatModel.chatItems.size}")
              }
            }
          },
          deleteMessage = { itemId, mode ->
            withBGApi {
              val cInfo = chat.chatInfo
-              val toDeleteItem = chatModel.chatItems.value.firstOrNull { it.id == itemId }
+              val toDeleteItem = chatModel.chatItems.firstOrNull { it.id == itemId }
              val toModerate = toDeleteItem?.memberToModerate(chat.chatInfo)
              val groupInfo = toModerate?.first
              val groupMember = toModerate?.second
@@ -301,9 +308,7 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
            withBGApi {
              val cInfo = chat.chatInfo
              if (cInfo is ChatInfo.Direct) {
-                val contactInfo = chatModel.controller.apiContactInfo(chat.remoteHostId, cInfo.contact.contactId)
-                val profile = contactInfo?.second ?: chatModel.currentUser.value?.profile?.toProfile() ?: return@withBGApi
-                chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media, userProfile = profile)
+                chatModel.activeCall.value = Call(remoteHostId = chatRh, contact = cInfo.contact, callState = CallState.WaitCapabilities, localMedia = media)
                chatModel.showCallView.value = true
                chatModel.callCommand.add(WCallCommand.Capabilities(media))
              }
@@ -495,6 +500,7 @@ fun ChatLayout(
  composeView: (@Composable () -> Unit),
  attachmentOption: MutableState<AttachmentOption?>,
  attachmentBottomSheetState: ModalBottomSheetState,
+  chatItems: List<ChatItem>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
  linkMode: SimplexLinkMode,
@@ -581,7 +587,7 @@ fun ChatLayout(
            .padding(contentPadding)
          ) {
            ChatItemsList(
-              chat, unreadCount, composeState, searchValue,
+              chat, unreadCount, composeState, chatItems, searchValue,
              useLinkPreviews, linkMode, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
              receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat,
              updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
@@ -675,7 +681,7 @@ fun ChatInfoToolbar(
          }
        }
      }
-    } else if (activeCall?.contact?.id == chat.id && appPlatform.isDesktop) {
+    } else if (activeCall?.contact?.id == chat.id) {
      barButtons.add {
        val call = remember { chatModel.activeCall }.value
        val connectedAt = call?.connectedAt
@@ -839,6 +845,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
  chat: Chat,
  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
+  chatItems: List<ChatItem>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
  linkMode: SimplexLinkMode,
@@ -867,7 +874,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
 ) {
  val listState = rememberLazyListState()
  val scope = rememberCoroutineScope()
-  ScrollToBottom(chat.id, listState, chatModel.chatItems)
+  ScrollToBottom(chat.id, listState, chatItems)
  var prevSearchEmptiness by rememberSaveable { mutableStateOf(searchValue.value.isEmpty()) }
  // Scroll to bottom when search value changes from something to nothing and back
  LaunchedEffect(searchValue.value.isEmpty()) {
@@ -884,7 +891,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)

  Spacer(Modifier.size(8.dp))
-  val reversedChatItems by remember { derivedStateOf { chatModel.chatItems.asReversed() } }
+  val reversedChatItems by remember { derivedStateOf { chatItems.reversed().toList() } }
  val maxHeightRounded = with(LocalDensity.current) { maxHeight.roundToPx() }
  val scrollToItem: (Long) -> Unit = { itemId: Long ->
    val index = reversedChatItems.indexOfFirst { it.id == itemId }
@@ -937,7 +944,7 @@ fun BoxWithConstraintsScope.ChatItemsList(
          }
        }
        val provider = {
-          providerForGallery(i, chatModel.chatItems.value, cItem.id) { indexInReversed ->
+          providerForGallery(i, chatItems, cItem.id) { indexInReversed ->
            scope.launch {
              listState.scrollToItem(
                kotlin.math.min(reversedChatItems.lastIndex, indexInReversed + 1),
@@ -1060,11 +1067,11 @@ fun BoxWithConstraintsScope.ChatItemsList(
      }
    }
  }
-  FloatingButtons(chatModel.chatItems, unreadCount, chat.chatStats.minUnreadItemId, searchValue, markRead, setFloatingButton, listState)
+  FloatingButtons(chatItems, unreadCount, chat.chatStats.minUnreadItemId, searchValue, markRead, setFloatingButton, listState)
 }

@Composable
-private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems: State<List<ChatItem>>) {
+private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems: List<ChatItem>) {
  val scope = rememberCoroutineScope()
  // Helps to scroll to bottom after moving from Group to Direct chat
  // and prevents scrolling to bottom on orientation change
@@ -1082,7 +1089,7 @@ private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems:
  * When the first visible item (from bottom) is visible (even partially) we can autoscroll to 0 item. Or just scrollBy small distance otherwise
  * */
  LaunchedEffect(Unit) {
-    snapshotFlow { chatItems.value.lastOrNull()?.id }
+    snapshotFlow { chatItems.lastOrNull()?.id }
      .distinctUntilChanged()
      .filter { listState.layoutInfo.visibleItemsInfo.firstOrNull()?.key != it }
      .collect {
@@ -1105,7 +1112,7 @@ private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems:

@Composable
 fun BoxWithConstraintsScope.FloatingButtons(
-  chatItems: State<List<ChatItem>>,
+  chatItems: List<ChatItem>,
  unreadCount: State<Int>,
  minUnreadItemId: Long,
  searchValue: State<String>,
@@ -1139,11 +1146,10 @@ fun BoxWithConstraintsScope.FloatingButtons(
  val bottomUnreadCount by remember {
    derivedStateOf {
      if (unreadCount.value == 0) return@derivedStateOf 0
-      val items = chatItems.value
-      val from = items.lastIndex - firstVisibleIndex - lastIndexOfVisibleItems
-      if (items.size <= from || from < 0) return@derivedStateOf 0
+      val from = chatItems.lastIndex - firstVisibleIndex - lastIndexOfVisibleItems
+      if (chatItems.size <= from || from < 0) return@derivedStateOf 0

-      items.subList(from, items.size).count { it.isRcvNew }
+      chatItems.subList(from, chatItems.size).count { it.isRcvNew }
    }
  }
  val firstVisibleOffset = (-with(LocalDensity.current) { maxHeight.roundToPx() } * 0.8).toInt()
@@ -1189,7 +1195,7 @@ fun BoxWithConstraintsScope.FloatingButtons(
        painterResource(MR.images.ic_check),
        onClick = {
          markRead(
-            CC.ItemRange(minUnreadItemId, chatItems.value[chatItems.size - listState.layoutInfo.visibleItemsInfo.lastIndex - 1].id - 1),
+            CC.ItemRange(minUnreadItemId, chatItems[chatItems.size - listState.layoutInfo.visibleItemsInfo.lastIndex - 1].id - 1),
            bottomUnreadCount
          )
          showDropDown.value = false
@@ -1494,6 +1500,7 @@ fun PreviewChatLayout() {
      composeView = {},
      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
      attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
+      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
      linkMode = SimplexLinkMode.DESCRIPTION,
@@ -1566,6 +1573,7 @@ fun PreviewGroupChatLayout() {
      composeView = {},
      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
      attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
+      chatItems = chatItems,
      searchValue,
      useLinkPreviews = true,
      linkMode = SimplexLinkMode.DESCRIPTION,
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -665,7 +665,7 @@ fun ComposeView(

  fun editPrevMessage() {
    if (composeState.value.contextItem != ComposeContextItem.NoContextItem || composeState.value.preview != ComposePreview.NoPreview) return
-    val lastEditable = chatModel.chatItems.value.findLast { it.meta.editable }
+    val lastEditable = chatModel.chatItems.findLast { it.meta.editable }
    if (lastEditable != null) {
      composeState.value = ComposeState(editingItem = lastEditable, useLinkPreviews = useLinkPreviews)
    }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/AddGroupMembersView.kt
@@ -54,7 +54,7 @@ fun AddGroupMembersView(rhId: Long?, groupInfo: GroupInfo, creatingGroup: Boolea
    },
    inviteMembers = {
      allowModifyMembers = false
-      withLongRunningApi(slow = 30_000, deadlock = 120_000) {
+      withLongRunningApi(slow = 30_000, deadlock = 60_000) {
        for (contactId in selectedContacts) {
          val member = chatModel.controller.apiAddMember(rhId, groupInfo.groupId, contactId, selectedRole.value)
          if (member != null) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt
@@ -3,9 +3,11 @@ package chat.simplex.common.views.chat.group
 import InfoRow
 import SectionBottomSpacer
 import SectionDividerSpaced
+import SectionItemView
 import SectionSpacer
 import SectionTextFooter
 import SectionView
+import TextIconSpaced
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import java.net.URI
 import androidx.compose.foundation.*
@@ -72,8 +74,9 @@ fun GroupMemberInfoView(
            if (chatModel.getContactChat(it) == null) {
              chatModel.addChat(c)
            }
+            chatModel.chatItems.clear()
            chatModel.chatItemStatuses.clear()
-            chatModel.chatItems.replaceAll(c.chatItems)
+            chatModel.chatItems.addAll(c.chatItems)
            chatModel.chatId.value = c.id
            closeAll()
          }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
@@ -527,9 +527,8 @@ fun DeleteItemAction(
          val range = chatViewItemsRange(currIndex, prevHidden)
          if (range != null) {
            val itemIds: ArrayList<Long> = arrayListOf()
-            val reversedChatItems = chatModel.chatItems.asReversed()
            for (i in range) {
-              itemIds.add(reversedChatItems[i].id)
+              itemIds.add(chatModel.chatItems.asReversed()[i].id)
            }
            deleteMessagesAlertDialog(itemIds, generalGetString(MR.strings.delete_message_mark_deleted_warning), deleteMessages = deleteMessages)
          } else {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListNavLinkView.kt
@@ -212,15 +212,18 @@ suspend fun openGroupChat(rhId: Long?, groupId: Long, chatModel: ChatModel) {
 }

 suspend fun openChat(rhId: Long?, chatInfo: ChatInfo, chatModel: ChatModel) {
+  Log.d(TAG, "TODOCHAT: openChat: opening ${chatInfo.id}, current chatId ${ChatModel.chatId.value}, size ${ChatModel.chatItems.size}")
  val chat = chatModel.controller.apiGetChat(rhId, chatInfo.chatType, chatInfo.apiId)
  if (chat != null) {
    openLoadedChat(chat, chatModel)
+    Log.d(TAG, "TODOCHAT: openChat: opened ${chatInfo.id}, current chatId ${ChatModel.chatId.value}, size ${ChatModel.chatItems.size}")
  }
 }

 fun openLoadedChat(chat: Chat, chatModel: ChatModel) {
+  chatModel.chatItems.clear()
  chatModel.chatItemStatuses.clear()
-  chatModel.chatItems.replaceAll(chat.chatItems)
+  chatModel.chatItems.addAll(chat.chatItems)
  chatModel.chatId.value = chat.chatInfo.id
 }

@@ -236,7 +239,8 @@ suspend fun apiFindMessages(ch: Chat, chatModel: ChatModel, search: String) {
  val chatInfo = ch.chatInfo
  val chat = chatModel.controller.apiGetChat(ch.remoteHostId, chatInfo.chatType, chatInfo.apiId, search = search) ?: return
  if (chatModel.chatId.value != chat.id) return
-  chatModel.chatItems.replaceAll(chat.chatItems)
+  chatModel.chatItems.clear()
+  chatModel.chatItems.addAll(0, chat.chatItems)
 }

 suspend fun setGroupMembers(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
@@ -29,7 +29,6 @@ import chat.simplex.common.views.onboarding.WhatsNewView
 import chat.simplex.common.views.onboarding.shouldShowWhatsNew
 import chat.simplex.common.views.usersettings.SettingsView
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.call.Call
 import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.*
@@ -122,12 +121,7 @@ fun ChatListView(chatModel: ChatModel, settingsState: SettingsViewState, setPerf
    }
  }
  if (searchText.value.text.isEmpty()) {
-    if (appPlatform.isDesktop) {
-      val call = remember { chatModel.activeCall }.value
-      if (call != null) {
-        ActiveCallInteractiveArea(call, newChatSheetState)
-      }
-    }
+    DesktopActiveCallOverlayLayout(newChatSheetState)
    // TODO disable this button and sheet for the duration of the switch
    tryOrShowError("NewChatSheet", error = {}) {
      NewChatSheet(chatModel, newChatSheetState, stopped, hideNewChatSheet)
@@ -320,7 +314,7 @@ private fun ToggleFilterDisabledButton() {
 }

@Composable
-expect fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>)
+expect fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>)

 fun connectIfOpenedViaUri(rhId: Long?, uri: URI, chatModel: ChatModel) {
  Log.d(TAG, "connectIfOpenedViaUri: opened via link")
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ShareListView.kt
@@ -85,7 +85,7 @@ private fun ShareListToolbar(chatModel: ChatModel, userPickerState: MutableState
          userPickerState.value = AnimatedViewState.VISIBLE
        }
      }
-      else -> NavigationButtonBack(onButtonClicked = { chatModel.sharedContent.value = null })
+      else -> NavigationButtonBack { chatModel.sharedContent.value = null }
    }
  }
  if (chatModel.chats.size >= 8) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseEncryptionView.kt
@@ -62,7 +62,7 @@ fun DatabaseEncryptionView(m: ChatModel) {
      initialRandomDBPassphrase,
      progressIndicator,
      onConfirmEncrypt = {
-        withLongRunningApi {
+        withLongRunningApi(slow = 30_000, deadlock = 60_000) {
          encryptDatabase(currentKey, newKey, confirmNewKey, initialRandomDBPassphrase, useKeychain, storedKey, progressIndicator)
        }
      }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/database/DatabaseView.kt
@@ -368,7 +368,7 @@ fun chatArchiveTitle(chatArchiveTime: Instant, chatLastStart: Instant): String {
 }

 fun startChat(m: ChatModel, chatLastStart: MutableState<Instant?>, chatDbChanged: MutableState<Boolean>, progressIndicator: MutableState<Boolean>? = null) {
-  withLongRunningApi {
+  withLongRunningApi(slow = 30_000, deadlock = 60_000) {
    try {
      progressIndicator?.value = true
      if (chatDbChanged.value) {
@@ -581,7 +581,7 @@ private fun importArchive(
  progressIndicator.value = true
  val archivePath = saveArchiveFromURI(importedArchiveURI)
  if (archivePath != null) {
-    withLongRunningApi {
+    withLongRunningApi(slow = 60_000, deadlock = 180_000) {
      try {
        m.controller.apiDeleteStorage()
        try {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/CloseSheetBar.kt
@@ -18,7 +18,7 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource

@Composable
-fun CloseSheetBar(close: (() -> Unit)?, showClose: Boolean = true, tintColor: Color = if (close != null) MaterialTheme.colors.primary else MaterialTheme.colors.secondary, endButtons: @Composable RowScope.() -> Unit = {}) {
+fun CloseSheetBar(close: (() -> Unit)?, showClose: Boolean = true, endButtons: @Composable RowScope.() -> Unit = {}) {
  Column(
    Modifier
      .fillMaxWidth()
@@ -35,7 +35,7 @@ fun CloseSheetBar(close: (() -> Unit)?, showClose: Boolean = true, tintColor: Co
          verticalAlignment = Alignment.CenterVertically
        ) {
          if (showClose)  {
-            NavigationButtonBack(tintColor = tintColor, onButtonClicked = close)
+            NavigationButtonBack(onButtonClicked = close)
          } else {
            Spacer(Modifier)
          }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultProgressBar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultProgressBar.kt
@@ -5,7 +5,6 @@ import androidx.compose.material.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.ui.theme.DEFAULT_PADDING

@@ -21,7 +20,7 @@ fun DefaultProgressView(description: String?) {
        strokeWidth = 2.5.dp
      )
      if (description != null) {
-        Text(description, textAlign = TextAlign.Center)
+        Text(description)
      }
    }
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/DefaultTopAppBar.kt
@@ -44,10 +44,10 @@ fun DefaultTopAppBar(
 }

@Composable
-fun NavigationButtonBack(onButtonClicked: (() -> Unit)?, tintColor: Color = if (onButtonClicked != null) MaterialTheme.colors.primary else MaterialTheme.colors.secondary) {
+fun NavigationButtonBack(onButtonClicked: (() -> Unit)?) {
  IconButton(onButtonClicked ?: {}, enabled = onButtonClicked != null) {
    Icon(
-      painterResource(MR.images.ic_arrow_back_ios_new), stringResource(MR.strings.back), tint = tintColor
+      painterResource(MR.images.ic_arrow_back_ios_new), stringResource(MR.strings.back), tint = if (onButtonClicked != null) MaterialTheme.colors.primary else MaterialTheme.colors.secondary
    )
  }
 }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
@@ -29,7 +29,7 @@ fun ModalView(
  }
  Surface(Modifier.fillMaxSize(), contentColor = LocalContentColor.current) {
    Column(if (background != MaterialTheme.colors.background) Modifier.background(background) else Modifier.themedBackground()) {
-      CloseSheetBar(close, showClose, endButtons = endButtons)
+      CloseSheetBar(close, showClose, endButtons)
      Box(modifier) { content() }
    }
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/localauth/LocalAuthView.kt
@@ -49,7 +49,7 @@ fun LocalAuthView(m: ChatModel, authRequest: LocalAuthRequest) {
 }

 private fun deleteStorageAndRestart(m: ChatModel, password: String, completed: (LAResult) -> Unit) {
-  withLongRunningApi {
+  withLongRunningApi(slow = 30_000, deadlock = 60_000) {
    try {
      /** Waiting until [initChatController] finishes */
      while (m.ctrlInitInProgress.value) {
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SetupDatabasePassphrase.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/onboarding/SetupDatabasePassphrase.kt
@@ -50,7 +50,7 @@ fun SetupDatabasePassphrase(m: ChatModel) {
    confirmNewKey,
    progressIndicator,
    onConfirmEncrypt = {
-      withLongRunningApi {
+      withLongRunningApi(slow = 30_000, deadlock = 60_000) {
        if (m.chatRunning.value == true) {
          // Stop chat if it's started before doing anything
          stopChatAsync(m)
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -16,7 +16,6 @@

  <!-- MainActivity.kt -->
  <string name="opening_database">Opening database…</string>
-  <string name="database_migration_in_progress">Database migration is in progress.\nIt may take a few minutes.</string>
  <string name="non_content_uri_alert_title">Invalid file path</string>
  <string name="non_content_uri_alert_text">You shared an invalid file path. Report the issue to the app developers.</string>
  <string name="app_was_crashed">View crashed</string>
@@ -179,9 +178,6 @@
  <!-- SimpleX Chat foreground Service -->
  <string name="simplex_service_notification_title">SimpleX Chat service</string>
  <string name="simplex_service_notification_text">Receiving messages…</string>
-  <string name="call_service_notification_audio_call">Audio call</string>
-  <string name="call_service_notification_video_call">Video call</string>
-  <string name="call_service_notification_end_call">End call</string>
  <string name="hide_notification">Hide</string>

  <!-- Notification channels -->
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/android/call.html
@@ -8,7 +8,6 @@
  <body>
    <video
      id="remote-video-stream"
-      class="inline"
      autoplay
      playsinline
      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
@@ -16,7 +15,6 @@
    ></video>
    <video
      id="local-video-stream"
-      class="inline"
      muted
      autoplay
      playsinline
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/android/style.css
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/android/style.css
@@ -5,14 +5,14 @@ body {
  background-color: black;
 }

-#remote-video-stream.inline {
+#remote-video-stream {
  position: absolute;
  width: 100%;
  height: 100%;
  object-fit: cover;
 }

-#local-video-stream.inline {
+#local-video-stream {
  position: absolute;
  width: 30%;
  max-width: 30%;
@@ -23,20 +23,6 @@ body {
  right: 0;
 }

-#remote-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
-#local-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
 *::-webkit-media-controls {
  display: none !important;
  -webkit-appearance: none !important;
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/call.js
@@ -11,12 +11,6 @@ var VideoCamera;
    VideoCamera["User"] = "user";
    VideoCamera["Environment"] = "environment";
 })(VideoCamera || (VideoCamera = {}));
-var LayoutType;
-(function (LayoutType) {
-    LayoutType["Default"] = "default";
-    LayoutType["LocalVideo"] = "localVideo";
-    LayoutType["RemoteVideo"] = "remoteVideo";
-})(LayoutType || (LayoutType = {}));
 // for debugging
 // var sendMessageToNative = ({resp}: WVApiMessage) => console.log(JSON.stringify({command: resp}))
 var sendMessageToNative = (msg) => console.log(JSON.stringify(msg));
@@ -325,10 +319,6 @@ const processCommand = (function () {
                    localizedDescription = command.description;
                    resp = { type: "ok" };
                    break;
-                case "layout":
-                    changeLayout(command.layout);
-                    resp = { type: "ok" };
-                    break;
                case "end":
                    endCall();
                    resp = { type: "ok" };
@@ -617,28 +607,6 @@ function toggleMedia(s, media) {
    }
    return res;
 }
-function changeLayout(layout) {
-    const local = document.getElementById("local-video-stream");
-    const remote = document.getElementById("remote-video-stream");
-    switch (layout) {
-        case LayoutType.Default:
-            local.className = "inline";
-            remote.className = "inline";
-            local.style.visibility = "visible";
-            remote.style.visibility = "visible";
-            break;
-        case LayoutType.LocalVideo:
-            local.className = "fullscreen";
-            local.style.visibility = "visible";
-            remote.style.visibility = "hidden";
-            break;
-        case LayoutType.RemoteVideo:
-            remote.className = "fullscreen";
-            local.style.visibility = "hidden";
-            remote.style.visibility = "visible";
-            break;
-    }
-}
 // Cryptography function - it is loaded both in the main window and in worker context (if the worker is used)
 function callCryptoFunction() {
    const initialPlainTextRequired = {
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/call.html
@@ -9,7 +9,6 @@
  <body>
    <video
      id="remote-video-stream"
-      class="inline"
      autoplay
      playsinline
      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
@@ -17,7 +16,6 @@
    ></video>
    <video
      id="local-video-stream"
-      class="inline"
      muted
      autoplay
      playsinline
--- a/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/style.css
+++ b/apps/multiplatform/common/src/commonMain/resources/assets/www/desktop/style.css
@@ -5,14 +5,14 @@ body {
  background-color: black;
 }

-#remote-video-stream.inline {
+#remote-video-stream {
  position: absolute;
  width: 100%;
  height: 100%;
  object-fit: cover;
 }

-#local-video-stream.inline {
+#local-video-stream {
  position: absolute;
  width: 20%;
  max-width: 20%;
@@ -23,20 +23,6 @@ body {
  right: 0;
 }

-#remote-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
-#local-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
 *::-webkit-media-controls {
  display: none !important;
  -webkit-appearance: none !important;
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt
@@ -14,7 +14,8 @@ import androidx.compose.ui.input.key.*
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.*
-import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController
+import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.DEFAULT_START_MODAL_WIDTH
 import chat.simplex.common.ui.theme.SimpleXTheme
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/StoreWindowState.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/StoreWindowState.kt
@@ -11,15 +11,7 @@ data class WindowPositionSize(
  val height: Int = 768,
  val x: Int = 0,
  val y: Int = 0,
-) {
-  fun safeValues(): WindowPositionSize =
-    copy(
-      x = x.coerceIn(-500, 10000),
-      y = x.coerceIn(-100, 10000),
-      width = width.coerceIn(100, 10000),
-      height = height.coerceIn(100, 10000)
-    )
-}
+)

 fun getStoredWindowState(): WindowPositionSize =
  try {
@@ -27,7 +19,7 @@ fun getStoredWindowState(): WindowPositionSize =
    var state = if (str == null) {
      WindowPositionSize()
    } else {
-      json.decodeFromString<WindowPositionSize>(str).safeValues()
+      json.decodeFromString(str)
    }

    // For some reason on Linux actual width will be 10.dp less after specifying it here. If we specify 1366,
@@ -41,4 +33,4 @@ fun getStoredWindowState(): WindowPositionSize =
  }

 fun storeWindowState(state: WindowPositionSize) =
-  appPreferences.desktopWindowState.set(json.encodeToString(state.safeValues()))
+  appPreferences.desktopWindowState.set(json.encodeToString(state))
--- a/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt
+++ b/apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.desktop.kt
@@ -3,6 +3,7 @@ package chat.simplex.common.views.chatlist
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
@@ -12,7 +13,6 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
-import chat.simplex.common.views.call.Call
 import chat.simplex.common.views.call.CallMediaType
 import chat.simplex.common.views.chat.item.ItemAction
 import chat.simplex.common.views.helpers.*
@@ -22,9 +22,10 @@ import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.flow.MutableStateFlow

@Composable
-actual fun ActiveCallInteractiveArea(call: Call, newChatSheetState: MutableStateFlow<AnimatedViewState>) {
-  //  if (call.callState == CallState.Connected && !newChatSheetState.collectAsState().value.isVisible()) {
-  if (!newChatSheetState.collectAsState().value.isVisible()) {
+actual fun DesktopActiveCallOverlayLayout(newChatSheetState: MutableStateFlow<AnimatedViewState>) {
+  val call = remember { chatModel.activeCall}.value
+  //  if (call?.callState == CallState.Connected && !newChatSheetState.collectAsState().value.isVisible()) {
+  if (call != null && !newChatSheetState.collectAsState().value.isVisible()) {
      val showMenu = remember { mutableStateOf(false) }
      val media = call.peerMedia ?: call.localMedia
      CompositionLocalProvider(
--- a/apps/multiplatform/gradle.properties
+++ b/apps/multiplatform/gradle.properties
@@ -25,12 +25,12 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2

-android.version_name=5.5.2
-android.version_code=179
+android.version_name=5.5
+android.version_code=175

-desktop.version_name=5.5.2
-desktop.version_code=28
+desktop.version_name=5.5
+desktop.version_code=26

 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2
-compose.version=1.5.10
+compose.version=1.6.0-beta01
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
    type: git
    location: https://github.com/simplex-chat/simplexmq.git
-    tag: a516c2f72c81bb4a433c4065b1b5aa484b8292b1
+    tag: 7a0cd8041bbb7d7ab2f089395a244dc4af0f9e3b

 source-repository-package
    type: git
--- a/flake.nix
+++ b/flake.nix
@@ -385,7 +385,6 @@
                  "chat_send_cmd"
                  "chat_send_remote_cmd"
                  "chat_valid_name"
-                  "chat_json_length"
                  "chat_write_file"
                ];
                postInstall = ''
@@ -488,7 +487,6 @@
                  "chat_send_cmd"
                  "chat_send_remote_cmd"
                  "chat_valid_name"
-                  "chat_json_length"
                  "chat_write_file"
                ];
                postInstall = ''
--- a/libsimplex.dll.def
+++ b/libsimplex.dll.def
@@ -12,7 +12,6 @@ EXPORTS
    chat_parse_server
    chat_password_hash
    chat_valid_name
-    chat_json_length
    chat_encrypt_media
    chat_decrypt_media
    chat_write_file
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 5.5.2.0
+version: 5.5.0.4
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
@@ -36,6 +36,7 @@ dependencies:
  - network >= 3.1.2.7 && < 3.2
  - network-transport == 0.5.6
  - optparse-applicative >= 0.15 && < 0.17
+  - process == 1.6.*
  - random >= 1.1 && < 1.3
  - record-hasfield == 1.0.*
  - simple-logger == 0.1.*
@@ -63,13 +64,11 @@ when:
  - condition: impl(ghc >= 9.6.2)
    dependencies:
      - bytestring == 0.11.*
-      - process == 1.6.*
      - template-haskell == 2.20.*
      - text >= 2.0.1 && < 2.2
  - condition: impl(ghc < 9.6.2)
    dependencies:
      - bytestring == 0.10.*
-      - process >= 1.6 && < 1.6.18
      - template-haskell == 2.16.*
      - text >= 1.2.3.0 && < 1.3

@@ -126,19 +125,13 @@ tests:
      - apps/simplex-broadcast-bot/src
      - apps/simplex-directory-service/src
    main: Test.hs
-    when:
-      - condition: impl(ghc >= 9.6.2)
-        dependencies:
-          - hspec == 2.11.*
-      - condition: impl(ghc < 9.6.2)
-        dependencies:
-          - hspec == 2.7.*
    dependencies:
      - QuickCheck == 2.14.*
      - simplex-chat
      - async == 2.2.*
      - deepseq == 1.4.*
      - generic-random == 1.5.*
+      - hspec == 2.11.*
      - network == 3.1.*
      - silently == 1.2.*
      - stm == 2.5.*
--- a/packages/simplex-chat-webrtc/src/android/call.html
+++ b/packages/simplex-chat-webrtc/src/android/call.html
@@ -8,7 +8,6 @@
  <body>
    <video
      id="remote-video-stream"
-      class="inline"
      autoplay
      playsinline
      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
@@ -16,7 +15,6 @@
    ></video>
    <video
      id="local-video-stream"
-      class="inline"
      muted
      autoplay
      playsinline
--- a/packages/simplex-chat-webrtc/src/android/style.css
+++ b/packages/simplex-chat-webrtc/src/android/style.css
@@ -5,14 +5,14 @@ body {
  background-color: black;
 }

-#remote-video-stream.inline {
+#remote-video-stream {
  position: absolute;
  width: 100%;
  height: 100%;
  object-fit: cover;
 }

-#local-video-stream.inline {
+#local-video-stream {
  position: absolute;
  width: 30%;
  max-width: 30%;
@@ -23,20 +23,6 @@ body {
  right: 0;
 }

-#remote-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
-#local-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
 *::-webkit-media-controls {
  display: none !important;
  -webkit-appearance: none !important;
--- a/packages/simplex-chat-webrtc/src/call.ts
+++ b/packages/simplex-chat-webrtc/src/call.ts
@@ -16,7 +16,6 @@ type WCallCommand =
  | WCEnableMedia
  | WCToggleCamera
  | WCDescription
-  | WCLayout
  | WCEndCall

 type WCallResponse =
@@ -32,7 +31,7 @@ type WCallResponse =
  | WRError
  | WCAcceptOffer

-type WCallCommandTag = "capabilities" | "start" | "offer" | "answer" | "ice" | "media" | "camera" | "description" | "layout" | "end"
+type WCallCommandTag = "capabilities" | "start" | "offer" | "answer" | "ice" | "media" | "camera" | "description" | "end"

 type WCallResponseTag = "capabilities" | "offer" | "answer" | "ice" | "connection" | "connected" | "end" | "ended" | "ok" | "error"

@@ -46,12 +45,6 @@ enum VideoCamera {
  Environment = "environment",
 }

-enum LayoutType {
-  Default = "default",
-  LocalVideo = "localVideo",
-  RemoteVideo = "remoteVideo",
-}
-
 interface IWCallCommand {
  type: WCallCommandTag
 }
@@ -122,11 +115,6 @@ interface WCDescription extends IWCallCommand {
  description: string
 }

-interface WCLayout extends IWCallCommand {
-  type: "layout"
-  layout: LayoutType
-}
-
 interface WRCapabilities extends IWCallResponse {
  type: "capabilities"
  capabilities: CallCapabilities
@@ -527,10 +515,6 @@ const processCommand = (function () {
          localizedDescription = command.description
          resp = {type: "ok"}
          break
-        case "layout":
-          changeLayout(command.layout)
-          resp = {type: "ok"}
-          break
        case "end":
          endCall()
          resp = {type: "ok"}
@@ -840,29 +824,6 @@ function toggleMedia(s: MediaStream, media: CallMediaType): boolean {
  return res
 }

-function changeLayout(layout: LayoutType) {
-  const local = document.getElementById("local-video-stream")!
-  const remote = document.getElementById("remote-video-stream")!
-  switch (layout) {
-    case LayoutType.Default:
-      local.className = "inline"
-      remote.className = "inline"
-      local.style.visibility = "visible"
-      remote.style.visibility = "visible"
-      break
-    case LayoutType.LocalVideo:
-      local.className = "fullscreen"
-      local.style.visibility = "visible"
-      remote.style.visibility = "hidden"
-      break
-    case LayoutType.RemoteVideo:
-      remote.className = "fullscreen"
-      local.style.visibility = "hidden"
-      remote.style.visibility = "visible"
-      break
-  }
-}
-
 type TransformFrameFunc = (key: CryptoKey) => (frame: RTCEncodedVideoFrame, controller: TransformStreamDefaultController) => Promise<void>

 interface CallCrypto {
--- a/packages/simplex-chat-webrtc/src/desktop/call.html
+++ b/packages/simplex-chat-webrtc/src/desktop/call.html
@@ -9,7 +9,6 @@
  <body>
    <video
      id="remote-video-stream"
-      class="inline"
      autoplay
      playsinline
      poster="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII="
@@ -17,7 +16,6 @@
    ></video>
    <video
      id="local-video-stream"
-      class="inline"
      muted
      autoplay
      playsinline
--- a/packages/simplex-chat-webrtc/src/desktop/style.css
+++ b/packages/simplex-chat-webrtc/src/desktop/style.css
@@ -5,14 +5,14 @@ body {
  background-color: black;
 }

-#remote-video-stream.inline {
+#remote-video-stream {
  position: absolute;
  width: 100%;
  height: 100%;
  object-fit: cover;
 }

-#local-video-stream.inline {
+#local-video-stream {
  position: absolute;
  width: 20%;
  max-width: 20%;
@@ -23,20 +23,6 @@ body {
  right: 0;
 }

-#remote-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
-#local-video-stream.fullscreen {
-  position: absolute;
-  height: 100%;
-  width: 100%;
-  object-fit: cover;
-}
-
 *::-webkit-media-controls {
  display: none !important;
  -webkit-appearance: none !important;
--- a/scripts/desktop/build-lib-linux.sh
+++ b/scripts/desktop/build-lib-linux.sh
@@ -20,10 +20,6 @@ root_dir="$(dirname "$(dirname "$(readlink "$0")")")"
 cd $root_dir
 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-${GHC_VERSION}/simplex-chat-*

-exports=( $(sed 's/foreign export ccall "chat_migrate_init_key"//' src/Simplex/Chat/Mobile.hs | sed 's/foreign export ccall "chat_reopen_store"//' |grep "foreign export ccall" | cut -d '"' -f2) )
-for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc -l); if [ $count -ne 1 ]; then echo Wrong exports in libsimplex.dll.def. Add \"$elem\" to that file; exit 1; fi ; done
-for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
-
 rm -rf $BUILD_DIR
 cabal build lib:simplex-chat --ghc-options='-optl-Wl,-rpath,$ORIGIN -flink-rts -threaded'
 cd $BUILD_DIR/build
--- a/scripts/desktop/build-lib-mac.sh
+++ b/scripts/desktop/build-lib-mac.sh
@@ -19,10 +19,6 @@ GHC_LIBS_DIR=$(ghc --print-libdir)

 BUILD_DIR=dist-newstyle/build/$ARCH-*/ghc-*/simplex-chat-*

-exports=( $(sed 's/foreign export ccall "chat_migrate_init_key"//' src/Simplex/Chat/Mobile.hs | sed 's/foreign export ccall "chat_reopen_store"//' |grep "foreign export ccall" | cut -d '"' -f2) )
-for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc -l); if [ $count -ne 1 ]; then echo Wrong exports in libsimplex.dll.def. Add \"$elem\" to that file; exit 1; fi ; done
-for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
-
 rm -rf $BUILD_DIR
 cabal build lib:simplex-chat lib:simplex-chat --ghc-options="-optl-Wl,-rpath,@loader_path -optl-Wl,-L$GHC_LIBS_DIR/$ARCH-osx-ghc-$GHC_VERSION -optl-lHSrts_thr-ghc$GHC_VERSION -optl-lffi"

--- a/scripts/desktop/build-lib-windows.sh
+++ b/scripts/desktop/build-lib-windows.sh
@@ -17,10 +17,6 @@ fi

 BUILD_DIR=dist-newstyle/build/$ARCH-$OS/ghc-*/simplex-chat-*

-exports=( $(sed 's/foreign export ccall "chat_migrate_init_key"//' src/Simplex/Chat/Mobile.hs | sed 's/foreign export ccall "chat_reopen_store"//' |grep "foreign export ccall" | cut -d '"' -f2) )
-for elem in "${exports[@]}"; do count=$(grep -R "$elem$" libsimplex.dll.def | wc -l); if [ $count -ne 1 ]; then echo Wrong exports in libsimplex.dll.def. Add \"$elem\" to that file; exit 1; fi ; done
-for elem in "${exports[@]}"; do count=$(grep -R "\"$elem\"" flake.nix | wc -l); if [ $count -ne 2 ]; then echo Wrong exports in flake.nix. Add \"$elem\" in two places of the file; exit 1; fi ; done
-
 # IMPORTANT: in order to get a working build you should use x86_64 MinGW with make, cmake, gcc.
 # 100% working MinGW is https://github.com/brechtsanders/winlibs_mingw/releases/download/13.1.0-16.0.5-11.0.0-ucrt-r5/winlibs-x86_64-posix-seh-gcc-13.1.0-mingw-w64ucrt-11.0.0-r5.zip
 # Many other distributions I tested don't work in some cases or don't have required tools.
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."a516c2f72c81bb4a433c4065b1b5aa484b8292b1" = "05ny2i262c236li5w040i1nd3l037cpzgbzjknlla9dd139f3al3";
+  "https://github.com/simplex-chat/simplexmq.git"."7a0cd8041bbb7d7ab2f089395a244dc4af0f9e3b" = "0jxf9dnsg14ffd1y3i7md2ninrds4daq1fmpnd6j5z99im07ns52";
  "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
  "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
  "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack

 name:           simplex-chat
-version:        5.5.2.0
+version:        5.5.0.4
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
@@ -197,6 +197,7 @@ library
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -216,13 +217,11 @@ library
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -257,6 +256,7 @@ executable simplex-bot
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -277,13 +277,11 @@ executable simplex-bot
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -318,6 +316,7 @@ executable simplex-bot-advanced
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -338,13 +337,11 @@ executable simplex-bot-advanced
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -381,6 +378,7 @@ executable simplex-broadcast-bot
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -401,13 +399,11 @@ executable simplex-broadcast-bot
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -443,6 +439,7 @@ executable simplex-chat
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -464,13 +461,11 @@ executable simplex-chat
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -510,6 +505,7 @@ executable simplex-directory-service
    , network >=3.1.2.7 && <3.2
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , simple-logger ==0.1.*
@@ -530,13 +526,11 @@ executable simplex-directory-service
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3

@@ -598,6 +592,7 @@ test-suite simplex-chat-test
    , exceptions ==0.10.*
    , filepath ==1.4.*
    , generic-random ==1.5.*
+    , hspec ==2.11.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , memory ==0.18.*
@@ -605,6 +600,7 @@ test-suite simplex-chat-test
    , network ==3.1.*
    , network-transport ==0.5.6
    , optparse-applicative >=0.15 && <0.17
+    , process ==1.6.*
    , random >=1.1 && <1.3
    , record-hasfield ==1.0.*
    , silently ==1.2.*
@@ -626,18 +622,10 @@ test-suite simplex-chat-test
  if impl(ghc >= 9.6.2)
    build-depends:
        bytestring ==0.11.*
-      , process ==1.6.*
      , template-haskell ==2.20.*
      , text >=2.0.1 && <2.2
  if impl(ghc < 9.6.2)
    build-depends:
        bytestring ==0.10.*
-      , process >=1.6 && <1.6.18
      , template-haskell ==2.16.*
      , text >=1.2.3.0 && <1.3
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        hspec ==2.11.*
-  if impl(ghc < 9.6.2)
-    build-depends:
-        hspec ==2.7.*
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -1028,7 +1028,6 @@ processChatCommand' vr = \case
        when (memberActive membership && isOwner) . void $ sendGroupMessage' user gInfo members XGrpDel
        deleteGroupLinkIfExists user gInfo
        deleteMembersConnections user members
-        updateCIGroupInvitationStatus user gInfo CIGISRejected `catchChatError` \_ -> pure ()
        -- functions below are called in separate transactions to prevent crashes on android
        -- (possibly, race condition on integrity check?)
        withStore' $ \db -> deleteGroupConnectionsAndFiles db user gInfo members
@@ -1036,6 +1035,7 @@ processChatCommand' vr = \case
        withStore' $ \db -> deleteGroup db user gInfo
        let contactIds = mapMaybe memberContactId members
        deleteAgentConnectionsAsync user . concat =<< mapM deleteUnusedContact contactIds
+        updateCIGroupInvitationStatus user gInfo CIGISRejected `catchChatError` \_ -> pure ()
        pure $ CRGroupDeletedUser user gInfo
      where
        deleteUnusedContact :: ContactId -> m [ConnId]
--- a/src/Simplex/Chat/Mobile.hs
+++ b/src/Simplex/Chat/Mobile.hs
@@ -271,18 +271,9 @@ chatSendRemoteCmd :: ChatController -> Maybe RemoteHostId -> B.ByteString -> IO
 chatSendRemoteCmd cc rh s = J.encode . APIResponse Nothing rh <$> runReaderT (execChatCommand rh s) cc

 chatRecvMsg :: ChatController -> IO JSONByteString
-chatRecvMsg ChatController {outputQ} = json <$> readChatResponse
+chatRecvMsg ChatController {outputQ} = json <$> atomically (readTBQueue outputQ)
  where
    json (corr, remoteHostId, resp) = J.encode APIResponse {corr, remoteHostId, resp}
-    readChatResponse = do
-      out@(_, _, cr) <- atomically $ readTBQueue outputQ
-      if filterEvent cr then pure out else readChatResponse
-    filterEvent = \case
-      CRGroupSubscribed {} -> False
-      CRGroupEmpty {} -> False
-      CRMemberSubSummary {} -> False
-      CRPendingSubSummary {} -> False
-      _ -> True

 chatRecvMsgWait :: ChatController -> Int -> IO JSONByteString
 chatRecvMsgWait cc time = fromMaybe "" <$> timeout time (chatRecvMsg cc)
--- a/tests/MobileTests.hs
+++ b/tests/MobileTests.hs
@@ -224,6 +224,8 @@ testChatApi tmp = do
  chatSendCmd cc "/_start" `shouldReturn` chatStarted
  chatRecvMsg cc `shouldReturn` networkStatuses
  chatRecvMsg cc `shouldReturn` userContactSubSummary
+  chatRecvMsg cc `shouldReturn` memberSubSummary
+  chatRecvMsgWait cc 10000 `shouldReturn` pendingSubSummary
  chatRecvMsgWait cc 10000 `shouldReturn` ""
  chatParseMarkdown "hello" `shouldBe` "{}"
  chatParseMarkdown "*hello*" `shouldBe` parsedMarkdown
--- a/website/langs/en.json
+++ b/website/langs/en.json
@@ -250,7 +250,5 @@
    "stable-versions-built-by-f-droid-org": "Stable versions built by F-Droid.org",
    "releases-to-this-repo-are-done-1-2-days-later": "The releases to this repo are done 1-2 days later",
    "f-droid-page-f-droid-org-repo-section-text": "SimpleX Chat and F-Droid.org repositories sign builds with the different keys. To switch, please <a href='/docs/guide/chat-profiles.html#move-your-chat-profiles-to-another-device'>export</a> the chat database and re-install the app.",
-    "jobs": "Join team",
-    "please-enable-javascript": "Please enable JavaScript to see the QR code.",
-    "please-use-link-in-mobile-app": "Please use the link in the mobile app"
+    "jobs": "Join team"
 }
--- a/website/src/_includes/contact_page.html
+++ b/website/src/_includes/contact_page.html
@@ -30,12 +30,8 @@
                <div class="absolute mt-[-100px]">
                    <img class="" src="/img/new/contact_page_mobile.png" alt="">
                </div>
-                
-                <noscript class="z-10 flex flex-col items-center pt-[40px] ml-[-15px]">
-                    <p class="text-2xl font-medium text-center max-w-[234px] mb-32">{{ "please-enable-javascript" | i18n({}, lang ) | safe }}</p>
-                </noscript>

-                <div class="z-10 flex flex-col items-center pt-[40px] ml-[-15px] d-none-if-js-disabled">
+                <div class="z-10 flex flex-col items-center pt-[40px] ml-[-15px]">
                    <p class="text-base font-medium text-center max-w-[234px]">{{ "scan-qr-code-from-mobile-app" | i18n({}, lang ) | safe }}</p>
                    <canvas class="conn_req_uri_qrcode"></canvas>
                </div>
@@ -65,11 +61,7 @@
            </div>

            <div class="flex flex-col justify-center items-center w-full max-w-[468px] h-[131px] rounded-[30px] border-[1px] border-[#A8B0B4] dark:border-white border-opacity-60 mb-6 relative">
-                <p class="text-xl font-medium text-grey-black dark:text-white mb-4 d-none-if-js-disabled">{{ "connect-in-app" | i18n({}, lang ) | safe }}</p>
-                <noscript>
-                    <p class="text-xl font-medium text-grey-black dark:text-white mb-4">{{ "please-use-link-in-mobile-app" | i18n({}, lang ) | safe }}</p>
-                </noscript>
-
+                <p class="text-xl font-medium text-grey-black dark:text-white mb-4">{{ "connect-in-app" | i18n({}, lang ) | safe }}</p>
                <a id="mobile_conn_req_uri" class="bg-[#0053D0] text-white py-3 px-8 rounded-[34px] h-[44px] text-[16px] leading-[19px] tracking-[0.02em]">{{ "open-simplex-app" | i18n({}, lang ) | safe }}</a>

                <div class="absolute bg-[#0197FF] h-[44px] w-[44px] rounded-full flex items-center justify-center top-0 left-0 translate-x-[-30%] translate-y-[-30%]">
@@ -77,7 +69,7 @@
                </div>
            </div>

-            <div class="flex flex-col justify-center items-center w-full max-w-[468px] h-[131px] rounded-[30px] border-[1px] border-[#A8B0B4] dark:border-white border-opacity-60 relative d-none-if-js-disabled">
+            <div class="flex flex-col justify-center items-center w-full max-w-[468px] h-[131px] rounded-[30px] border-[1px] border-[#A8B0B4] dark:border-white border-opacity-60 relative">
                <p class="text-xl font-medium text-grey-black dark:text-white max-w-[230px] text-center">{{ "tap-the-connect-button-in-the-app" | i18n({}, lang ) | safe }}</p>

                <div class="absolute bg-[#0197FF] h-[44px] w-[44px] rounded-full flex items-center justify-center top-0 left-0 translate-x-[-30%] translate-y-[-30%]">
@@ -89,7 +81,7 @@
 </section>


-<section class="hidden md:block bg-secondary-bg-light dark:bg-secondary-bg-dark py-[20px] d-none-if-js-disabled">
+<section class="hidden md:block bg-secondary-bg-light dark:bg-secondary-bg-dark py-[20px]">
    <div class="container px-5">
        <div class="text-grey-black dark:text-white">
            
@@ -172,7 +164,3 @@

 {# join simplex #}
 {% include "sections/join_simplex.html" %}
-
-<script>
-    document.querySelectorAll('.d-none-if-js-disabled').forEach(el => el.classList.remove('d-none-if-js-disabled'));
-</script>
--- a/website/src/css/style.css
+++ b/website/src/css/style.css
@@ -957,7 +957,3 @@ p a{
    top: calc(66px + 2rem);
  }
 }
-
-.d-none-if-js-disabled{
-  display: none !important;
-}