Merge branch 'master' into master-android

* Revert "raise lower bound on mtl to a real version (#3499)"

This reverts commit f94c0311c1.

* Revert "core: expand ranges to fit ghc 8.10 & 9.6 (#3496)"

This reverts commit 9a1c7f41f7.

* update simplexmq

* remove netword-transport fork

* compatibility with GHC 8.10.7

* simplexmq

* fix test

* simplexmq, deps

* update sqlcipher deps in sha256nix

* fix index-state in cabal.project

* index-state

* remove import

* add cabal.project.freeze

* simplexmq

* remove freeze

* simplexmq

* bytestring,simplexmq

* template-haskell, simplexmq

* simplexmq

* simplexmq

* simplexmq

* mtl

* simplexmq

* remove duplicate index-state

Dockerfile

@@ -1,41 +1,32 @@
-ARG TAG=22.04
+FROM ubuntu:focal AS build
 
-FROM ubuntu:${TAG} AS build
-
-### Build stage
-
-# Install curl and git and simplex-chat dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev libssl-dev
-
-# Specify bootstrap Haskell versions
-ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.6.3
-ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0
+# Install curl and simplex-chat-related dependencies
+RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev libssl-dev
 
 # Install ghcup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
-
-# Adjust PATH
-ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+RUN a=$(arch); curl https://downloads.haskell.org/~ghcup/$a-linux-ghcup -o /usr/bin/ghcup && \
+    chmod +x /usr/bin/ghcup
 
+# Install ghc
+RUN ghcup install ghc 9.6.3
+# Install cabal
+RUN ghcup install cabal 3.10.1.0
 # Set both as default
-RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
-    ghcup set cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+RUN ghcup set ghc 9.6.3 && \
+    ghcup set cabal 3.10.1.0
 
 COPY . /project
 WORKDIR /project
 
+# Adjust PATH
+ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"
+
 # Adjust build
 RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local
 
 # Compile simplex-chat
 RUN cabal update
-RUN cabal build exe:simplex-chat
+RUN cabal install
 
-# Strip the binary from debug symbols to reduce size
-RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
-    mv "$bin" ./ && \
-    strip ./simplex-chat
-
-# Copy compiled app from build stage
 FROM scratch AS export-stage
-COPY --from=build /project/simplex-chat /
+COPY --from=build /root/.cabal/bin/simplex-chat /

apps/ios/Shared/ContentView.swift

@@ -34,8 +34,6 @@ struct ContentView: View {
     @State private var waitingForOrPassedAuth = true
     @State private var chatListActionSheet: ChatListActionSheet? = nil
 
-    private let callTopPadding: CGFloat = 50
-
     private enum ChatListActionSheet: Identifiable {
         case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
 
@@ -52,28 +50,16 @@ struct ContentView: View {
 
     var body: some View {
         ZStack {
-            let showCallArea = chatModel.activeCall != nil && chatModel.activeCall?.callState != .waitCapabilities && chatModel.activeCall?.callState != .invitationAccepted
             // contentView() has to be in a single branch, so that enabling authentication doesn't trigger re-rendering and close settings.
             // i.e. with separate branches like this settings are closed: `if prefPerformLA { ... contentView() ... } else { contentView() }
             if !prefPerformLA || accessAuthenticated {
                 contentView()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
             } else {
                 lockButton()
-                    .padding(.top, showCallArea ? callTopPadding : 0)
             }
-
-            if showCallArea, let call = chatModel.activeCall {
-                VStack {
-                    activeCallInteractiveArea(call)
-                    Spacer()
-                }
-            }
-
             if chatModel.showCallView, let call = chatModel.activeCall {
                 callView(call)
             }
-
             if !showSettings, let la = chatModel.laRequest {
                 LocalAuthView(authRequest: la)
                     .onDisappear {
@@ -149,11 +135,11 @@ struct ContentView: View {
             if case .onboardingComplete = step,
                chatModel.currentUser != nil {
                 mainView()
-                    .actionSheet(item: $chatListActionSheet) { sheet in
-                        switch sheet {
-                        case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
-                        }
+                .actionSheet(item: $chatListActionSheet) { sheet in
+                    switch sheet {
+                    case let .planAndConnectSheet(sheet): return planAndConnectActionSheet(sheet, dismiss: false)
                     }
+                }
             } else {
                 OnboardingView(onboarding: step)
             }
@@ -177,40 +163,6 @@ struct ContentView: View {
         }
     }
 
-    @ViewBuilder private func activeCallInteractiveArea(_ call: Call) -> some View {
-        HStack {
-            Text(call.contact.displayName).font(.body).foregroundColor(.white)
-            Spacer()
-            CallDuration(call: call)
-        }
-        .padding(.horizontal)
-        .frame(height: callTopPadding - 10)
-        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
-        .onTapGesture {
-            chatModel.activeCallViewIsCollapsed = false
-        }
-    }
-
-    struct CallDuration: View {
-        let call: Call
-        @State var text: String = ""
-        @State var timer: Timer? = nil
-
-        var body: some View {
-            Text(text).frame(minWidth: text.count <= 5 ? 52 : 77, alignment: .leading).offset(x: 4).font(.body).foregroundColor(.white)
-            .onAppear {
-                timer = Timer.scheduledTimer(withTimeInterval: 0.3, repeats: true) { timer in
-                    if let connectedAt = call.connectedAt {
-                        text = durationText(Int(Date.now.timeIntervalSince1970 - connectedAt.timeIntervalSince1970))
-                    }
-                }
-            }
-            .onDisappear {
-                _ = timer?.invalidate()
-            }
-        }
-    }
-
     private func lockButton() -> some View {
         Button(action: authenticateContentViewAccess) { Label("Unlock", systemImage: "lock") }
     }

apps/ios/Shared/Model/ChatModel.swift

@@ -80,7 +80,6 @@ final class ChatModel: ObservableObject {
     @Published var tokenRegistered = false
     @Published var tokenStatus: NtfTknStatus?
     @Published var notificationMode = NotificationsMode.off
-    @Published var notificationServer: String?
     @Published var notificationPreview: NotificationPreviewMode = ntfPreviewModeGroupDefault.get()
     // pending notification actions
     @Published var ntfContactRequest: NTFContactRequest?
@@ -90,7 +89,6 @@ final class ChatModel: ObservableObject {
     @Published var activeCall: Call?
     let callCommand: WebRTCCommandProcessor = WebRTCCommandProcessor()
     @Published var showCallView = false
-    @Published var activeCallViewIsCollapsed = false
     // remote desktop
     @Published var remoteCtrlSession: RemoteCtrlSession?
     // currently showing invitation

apps/ios/Shared/Model/SimpleXAPI.swift

@@ -90,12 +90,12 @@ private func withBGTask<T>(bgDelay: Double? = nil, f: @escaping () -> T) -> T {
     return r
 }
 
-func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) -> ChatResponse {
+func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil) -> ChatResponse {
     logger.debug("chatSendCmd \(cmd.cmdType)")
     let start = Date.now
     let resp = bgTask
-                ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd, ctrl) }
-                : sendSimpleXCmd(cmd, ctrl)
+                ? withBGTask(bgDelay: bgDelay) { sendSimpleXCmd(cmd) }
+                : sendSimpleXCmd(cmd)
     logger.debug("chatSendCmd \(cmd.cmdType): \(resp.responseType)")
     if case let .response(_, json) = resp {
         logger.debug("chatSendCmd \(cmd.cmdType) response: \(json)")
@@ -106,24 +106,24 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
     return resp
 }
 
-func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) async -> ChatResponse {
+func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil) async -> ChatResponse {
     await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl))
+        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay))
     }
 }
 
-func chatRecvMsg(_ ctrl: chat_ctrl? = nil) async -> ChatResponse? {
+func chatRecvMsg() async -> ChatResponse? {
     await withCheckedContinuation { cont in
         _  = withBGTask(bgDelay: msgDelay) { () -> ChatResponse? in
-            let resp = recvSimpleXMsg(ctrl)
+            let resp = recvSimpleXMsg()
             cont.resume(returning: resp)
             return resp
         }
     }
 }
 
-func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
-    let r = chatSendCmdSync(.showActiveUser, ctrl)
+func apiGetActiveUser() throws -> User? {
+    let r = chatSendCmdSync(.showActiveUser)
     switch r {
     case let .activeUser(user): return user
     case .chatCmdError(_, .error(.noActiveUser)): return nil
@@ -131,8 +131,8 @@ func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
     }
 }
 
-func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp), ctrl)
+func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false) throws -> User {
+    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp))
     if case let .activeUser(user) = r { return user }
     throw r
 }
@@ -210,8 +210,8 @@ func apiDeleteUser(_ userId: Int64, _ delSMPQueues: Bool, viewPwd: String?) asyn
     throw r
 }
 
-func apiStartChat(ctrl: chat_ctrl? = nil) throws -> Bool {
-    let r = chatSendCmdSync(.startChat(mainApp: true), ctrl)
+func apiStartChat() throws -> Bool {
+    let r = chatSendCmdSync(.startChat(mainApp: true))
     switch r {
     case .chatStarted: return true
     case .chatRunning: return false
@@ -240,14 +240,20 @@ func apiSuspendChat(timeoutMicroseconds: Int) {
     logger.error("apiSuspendChat error: \(String(describing: r))")
 }
 
-func apiSetTempFolder(tempFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder), ctrl)
+func apiSetTempFolder(tempFolder: String) throws {
+    let r = chatSendCmdSync(.setTempFolder(tempFolder: tempFolder))
     if case .cmdOk = r { return }
     throw r
 }
 
-func apiSetFilesFolder(filesFolder: String, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder), ctrl)
+func apiSetFilesFolder(filesFolder: String) throws {
+    let r = chatSendCmdSync(.setFilesFolder(filesFolder: filesFolder))
+    if case .cmdOk = r { return }
+    throw r
+}
+
+func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
+    let r = chatSendCmdSync(.apiSetXFTPConfig(config: cfg))
     if case .cmdOk = r { return }
     throw r
 }
@@ -276,10 +282,6 @@ func apiStorageEncryption(currentKey: String = "", newKey: String = "") async th
     try await sendCommandOkResp(.apiStorageEncryption(config: DBEncryptionConfig(currentKey: currentKey, newKey: newKey)))
 }
 
-func testStorageEncryption(key: String, _ ctrl: chat_ctrl? = nil) async throws {
-    try await sendCommandOkResp(.testStorageEncryption(key: key), ctrl)
-}
-
 func apiGetChats() throws -> [ChatData] {
     let userId = try currentUserId("apiGetChats")
     return try apiChatsResponse(chatSendCmdSync(.apiGetChats(userId: userId)))
@@ -410,14 +412,14 @@ func apiDeleteMemberChatItem(groupId: Int64, groupMemberId: Int64, itemId: Int64
     throw r
 }
 
-func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String?) {
+func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode) {
     let r = chatSendCmdSync(.apiGetNtfToken)
     switch r {
-    case let .ntfToken(token, status, ntfMode, ntfServer): return (token, status, ntfMode, ntfServer)
-    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off, nil)
+    case let .ntfToken(token, status, ntfMode): return (token, status, ntfMode)
+    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off)
     default:
         logger.debug("apiGetNtfToken response: \(String(describing: r))")
-        return (nil, nil, .off, nil)
+        return (nil, nil, .off)
     }
 }
 
@@ -502,8 +504,8 @@ func getNetworkConfig() async throws -> NetCfg? {
     throw r
 }
 
-func setNetworkConfig(_ cfg: NetCfg, ctrl: chat_ctrl? = nil) throws {
-    let r = chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg), ctrl)
+func setNetworkConfig(_ cfg: NetCfg) throws {
+    let r = chatSendCmdSync(.apiSetNetworkConfig(networkConfig: cfg))
     if case .cmdOk = r { return }
     throw r
 }
@@ -868,26 +870,6 @@ func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
     try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
 
-func uploadStandaloneFile(user: any UserLike, file: CryptoFile, ctrl: chat_ctrl? = nil) async -> (FileTransferMeta?, String?) {
-    let r = await chatSendCmd(.apiUploadStandaloneFile(userId: user.userId, file: file), ctrl)
-    if case let .sndStandaloneFileCreated(_, fileTransferMeta) = r {
-        return (fileTransferMeta, nil)
-    } else {
-        logger.error("uploadStandaloneFile error: \(String(describing: r))")
-        return (nil, String(describing: r))
-    }
-}
-
-func downloadStandaloneFile(user: any UserLike, url: String, file: CryptoFile, ctrl: chat_ctrl? = nil) async -> (RcvFileTransfer?, String?) {
-    let r = await chatSendCmd(.apiDownloadStandaloneFile(userId: user.userId, url: url, file: file), ctrl)
-    if case let .rcvStandaloneFileCreated(_, rcvFileTransfer) = r {
-        return (rcvFileTransfer, nil)
-    } else {
-        logger.error("downloadStandaloneFile error: \(String(describing: r))")
-        return (nil, String(describing: r))
-    }
-}
-
 func receiveFile(user: any UserLike, fileId: Int64, auto: Bool = false) async {
     if let chatItem = await apiReceiveFile(fileId: fileId, encrypted: privacyEncryptLocalFilesGroupDefault.get(), auto: auto) {
         await chatItemSimpleUpdate(user, chatItem)
@@ -933,8 +915,8 @@ func cancelFile(user: User, fileId: Int64) async {
     }
 }
 
-func apiCancelFile(fileId: Int64, ctrl: chat_ctrl? = nil) async -> AChatItem? {
-    let r = await chatSendCmd(.cancelFile(fileId: fileId), ctrl)
+func apiCancelFile(fileId: Int64) async -> AChatItem? {
+    let r = await chatSendCmd(.cancelFile(fileId: fileId))
     switch r {
     case let .sndFileCancelled(_, chatItem, _, _) : return chatItem
     case let .rcvFileCancelled(_, chatItem, _) : return chatItem
@@ -1106,8 +1088,8 @@ func apiMarkChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
     }
 }
 
-private func sendCommandOkResp(_ cmd: ChatCommand, _ ctrl: chat_ctrl? = nil) async throws {
-    let r = await chatSendCmd(cmd, ctrl)
+private func sendCommandOkResp(_ cmd: ChatCommand) async throws {
+    let r = await chatSendCmd(cmd)
     if case .cmdOk = r { return }
     throw r
 }
@@ -1267,6 +1249,7 @@ func initializeChat(start: Bool, confirmStart: Bool = false, dbKey: String? = ni
     }
     try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
     try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+    try setXFTPConfig(getXFTPCfg())
     try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
     m.chatInitialized = true
     m.currentUser = try apiGetActiveUser()
@@ -1326,7 +1309,7 @@ func startChat(refreshInvitations: Bool = true) throws {
         if (refreshInvitations) {
             try refreshCallInvitations()
         }
-        (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
+        (m.savedToken, m.tokenStatus, m.notificationMode) = apiGetNtfToken()
         // deviceToken is set when AppDelegate.application(didRegisterForRemoteNotificationsWithDeviceToken:) is called,
         // when it is called before startChat
         if let token = m.deviceToken {
@@ -1347,16 +1330,6 @@ func startChat(refreshInvitations: Bool = true) throws {
     chatLastStartGroupDefault.set(Date.now)
 }
 
-func startChatWithTemporaryDatabase(ctrl: chat_ctrl) throws -> User? {
-    logger.debug("startChatWithTemporaryDatabase")
-    let migrationActiveUser = try? apiGetActiveUser(ctrl: ctrl) ?? apiCreateActiveUser(Profile(displayName: "Temp", fullName: ""), ctrl: ctrl)
-    try setNetworkConfig(getNetCfg(), ctrl: ctrl)
-    try apiSetTempFolder(tempFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    try apiSetFilesFolder(filesFolder: getMigrationTempFilesDirectory().path, ctrl: ctrl)
-    _ = try apiStartChat(ctrl: ctrl)
-    return migrationActiveUser
-}
-
 func changeActiveUser(_ userId: Int64, viewPwd: String?) {
     do {
         try changeActiveUser_(userId, viewPwd: viewPwd)
@@ -1735,37 +1708,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
     case let .rcvFileSndCancelled(user, aChatItem, _):
         await chatItemSimpleUpdate(user, aChatItem)
         Task { cleanupFile(aChatItem) }
-    case let .rcvFileProgressXFTP(user, aChatItem, _, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
-    case let .rcvFileError(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupFile(aChatItem) }
-        }
+    case let .rcvFileProgressXFTP(user, aChatItem, _, _):
+        await chatItemSimpleUpdate(user, aChatItem)
+    case let .rcvFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
     case let .sndFileStart(user, aChatItem, _):
         await chatItemSimpleUpdate(user, aChatItem)
     case let .sndFileComplete(user, aChatItem, _):
         await chatItemSimpleUpdate(user, aChatItem)
         Task { cleanupDirectFile(aChatItem) }
     case let .sndFileRcvCancelled(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupDirectFile(aChatItem) }
-        }
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupDirectFile(aChatItem) }
     case let .sndFileProgressXFTP(user, aChatItem, _, _, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-        }
+        await chatItemSimpleUpdate(user, aChatItem)
     case let .sndFileCompleteXFTP(user, aChatItem, _):
         await chatItemSimpleUpdate(user, aChatItem)
         Task { cleanupFile(aChatItem) }
-    case let .sndFileError(user, aChatItem, _):
-        if let aChatItem = aChatItem {
-            await chatItemSimpleUpdate(user, aChatItem)
-            Task { cleanupFile(aChatItem) }
-        }
+    case let .sndFileError(user, aChatItem):
+        await chatItemSimpleUpdate(user, aChatItem)
+        Task { cleanupFile(aChatItem) }
     case let .callInvitation(invitation):
         await MainActor.run {
             m.callInvitations[invitation.contact.id] = invitation
@@ -1898,9 +1861,7 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
     let cItem = aChatItem.chatItem
     if active(user) {
         if await MainActor.run(body: { m.upsertChatItem(cInfo, cItem) }) {
-            if cItem.showNotification {
-                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
-            }
+            NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
         }
     }
 }

apps/ios/Shared/Views/Call/ActiveCallView.swift

@@ -12,67 +12,49 @@ import SimpleXChat
 
 struct ActiveCallView: View {
     @EnvironmentObject var m: ChatModel
-    @Environment(\.colorScheme) var colorScheme
     @ObservedObject var call: Call
     @Environment(\.scenePhase) var scenePhase
     @State private var client: WebRTCClient? = nil
     @State private var activeCall: WebRTCClient.Call? = nil
     @State private var localRendererAspectRatio: CGFloat? = nil
     @Binding var canConnectCall: Bool
-    @State var prevColorScheme: ColorScheme = .dark
-    @State var pipShown = false
 
     var body: some View {
-        ZStack(alignment: .topLeading) {
-            ZStack(alignment: .bottom) {
-                if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
-                    GeometryReader { g in
-                        let width = g.size.width * 0.3
-                        ZStack(alignment: .topTrailing) {
-                            CallViewRemote(client: client, activeCall: $activeCall, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, pipShown: $pipShown)
-                            CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
-                                .cornerRadius(10)
-                                .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
-                                .padding([.top, .trailing], 17)
-                            ZStack(alignment: .center) {
-                                // For some reason, when the view in GeometryReader and ZStack is visible, it steals clicks on a back button, so showing something on top like this with background color helps (.clear color doesn't work)
-                            }
-                            .frame(maxWidth: .infinity, maxHeight: .infinity)
-                            .background(Color.primary.opacity(0.000001))
-                        }
+        ZStack(alignment: .bottom) {
+            if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
+                GeometryReader { g in
+                    let width = g.size.width * 0.3
+                    ZStack(alignment: .topTrailing) {
+                        CallViewRemote(client: client, activeCall: $activeCall)
+                        CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio)
+                            .cornerRadius(10)
+                            .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
+                            .padding([.top, .trailing], 17)
                     }
                 }
-                if let call = m.activeCall, let client = client, (!pipShown || !call.supportsVideo) {
-                    ActiveCallOverlay(call: call, client: client)
-                }
+            }
+            if let call = m.activeCall, let client = client {
+                ActiveCallOverlay(call: call, client: client)
             }
         }
-        .allowsHitTesting(!m.activeCallViewIsCollapsed)
-        .opacity(m.activeCallViewIsCollapsed ? 0 : 1)
         .onAppear {
             logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
             AppDelegate.keepScreenOn(true)
             createWebRTCClient()
             dismissAllSheets()
-            hideKeyboard()
-            prevColorScheme = colorScheme
         }
         .onChange(of: canConnectCall) { _ in
             logger.debug("ActiveCallView: canConnectCall changed to \(canConnectCall)")
             createWebRTCClient()
         }
-        .onChange(of: m.activeCallViewIsCollapsed) { _ in
-            hideKeyboard()
-        }
         .onDisappear {
             logger.debug("ActiveCallView: disappear")
             Task { await m.callCommand.setClient(nil) }
             AppDelegate.keepScreenOn(false)
             client?.endCall()
         }
-        .background(m.activeCallViewIsCollapsed ? .clear : .black)
-        // Quite a big delay when opening/closing the view when a scheme changes (globally) this way. It's not needed when CallKit is used since status bar is green with white text on it
-        .preferredColorScheme(m.activeCallViewIsCollapsed || CallController.useCallKit() ? prevColorScheme : .dark)
+        .background(.black)
+        .preferredColorScheme(.dark)
     }
 
     private func createWebRTCClient() {
@@ -87,8 +69,8 @@ struct ActiveCallView: View {
     @MainActor
     private func processRtcMessage(msg: WVAPIMessage) {
         if call == m.activeCall,
-           let call = m.activeCall,
-           let client = client {
+            let call = m.activeCall,
+            let client = client {
             logger.debug("ActiveCallView: response \(msg.resp.respType)")
             switch msg.resp {
             case let .capabilities(capabilities):
@@ -108,7 +90,7 @@ struct ActiveCallView: View {
                 Task {
                     do {
                         try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                                   media: call.localMedia, capabilities: capabilities)
+                                               media: call.localMedia, capabilities: capabilities)
                     } catch {
                         logger.error("apiSendCallOffer \(responseError(error))")
                     }
@@ -140,15 +122,13 @@ struct ActiveCallView: View {
                 if let callStatus = WebRTCCallStatus.init(rawValue: state.connectionState),
                    case .connected = callStatus {
                     call.direction == .outgoing
-                    ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
-                    : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
+                        ? CallController.shared.reportOutgoingCall(call: call, connectedAt: nil)
+                        : CallController.shared.reportIncomingCall(call: call, connectedAt: nil)
                     call.callState = .connected
-                    call.connectedAt = .now
                 }
                 if state.connectionState == "closed" {
                     closeCallView(client)
                     m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                 }
                 Task {
                     do {
@@ -160,7 +140,6 @@ struct ActiveCallView: View {
             case let .connected(connectionInfo):
                 call.callState = .connected
                 call.connectionInfo = connectionInfo
-                call.connectedAt = .now
             case .ended:
                 closeCallView(client)
                 call.callState = .ended
@@ -174,7 +153,6 @@ struct ActiveCallView: View {
                 case .end:
                     closeCallView(client)
                     m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                 default: ()
                 }
             case let .error(message):
@@ -203,7 +181,7 @@ struct ActiveCallOverlay: View {
         VStack {
             switch call.localMedia {
             case .video:
-                videoCallInfoView(call)
+                callInfoView(call, .leading)
                 .foregroundColor(.white)
                 .opacity(0.8)
                 .padding()
@@ -230,25 +208,16 @@ struct ActiveCallOverlay: View {
                 .frame(maxWidth: .infinity, alignment: .center)
 
             case .audio:
-                ZStack(alignment: .topLeading) {
-                    Button {
-                        chatModel.activeCallViewIsCollapsed = true
-                    } label: {
-                        Label("Back", systemImage: "chevron.left")
-                            .padding()
-                            .foregroundColor(.white.opacity(0.8))
-                    }
-                    VStack {
-                        ProfileImage(imageStr: call.contact.profile.image)
-                            .scaledToFit()
-                            .frame(width: 192, height: 192)
-                        audioCallInfoView(call)
-                    }
-                    .foregroundColor(.white)
-                    .opacity(0.8)
-                    .padding()
-                    .frame(maxHeight: .infinity)
+                VStack {
+                    ProfileImage(imageStr: call.contact.profile.image)
+                        .scaledToFit()
+                        .frame(width: 192, height: 192)
+                    callInfoView(call, .center)
                 }
+                .foregroundColor(.white)
+                .opacity(0.8)
+                .padding()
+                .frame(maxHeight: .infinity)
 
                 Spacer()
 
@@ -266,12 +235,12 @@ struct ActiveCallOverlay: View {
         .frame(maxWidth: .infinity)
     }
 
-    private func audioCallInfoView(_ call: Call) -> some View {
+    private func callInfoView(_ call: Call, _ alignment: Alignment) -> some View {
         VStack {
             Text(call.contact.chatViewName)
                 .lineLimit(1)
                 .font(.title)
-                .frame(maxWidth: .infinity, alignment: .center)
+                .frame(maxWidth: .infinity, alignment: alignment)
             Group {
                 Text(call.callState.text)
                 HStack {
@@ -282,36 +251,7 @@ struct ActiveCallOverlay: View {
                 }
             }
             .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .center)
-        }
-    }
-
-    private func videoCallInfoView(_ call: Call) -> some View {
-        VStack {
-            Button {
-                chatModel.activeCallViewIsCollapsed = true
-            } label: {
-                HStack(alignment: .center, spacing: 16) {
-                    Image(systemName: "chevron.left")
-                        .resizable()
-                        .frame(width: 10, height: 18)
-                    Text(call.contact.chatViewName)
-                        .lineLimit(1)
-                        .font(.title)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                }
-            }
-            Group {
-                Text(call.callState.text)
-                HStack {
-                    Text(call.encryptionStatus)
-                    if let connInfo = call.connectionInfo {
-                        Text("(") + Text(connInfo.text) + Text(")")
-                    }
-                }
-            }
-            .font(.subheadline)
-            .frame(maxWidth: .infinity, alignment: .leading)
+            .frame(maxWidth: .infinity, alignment: alignment)
         }
     }
 

apps/ios/Shared/Views/Call/CallManager.swift

@@ -92,7 +92,6 @@ class CallManager {
         if case .ended = call.callState {
             logger.debug("CallManager.endCall: call ended")
             m.activeCall = nil
-            m.activeCallViewIsCollapsed = false
             m.showCallView = false
             completed()
         } else {
@@ -101,7 +100,6 @@ class CallManager {
                 await m.callCommand.processCommand(.end)
                 await MainActor.run {
                     m.activeCall = nil
-                    m.activeCallViewIsCollapsed = false
                     m.showCallView = false
                     completed()
                 }

apps/ios/Shared/Views/Call/CallViewRenderers.swift

@@ -6,20 +6,14 @@
 import SwiftUI
 import WebRTC
 import SimpleXChat
-import AVKit
 
 struct CallViewRemote: UIViewRepresentable {
     var client: WebRTCClient
     var activeCall: Binding<WebRTCClient.Call?>
-    @State var enablePip: (Bool) -> Void = {_ in }
-    @Binding var activeCallViewIsCollapsed: Bool
-    @Binding var pipShown: Bool
 
-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, activeCallViewIsCollapsed: Binding<Bool>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>) {
         self.client = client
         self.activeCall = activeCall
-        self._activeCallViewIsCollapsed = activeCallViewIsCollapsed
-        self._pipShown = pipShown
     }
 
     func makeUIView(context: Context) -> UIView {
@@ -29,120 +23,12 @@ struct CallViewRemote: UIViewRepresentable {
             remoteRenderer.videoContentMode = .scaleAspectFill
             client.addRemoteRenderer(call, remoteRenderer)
             addSubviewAndResize(remoteRenderer, into: view)
-
-            if AVPictureInPictureController.isPictureInPictureSupported() {
-                makeViewWithRTCRenderer(call, remoteRenderer, view, context)
-            }
         }
         return view
     }
-    
-    func makeViewWithRTCRenderer(_ call: WebRTCClient.Call, _ remoteRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
-        let pipRemoteRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteRenderer.videoContentMode = .scaleAspectFill
-        
-        let pipVideoCallViewController = AVPictureInPictureVideoCallViewController()
-        pipVideoCallViewController.preferredContentSize = CGSize(width: 1080, height: 1920)
-        addSubviewAndResize(pipRemoteRenderer, into: pipVideoCallViewController.view)
-        let pipContentSource = AVPictureInPictureController.ContentSource(
-            activeVideoCallSourceView: view,
-            contentViewController: pipVideoCallViewController
-        )
-        
-        let pipController = AVPictureInPictureController(contentSource: pipContentSource)
-        pipController.canStartPictureInPictureAutomaticallyFromInline = true
-        pipController.delegate = context.coordinator
-        context.coordinator.pipController = pipController
-        context.coordinator.willShowHide = { show in
-            if show {
-                client.addRemoteRenderer(call, pipRemoteRenderer)
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-                    activeCallViewIsCollapsed = true
-                }
-            } else {
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-                    activeCallViewIsCollapsed = false
-                }
-            }
-        }
-        context.coordinator.didShowHide = { show in
-            if show {
-                remoteRenderer.isHidden = true
-            } else {
-                client.removeRemoteRenderer(call, pipRemoteRenderer)
-                remoteRenderer.isHidden = false
-            }
-            pipShown = show
-        }
-        DispatchQueue.main.async {
-            enablePip = { enable in
-                if enable != pipShown /* pipController.isPictureInPictureActive */ {
-                    if enable {
-                        pipController.startPictureInPicture()
-                    } else {
-                        pipController.stopPictureInPicture()
-                    }
-                }
-            }
-        }
-    }
-    
-    func makeCoordinator() -> Coordinator {
-        Coordinator()
-    }
 
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView remote")
-        DispatchQueue.main.async {
-            if activeCallViewIsCollapsed != pipShown {
-                enablePip(activeCallViewIsCollapsed)
-            }
-        }
-    }
-    
-    // MARK: - Coordinator
-    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
-        var pipController: AVPictureInPictureController? = nil
-        var willShowHide: (Bool) -> Void = { _ in }
-        var didShowHide: (Bool) -> Void = { _ in }
-        
-        func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(true)
-        }
-
-        func pictureInPictureControllerDidStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(true)
-        }
-
-        func pictureInPictureController(_ pictureInPictureController: AVPictureInPictureController, failedToStartPictureInPictureWithError error: Error) {
-            logger.error("PiP failed to start: \(error.localizedDescription)")
-        }
-        
-        func pictureInPictureControllerWillStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            willShowHide(false)
-        }
-        
-        func pictureInPictureControllerDidStopPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
-            didShowHide(false)
-        }
-
-        deinit {
-            pipController?.stopPictureInPicture()
-            pipController?.canStartPictureInPictureAutomaticallyFromInline = false
-            pipController?.contentSource = nil
-            pipController?.delegate = nil
-            pipController = nil
-        }
-    }
-    
-    class SampleBufferVideoCallView: UIView {
-        override class var layerClass: AnyClass {
-            get { return AVSampleBufferDisplayLayer.self }
-        }
-        
-        var sampleBufferDisplayLayer: AVSampleBufferDisplayLayer {
-            return layer as! AVSampleBufferDisplayLayer
-        }
     }
 }
 
@@ -150,14 +36,11 @@ struct CallViewLocal: UIViewRepresentable {
     var client: WebRTCClient
     var activeCall: Binding<WebRTCClient.Call?>
     var localRendererAspectRatio: Binding<CGFloat?>
-    @State var pipStateChanged: (Bool) -> Void = {_ in }
-    @Binding var pipShown: Bool
 
-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>) {
         self.client = client
         self.activeCall = activeCall
         self.localRendererAspectRatio = localRendererAspectRatio
-        self._pipShown = pipShown
     }
 
     func makeUIView(context: Context) -> UIView {
@@ -167,18 +50,12 @@ struct CallViewLocal: UIViewRepresentable {
             client.addLocalRenderer(call, localRenderer)
             client.startCaptureLocalVideo(call)
             addSubviewAndResize(localRenderer, into: view)
-            DispatchQueue.main.async {
-                pipStateChanged = { shown in
-                    localRenderer.isHidden = shown
-                }
-            }
         }
         return view
     }
 
     func updateUIView(_ view: UIView, context: Context) {
         logger.debug("CallView.updateUIView local")
-        pipStateChanged(pipShown)
     }
 }
 

apps/ios/Shared/Views/Call/WebRTC.swift

@@ -28,7 +28,6 @@ class Call: ObservableObject, Equatable {
     @Published var speakerEnabled = false
     @Published var videoEnabled: Bool
     @Published var connectionInfo: ConnectionInfo?
-    @Published var connectedAt: Date? = nil
 
     init(
         direction: CallDirection,
@@ -60,7 +59,6 @@ class Call: ObservableObject, Equatable {
         }
     }
     var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
-    var supportsVideo: Bool { get { peerMedia == .video || localMedia == .video } }
 }
 
 enum CallDirection {

apps/ios/Shared/Views/Call/WebRTCClient.swift

@@ -331,10 +331,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         activeCall.remoteStream?.add(renderer)
     }
 
-    func removeRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
-        activeCall.remoteStream?.remove(renderer)
-    }
-
     func startCaptureLocalVideo(_ activeCall: Call) {
 #if targetEnvironment(simulator)
         guard
@@ -414,7 +410,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
         guard let call = activeCall.wrappedValue else { return }
         logger.debug("WebRTCClient: ending the call")
         activeCall.wrappedValue = nil
-        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
         call.connection.close()
         call.connection.delegate = nil
         call.frameEncryptor?.delegate = nil

apps/ios/Shared/Views/Chat/ChatItem/CIImageView.swift

@@ -29,9 +29,6 @@ struct CIImageView: View {
                     FullScreenMediaView(chatItem: chatItem, image: uiImage, showView: $showFullScreenImage, scrollProxy: scrollProxy)
                 }
                 .onTapGesture { showFullScreenImage = true }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenImage = false
-                }
             } else if let data = Data(base64Encoded: dropImagePrefix(image)),
                       let uiImage = UIImage(data: data) {
                 imageView(uiImage)

apps/ios/Shared/Views/Chat/ChatItem/CIVideoView.swift

@@ -120,9 +120,6 @@ struct CIVideoView: View {
                         showFullScreenPlayer = urlDecrypted != nil
                     }
                 }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
                 if !decryptionInProgress {
                     Button {
                         decrypt(file: file) {
@@ -171,9 +168,6 @@ struct CIVideoView: View {
                     default: ()
                     }
                 }
-                .onChange(of: m.activeCallViewIsCollapsed) { _ in
-                    showFullScreenPlayer = false
-                }
                 if !videoPlaying {
                     Button {
                         m.stopPreviousRecPlay = url

apps/ios/Shared/Views/Chat/ChatView.swift

@@ -161,15 +161,11 @@ struct ChatView: View {
                     HStack {
                         let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
                         if callsPrefEnabled {
-                            if chatModel.activeCall == nil {
-                                callButton(contact, .audio, imageName: "phone")
-                                    .disabled(!contact.ready || !contact.active)
-                            } else if let call = chatModel.activeCall, call.contact.id == cInfo.id {
-                                endCallButton(call)
-                            }
+                            callButton(contact, .audio, imageName: "phone")
+                                .disabled(!contact.ready || !contact.active)
                         }
                         Menu {
-                            if callsPrefEnabled && chatModel.activeCall == nil {
+                            if callsPrefEnabled {
                                 Button {
                                     CallController.shared.startCall(contact, .video)
                                 } label: {
@@ -426,19 +422,7 @@ struct ChatView: View {
             Image(systemName: imageName)
         }
     }
-
-    private func endCallButton(_ call: Call) -> some View {
-        Button {
-            if let uuid = call.callkitUUID {
-                CallController.shared.endCall(callUUID: uuid)
-            } else {
-                CallController.shared.endCall(call: call) {}
-            }
-        } label: {
-            Image(systemName: "phone.down.fill").tint(.red)
-        }
-    }
-
+    
     private func searchButton() -> some View {
         Button {
             searchMode = true

apps/ios/Shared/Views/Chat/Group/GroupChatInfoView.swift

@@ -234,29 +234,39 @@ struct GroupChatInfoView: View {
                 Spacer()
                 memberInfo(member)
             }
-            
+
+            // revert from this:
             if user {
                 v
-            } else if groupInfo.membership.memberRole >= .admin {
-                // TODO if there are more actions, refactor with lists of swipeActions
-                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
-                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
-                if canBlockForAll && canRemove {
-                    removeSwipe(member, blockForAllSwipe(member, v))
-                } else if canBlockForAll {
-                    blockForAllSwipe(member, v)
-                } else if canRemove {
-                    removeSwipe(member, v)
-                } else {
-                    v
-                }
+            } else if member.canBeRemoved(groupInfo: groupInfo) {
+                removeSwipe(member, blockSwipe(member, v))
             } else {
-                if !member.blockedByAdmin {
-                    blockSwipe(member, v)
-                } else {
-                    v
-                }
+                blockSwipe(member, v)
             }
+            // revert to this: vvv
+//            if user {
+//                v
+//            } else if groupInfo.membership.memberRole >= .admin {
+//                // TODO if there are more actions, refactor with lists of swipeActions
+//                let canBlockForAll = member.canBlockForAll(groupInfo: groupInfo)
+//                let canRemove = member.canBeRemoved(groupInfo: groupInfo)
+//                if canBlockForAll && canRemove {
+//                    removeSwipe(member, blockForAllSwipe(member, v))
+//                } else if canBlockForAll {
+//                    blockForAllSwipe(member, v)
+//                } else if canRemove {
+//                    removeSwipe(member, v)
+//                } else {
+//                    v
+//                }
+//            } else {
+//                if !member.blockedByAdmin {
+//                    blockSwipe(member, v)
+//                } else {
+//                    v
+//                }
+//            }
+            // ^^^
         }
 
         @ViewBuilder private func memberInfo(_ member: GroupMember) -> some View {

apps/ios/Shared/Views/Chat/Group/GroupMemberInfoView.swift

@@ -168,11 +168,24 @@ struct GroupMemberInfoView: View {
                         }
                     }
 
-                    if groupInfo.membership.memberRole >= .admin {
-                        adminDestructiveSection(member)
-                    } else {
-                        nonAdminBlockSection(member)
+                    // revert from this:
+                    Section {
+                        if member.memberSettings.showMessages {
+                            blockMemberButton(member)
+                        } else {
+                            unblockMemberButton(member)
+                        }
+                        if member.canBeRemoved(groupInfo: groupInfo) {
+                            removeMemberButton(member)
+                        }
                     }
+                    // revert to this: vvv
+//                    if groupInfo.membership.memberRole >= .admin {
+//                        adminDestructiveSection(member)
+//                    } else {
+//                        nonAdminBlockSection(member)
+//                    }
+                    // ^^^
 
                     if developerTools {
                         Section("For console") {

apps/ios/Shared/Views/Database/DatabaseEncryptionView.swift

@@ -36,7 +36,6 @@ enum DatabaseEncryptionAlert: Identifiable {
 struct DatabaseEncryptionView: View {
     @EnvironmentObject private var m: ChatModel
     @Binding var useKeychain: Bool
-    var migration: Bool
     @State private var alert: DatabaseEncryptionAlert? = nil
     @State private var progressIndicator = false
     @State private var useKeychainToggle = storeDBPassphraseGroupDefault.get()
@@ -49,12 +48,7 @@ struct DatabaseEncryptionView: View {
 
     var body: some View {
         ZStack {
-            List {
-                if migration {
-                    chatStoppedView()
-                }
-                databaseEncryptionView()
-            }
+            databaseEncryptionView()
             if progressIndicator {
                 ProgressView().scaleEffect(2)
             }
@@ -62,49 +56,47 @@ struct DatabaseEncryptionView: View {
     }
 
     private func databaseEncryptionView() -> some View {
-        Section {
-            if !migration {
+        List {
+            Section {
                 settingsRow(storedKey ? "key.fill" : "key", color: storedKey ? .green : .secondary) {
                     Toggle("Save passphrase in Keychain", isOn: $useKeychainToggle)
-                        .onChange(of: useKeychainToggle) { _ in
-                            if useKeychainToggle {
-                                setUseKeychain(true)
-                            } else if storedKey {
-                                alert = .keychainRemoveKey
-                            } else {
-                                setUseKeychain(false)
-                            }
+                    .onChange(of: useKeychainToggle) { _ in
+                        if useKeychainToggle {
+                            setUseKeychain(true)
+                        } else if storedKey {
+                            alert = .keychainRemoveKey
+                        } else {
+                            setUseKeychain(false)
                         }
-                        .disabled(initialRandomDBPassphrase)
+                    }
+                    .disabled(initialRandomDBPassphrase)
                 }
-            }
 
-            if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
-                PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-            }
-
-            PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
-            PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
-
-            settingsRow("lock.rotation") {
-                Button(migration ? "Set passphrase" : "Update database passphrase") {
-                    alert = currentKey == ""
-                    ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
-                    : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                if !initialRandomDBPassphrase && m.chatDbEncrypted == true {
+                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
                 }
-            }
-            .disabled(
-                (m.chatDbEncrypted == true && currentKey == "") ||
-                currentKey == newKey ||
-                newKey != confirmNewKey ||
-                newKey == "" ||
-                !validKey(currentKey) ||
-                !validKey(newKey)
-            )
-        } header: {
-            Text(migration ? "Database passphrase" : "")
-        } footer: {
-            if !migration {
+
+                PassphraseField(key: $newKey, placeholder: "New passphrase…", valid: validKey(newKey), showStrength: true)
+                PassphraseField(key: $confirmNewKey, placeholder: "Confirm new passphrase…", valid: confirmNewKey == "" || newKey == confirmNewKey)
+
+                settingsRow("lock.rotation") {
+                    Button("Update database passphrase") {
+                        alert = currentKey == ""
+                        ? (useKeychain ? .encryptDatabaseSaved : .encryptDatabase)
+                        : (useKeychain ? .changeDatabaseKeySaved : .changeDatabaseKey)
+                    }
+                }
+                .disabled(
+                    (m.chatDbEncrypted == true && currentKey == "") ||
+                    currentKey == newKey ||
+                    newKey != confirmNewKey ||
+                    newKey == "" ||
+                    !validKey(currentKey) ||
+                    !validKey(newKey)
+                )
+            } header: {
+                Text("")
+            } footer: {
                 VStack(alignment: .leading, spacing: 16) {
                     if m.chatDbEncrypted == false {
                         Text("Your chat database is not encrypted - set passphrase to encrypt it.")
@@ -129,10 +121,6 @@ struct DatabaseEncryptionView: View {
                 }
                 .padding(.top, 1)
                 .font(.callout)
-            } else {
-                Text("Set database passphrase to migrate it")
-                .padding(.top, 1)
-                .font(.callout)
             }
         }
         .onAppear {
@@ -358,6 +346,6 @@ func validKey(_ s: String) -> Bool {
 
 struct DatabaseEncryptionView_Previews: PreviewProvider {
     static var previews: some View {
-        DatabaseEncryptionView(useKeychain: Binding.constant(true), migration: false)
+        DatabaseEncryptionView(useKeychain: Binding.constant(true))
     }
 }

apps/ios/Shared/Views/Database/DatabaseView.swift

@@ -116,7 +116,7 @@ struct DatabaseView: View {
                 let color: Color = unencrypted ? .orange : .secondary
                 settingsRow(unencrypted ? "lock.open" : useKeychain ? "key" : "lock", color: color) {
                     NavigationLink {
-                        DatabaseEncryptionView(useKeychain: $useKeychain, migration: false)
+                        DatabaseEncryptionView(useKeychain: $useKeychain)
                             .navigationTitle("Database passphrase")
                     } label: {
                         Text("Database passphrase")
@@ -485,10 +485,6 @@ func deleteChatAsync() async throws {
     _ = kcDatabasePassword.remove()
     storeDBPassphraseGroupDefault.set(true)
     deleteAppDatabaseAndFiles()
-    // Clean state so when creating new user the app will start chat automatically (see CreateProfile:createProfile())
-    DispatchQueue.main.async {
-        ChatModel.shared.users = []
-    }
 }
 
 struct DatabaseView_Previews: PreviewProvider {

apps/ios/Shared/Views/Database/MigrateToAppGroupView.swift

@@ -216,18 +216,16 @@ struct MigrateToAppGroupView: View {
     }
 }
 
-func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
+func exportChatArchive() async throws -> URL {
     let archiveTime = Date.now
     let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
     let archiveName = "simplex-chat.\(ts).zip"
-    let archivePath = (storagePath ?? getDocumentsDirectory()).appendingPathComponent(archiveName)
+    let archivePath = getDocumentsDirectory().appendingPathComponent(archiveName)
     let config = ArchiveConfig(archivePath: archivePath.path)
     try await apiExportArchive(config: config)
-    if storagePath == nil {
-        deleteOldArchive()
-        UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
-        chatArchiveTimeDefault.set(archiveTime)
-    }
+    deleteOldArchive()
+    UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
+    chatArchiveTimeDefault.set(archiveTime)
     return archivePath
 }
 

apps/ios/Shared/Views/Migration/MigrateFromAnotherDevice.swift

@@ -1,515 +0,0 @@
-//
-//  MigrateFromAnotherDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 23.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private enum MigrationState: Equatable {
-    case pasteOrScanLink(link: String)
-    case linkDownloading(link: String)
-    case downloadProgress(downloadedBytes: Int64, totalBytes: Int64, fileId: Int64, link: String, archivePath: URL, ctrl: chat_ctrl?)
-    case downloadFailed(totalBytes: Int64, link: String, archivePath: URL)
-    case archiveImport(archivePath: String)
-    case passphraseEntering(passphrase: String)
-    case migration(passphrase: String)
-}
-
-private enum MigrateFromAnotherDeviceViewAlert: Identifiable {
-    case chatImportedWithErrors(title: LocalizedStringKey = "Chat database imported",
-                                text: LocalizedStringKey = "Some non-fatal errors occurred during import - you may see Chat console for more details.")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case .chatImportedWithErrors: return "chatImportedWithErrors"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateFromAnotherDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @State private var migrationState: MigrationState = .pasteOrScanLink(link: "")
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var alert: MigrateFromAnotherDeviceViewAlert?
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    @State private var backDisabled: Bool = false
-    @State private var showQRCodeScanner: Bool = true
-
-    var body: some View {
-        VStack {
-            switch migrationState {
-            case let .pasteOrScanLink(link):
-                pasteOrScanLinkView(link)
-            case let .linkDownloading(link):
-                linkDownloadingView(link)
-            case let .downloadProgress(downloaded, total, _, link, archivePath, _):
-                downloadProgressView(downloaded, totalBytes: total, link, archivePath)
-            case let .downloadFailed(total, link, archivePath):
-                downloadFailedView(totalBytes: total, link, archivePath)
-            case let .archiveImport(archivePath):
-                archiveImportView(archivePath)
-            case let .passphraseEntering(passphrase):
-                PassphraseEnteringView(migrationState: $migrationState, currentKey: passphrase, alert: $alert)
-            case let .migration(passphrase):
-                migrationView(passphrase)
-            }
-        }
-        .modifier(BackButton(label: "Back") {
-            if !backDisabled {
-                dismiss()
-            }
-        })
-        .onChange(of: migrationState) { state in
-            backDisabled = switch migrationState {
-            case .passphraseEntering: true
-            case .migration: true
-            default: false
-            }
-        }
-        .onDisappear {
-            Task {
-                if case let .downloadProgress(_, _, fileId, _, _, ctrl) = migrationState, let ctrl {
-                    await stopArchiveDownloading(fileId, ctrl)
-                }
-                chatReceiver?.stop()
-                try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_chat.db")
-                try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_agent.db")
-                try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .chatImportedWithErrors(title, text): 
-                return Alert(title: Text(title), message: Text(text))
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func pasteOrScanLinkView(_ link: String) -> some View {
-        ZStack {
-            List {
-                Section("Paste link to an archive") {
-                    pasteLinkView()
-                }
-                Section("Or scan QR code") {
-                    ScannerInView(showQRCodeScanner: $showQRCodeScanner) { resp in
-                        switch resp {
-                        case let .success(r):
-                            let link = r.string
-                            if strHasSimplexFileLink(link.trimmingCharacters(in: .whitespaces)) {
-                                migrationState = .linkDownloading(link: link.trimmingCharacters(in: .whitespaces))
-                            } else {
-                                alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                            }
-                        case let .failure(e):
-                            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-                            alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private func pasteLinkView() -> some View {
-        Button {
-            if let str = UIPasteboard.general.string {
-                if strHasSimplexFileLink(str.trimmingCharacters(in: .whitespaces)) {
-                    migrationState = .linkDownloading(link: str.trimmingCharacters(in: .whitespaces))
-                } else {
-                    alert = .error(title: "Invalid link", error: "The text you pasted is not a SimpleX link.")
-                }
-            }
-        } label: {
-            Text("Tap to paste link")
-        }
-        .disabled(!ChatModel.shared.pasteboardHasStrings)
-        .frame(maxWidth: .infinity, alignment: .center)
-    }
-
-    private func linkDownloadingView(_ link: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading link details…")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            downloadLinkDetails(link)
-        }
-    }
-
-    private func downloadProgressView(_ downloadedBytes: Int64, totalBytes: Int64, _ link: String, _ archivePath: URL) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Downloading archive…")
-                }
-            }
-            let ratio = Float(downloadedBytes) / Float(totalBytes)
-            largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: downloadedBytes, countStyle: .binary)) downloaded")
-        }
-    }
-
-    private func downloadFailedView(totalBytes: Int64, _ link: String, _ archivePath: URL) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .downloadProgress(downloadedBytes: 0, totalBytes: totalBytes, fileId: 0, link: link, archivePath: archivePath, ctrl: nil)
-                }) {
-                    settingsRow("tray.and.arrow.down") {
-                        Text("Repeat download").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Download failed")
-            } footer: {
-                Text("You can give another try")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stop()
-            try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_chat.db")
-            try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_agent.db")
-        }
-    }
-
-    private func archiveImportView(_ archivePath: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Importing archive…")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            importArchive(archivePath)
-        }
-    }
-
-    private func migrationView(_ passphrase: String) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Migrating…")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            startChat(passphrase)
-        }
-    }
-
-    private func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey) -> some View {
-        ZStack {
-            VStack {
-                Text(description)
-                    .font(.title3)
-                    .hidden()
-
-                Text(title)
-                    .font(.system(size: 60))
-                    .foregroundColor(.accentColor)
-
-                Text(description)
-                    .font(.title3)
-            }
-
-            Circle()
-                .trim(from: 0, to: CGFloat(value))
-                .stroke(
-                    Color.accentColor,
-                    style: StrokeStyle(lineWidth: 30)
-                )
-                .rotationEffect(.degrees(-90))
-                .animation(.linear, value: value)
-                .frame(maxWidth: .infinity)
-                .padding(.horizontal)
-                .padding(.horizontal)
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func downloadLinkDetails(_ link: String) {
-        let archiveTime = Date.now
-        let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
-        let archiveName = "simplex-chat.\(ts).zip"
-        let archivePath = getMigrationTempFilesDirectory().appendingPathComponent(archiveName)
-
-        startDownloading(0, link, archivePath)
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startDownloading(_ totalBytes: Int64, _ link: String, _ archivePath: URL) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl) { msg in
-                Task {
-                    await TerminalItems.shared.add(.resp(.now, msg))
-                }
-                logger.debug("processReceivedMsg: \(msg.responseType)")
-                await MainActor.run {
-                    switch msg {
-                    case let .rcvFileProgressXFTP(_, _, receivedSize, totalSize, rcvFileTransfer):
-                        migrationState = .downloadProgress(downloadedBytes: receivedSize, totalBytes: totalSize, fileId: rcvFileTransfer.fileId, link: link, archivePath: archivePath, ctrl: ctrl)
-                    case .rcvStandaloneFileComplete:
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .archiveImport(archivePath: archivePath.path)
-                        }
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await downloadStandaloneFile(user: user, url: link, file: CryptoFile.plain(archivePath.lastPathComponent), ctrl: ctrl)
-            if res == nil {
-                migrationState = .downloadFailed(totalBytes: totalBytes, link: link, archivePath: archivePath)
-                return alert = .error(title: "Error downloading the archive", error: error ?? "")
-            }
-        }
-    }
-
-    private func importArchive(_ archivePath: String) {
-        Task {
-            do {
-                try await apiDeleteStorage()
-                do {
-                    let config = ArchiveConfig(archivePath: archivePath)
-                    let archiveErrors = try await apiImportArchive(config: config)
-                    if !archiveErrors.isEmpty {
-                        alert = .chatImportedWithErrors()
-                    }
-                    migrationState = .passphraseEntering(passphrase: "")
-                } catch let error {
-                    alert = .error(title: "Error importing chat database", error: responseError(error))
-                }
-            } catch let error {
-                alert = .error(title: "Error deleting chat database", error: responseError(error))
-            }
-        }
-    }
-
-
-    private func stopArchiveDownloading(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func cancelMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await stopArchiveDownloading(fileId, ctrl)
-            await MainActor.run {
-                dismiss()
-            }
-        }
-    }
-
-    private func startChat(_ passphrase: String) {
-        _ = kcDatabasePassword.set(passphrase)
-        storeDBPassphraseGroupDefault.set(true)
-        initialRandomDBPassphraseGroupDefault.set(false)
-        AppChatState.shared.set(.active)
-        Task {
-            do {
-//                resetChatCtrl()
-                try initializeChat(start: true, confirmStart: false, dbKey: passphrase, refreshInvitations: true)
-                await MainActor.run {
-                    hideView()
-                    AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Notify another device")
-                }
-            } catch let error {
-                hideView()
-                AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
-            }
-        }
-    }
-
-    private func hideView() {
-        onboardingStageDefault.set(.onboardingComplete)
-        m.onboardingStage = .onboardingComplete
-        dismiss()
-    }
-
-    private func strHasSimplexFileLink(_ text: String) -> Bool {
-        text.starts(with: "simplex:/file") || text.starts(with: "https://simplex.chat/file")
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseEnteringView: View {
-    @Binding var migrationState: MigrationState
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State var currentKey: String
-    @State private var verifyingPassphrase: Bool = false
-    @Binding var alert: MigrateFromAnotherDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                Section {
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            let (status, ctrl) = chatInitTemporaryDatabase(url: getAppDatabasePath(), key: currentKey)
-                            let success = switch status {
-                            case .ok, .invalidConfirmation: true
-                            default: false
-                            }
-                            if success {
-//                                if let ctrl {
-//                                    chat_close_store(ctrl)
-//                                }
-                                applyChatCtrl(ctrl: ctrl, result: (currentKey != "", status))
-                                migrationState = .migration(passphrase: currentKey)
-                            } else {
-                                showErrorOnMigrationIfNeeded(status, $alert)
-                            }
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow("key", color: .secondary) {
-                            Text("Open chat")
-                        }
-                    }
-                } header: {
-                    Text("Enter passphrase")
-                } footer: {
-                    Text("Passphrase will be stored on device in Keychain. It's required for notifications to work. You can change it later in settings")
-                        .font(.callout)
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateFromAnotherDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stop() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-    }
-}
-
-struct MigrateFromAnotherDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateFromAnotherDevice()
-    }
-}

apps/ios/Shared/Views/Migration/MigrateToAnotherDevice.swift

@@ -1,670 +0,0 @@
-//
-//  MigrateToAnotherDevice.swift
-//  SimpleX (iOS)
-//
-//  Created by Avently on 14.02.2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import SimpleXChat
-
-private enum MigrationState: Equatable {
-    case initial
-    case chatStopInProgress
-    case chatStopFailed(reason: String)
-    case passphraseNotSet
-    case passphraseConfirmation
-    case uploadConfirmation
-    case archiving
-    case uploadProgress(uploadedBytes: Int64, totalBytes: Int64, fileId: Int64, archivePath: URL, ctrl: chat_ctrl?)
-    case uploadFailed(totalBytes: Int64, archivePath: URL)
-    case linkCreation(totalBytes: Int64)
-    case linkShown(fileId: Int64, link: String, archivePath: URL, ctrl: chat_ctrl)
-    case finished
-}
-
-private enum MigrateToAnotherDeviceViewAlert: Identifiable {
-    case deleteChat(_ title: LocalizedStringKey = "Delete chat profile?", _ text: LocalizedStringKey = "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.")
-    case startChat(_ title: LocalizedStringKey = "Start chat?", _ text: LocalizedStringKey = "Warning: starting chat on multiple devices is not supported and will cause message delivery failures")
-
-    case wrongPassphrase(title: LocalizedStringKey = "Wrong passphrase!", message: LocalizedStringKey = "Enter correct passphrase.")
-    case invalidConfirmation(title: LocalizedStringKey = "Invalid migration confirmation")
-    case keychainError(_ title: LocalizedStringKey = "Keychain error")
-    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
-    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
-
-    case error(title: LocalizedStringKey, error: String = "")
-
-    var id: String {
-        switch self {
-        case let .deleteChat(title, text): return "\(title) \(text)"
-        case let .startChat(title, text): return "\(title) \(text)"
-
-        case .wrongPassphrase: return "wrongPassphrase"
-        case .invalidConfirmation: return "invalidConfirmation"
-        case .keychainError: return "keychainError"
-        case let .databaseError(title, message): return "\(title) \(message)"
-        case let .unknownError(title, message): return "\(title) \(message)"
-
-        case let .error(title, _): return "error \(title)"
-        }
-    }
-}
-
-struct MigrateToAnotherDevice: View {
-    @EnvironmentObject var m: ChatModel
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showSettings: Bool
-    @State private var migrationState: MigrationState = .initial
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @AppStorage(GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE, store: groupDefaults) private var initialRandomDBPassphrase: Bool = false
-    @State private var alert: MigrateToAnotherDeviceViewAlert?
-    @State private var authorized = !UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA)
-    @State private var chatWasStoppedInitially: Bool = true
-    private let tempDatabaseUrl = urlForTemporaryDatabase()
-    @State private var chatReceiver: MigrationChatReceiver? = nil
-    @State private var backDisabled: Bool = false
-
-    var body: some View {
-        if authorized {
-            migrateView()
-        } else {
-            Button(action: runAuth) { Label("Unlock", systemImage: "lock") }
-                .onAppear(perform: runAuth)
-        }
-    }
-
-    private func runAuth() { authorize(NSLocalizedString("Open migration to another device", comment: "authentication reason"), $authorized) }
-
-    func migrateView() -> some View {
-        VStack {
-            switch migrationState {
-            case .initial: EmptyView()
-            case .chatStopInProgress:
-                chatStopInProgressView()
-            case let .chatStopFailed(reason):
-                chatStopFailedView(reason)
-            case .passphraseNotSet:
-                passphraseNotSetView()
-            case .passphraseConfirmation:
-                PassphraseConfirmationView(migrationState: $migrationState, alert: $alert)
-            case .uploadConfirmation:
-                uploadConfirmationView()
-            case .archiving:
-                archivingView()
-            case let .uploadProgress(uploaded, total, _, archivePath, _):
-                uploadProgressView(uploaded, totalBytes: total, archivePath)
-            case let .uploadFailed(total, archivePath):
-                uploadFailedView(totalBytes: total, archivePath)
-            case let .linkCreation(totalBytes):
-                linkCreationView(totalBytes)
-            case let .linkShown(fileId, link, archivePath, ctrl):
-                linkView(fileId, link, archivePath, ctrl)
-            case .finished:
-                finishedView()
-            }
-        }
-        .modifier(BackButton(label: "Back") {
-            if !backDisabled {
-                dismiss()
-            }
-        })
-        .onChange(of: migrationState) { state in
-            backDisabled = switch migrationState {
-            case .linkCreation: true
-            case .linkShown: true
-            default: false
-            }
-        }
-        .onAppear {
-            if case .initial = migrationState {
-                if m.chatRunning == false {
-                    migrationState = initialRandomDBPassphrase ? .passphraseNotSet : .passphraseConfirmation
-                    chatWasStoppedInitially = true
-                } else {
-                    migrationState = .chatStopInProgress
-                    chatWasStoppedInitially = false
-                    stopChat()
-                }
-            }
-        }
-        .onDisappear {
-            if case .linkShown = migrationState {} else if case .finished = migrationState {} else if !chatWasStoppedInitially {
-                Task {
-                    AppChatState.shared.set(.active)
-                    try? startChat(refreshInvitations: true)
-                }
-            }
-            Task {
-                if case let .uploadProgress(_, _, fileId, _, ctrl) = migrationState, let ctrl {
-                    await cancelUploadedAchive(fileId, ctrl)
-                }
-                chatReceiver?.stop()
-                try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_chat.db")
-                try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_agent.db")
-                try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
-            }
-        }
-        .alert(item: $alert) { alert in
-            switch alert {
-            case let .startChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .destructive(Text("Start chat")) {
-                        startChatAndDismiss()
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .deleteChat(title, text):
-                return Alert(
-                    title: Text(title),
-                    message: Text(text),
-                    primaryButton: .destructive(Text("Delete")) {
-                        deleteChatAndDismiss()
-                    },
-                    secondaryButton: .cancel()
-                )
-            case let .wrongPassphrase(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .invalidConfirmation(title):
-                return Alert(title: Text(title))
-            case let .keychainError(title):
-                return Alert(title: Text(title))
-            case let .databaseError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .unknownError(title, message):
-                return Alert(title: Text(title), message: Text(message))
-            case let .error(title, error):
-                return Alert(title: Text(title), message: Text(error))
-            }
-        }
-        .interactiveDismissDisabled(backDisabled)
-    }
-
-    private func chatStopInProgressView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Stopping chat")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func chatStopFailedView(_ reason: String) -> some View {
-        Section {
-            Text(reason)
-            Button(action: stopChat) {
-                settingsRow("stop.fill") {
-                    Text("Stop chat").foregroundColor(.red)
-                }
-            }
-        } header: {
-            Text("Error stopping chat")
-        } footer: {
-            Text("In order to continue, chat should be stopped")
-                .font(.callout)
-        }
-    }
-
-    private func passphraseNotSetView() -> some View {
-        DatabaseEncryptionView(useKeychain: $useKeychain, migration: true)
-            .onChange(of: initialRandomDBPassphrase) { initial in
-                if !initial {
-                    migrationState = .uploadConfirmation
-                }
-            }
-    }
-
-    private func uploadConfirmationView() -> some View {
-        List {
-            Section {
-                Button(action: { migrationState = .archiving }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Archive and upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Confirm upload")
-            } footer: {
-                Text("All your contacts, conversations and files will be archived and uploaded as encrypted file to configured XFTP relays")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func archivingView() -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Archiving database…")
-                }
-            }
-            progressView()
-        }
-        .onAppear {
-            exportArchive()
-        }
-    }
-
-    private func uploadProgressView(_ uploadedBytes: Int64, totalBytes: Int64, _ archivePath: URL) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Uploading archive…")
-                }
-            }
-            let ratio = Float(uploadedBytes) / Float(totalBytes)
-            largeProgressView(ratio, "\(Int(ratio * 100))%", "\(ByteCountFormatter.string(fromByteCount: uploadedBytes, countStyle: .binary)) uploaded")
-        }
-        .onAppear {
-            startUploading(totalBytes, archivePath)
-        }
-    }
-
-    private func uploadFailedView(totalBytes: Int64, _ archivePath: URL) -> some View {
-        List {
-            Section {
-                Button(action: {
-                    migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                }) {
-                    settingsRow("tray.and.arrow.up") {
-                        Text("Repeat upload").foregroundColor(.accentColor)
-                    }
-                }
-            } header: {
-                Text("Upload failed")
-            } footer: {
-                Text("You can give another try")
-                    .font(.callout)
-            }
-        }
-        .onAppear {
-            chatReceiver?.stop()
-            try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_chat.db")
-            try? FileManager.default.removeItem(atPath: "\(tempDatabaseUrl.path)_agent.db")
-        }
-    }
-
-    private func linkCreationView(_ totalBytes: Int64) -> some View {
-        ZStack {
-            List {
-                Section {} header: {
-                    Text("Creating archive link…")
-                }
-            }
-            progressView()
-        }
-    }
-
-    private func linkView(_ fileId: Int64, _ link: String, _ archivePath: URL, _ ctrl: chat_ctrl) -> some View {
-        List {
-            Section {
-                Button(action: { cancelMigration(fileId, ctrl) }) {
-                    settingsRow("multiply") {
-                        Text("Cancel migration").foregroundColor(.red)
-                    }
-                }
-                Button(action: { finishMigration(fileId, ctrl) }) {
-                    settingsRow("checkmark") {
-                        Text("Finalize migration").foregroundColor(.accentColor)
-                    }
-                }
-            } footer: {
-                Text("Make sure you made the migration before going forward")
-                    .font(.callout)
-            }
-            Section {
-                SimpleXLinkQRCode(uri: link)
-                    .frame(maxWidth: .infinity)
-                shareLinkButton(link)
-            } header: {
-                Text("Link to uploaded archive")
-            } footer: {
-                Text("Choose Migrate from another device on your new device and scan QR code")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func finishedView() -> some View {
-        List {
-            Section {
-                Button(action: { alert = .deleteChat() }) {
-                    settingsRow("trash.fill") {
-                        Text("Delete database from this device").foregroundColor(.accentColor)
-                    }
-                }
-                Button(action: { alert = .startChat() }) {
-                    settingsRow("play.fill") {
-                        Text("Start chat").foregroundColor(.red)
-                    }
-                }
-            } header: {
-                Text("Migration complete")
-            } footer: {
-                Text("You should not use the same database on two devices")
-                    .font(.callout)
-            }
-        }
-    }
-
-    private func shareLinkButton(_ link: String) -> some View {
-        Button {
-            showShareSheet(items: [simplexChatLink(link)])
-        } label: {
-            Label("Share link", systemImage: "square.and.arrow.up")
-        }
-    }
-
-    private func largeProgressView(_ value: Float, _ title: String, _ description: LocalizedStringKey) -> some View {
-        ZStack {
-            VStack {
-                Text(description)
-                    .font(.title3)
-                    .hidden()
-
-                Text(title)
-                    .font(.system(size: 60))
-                    .foregroundColor(.accentColor)
-
-                Text(description)
-                    .font(.title3)
-            }
-
-            Circle()
-                .trim(from: 0, to: CGFloat(value))
-                .stroke(
-                    Color.accentColor,
-                    style: StrokeStyle(lineWidth: 30)
-                )
-                .rotationEffect(.degrees(-90))
-                .animation(.linear, value: value)
-                .frame(maxWidth: .infinity)
-                .padding(.horizontal)
-                .padding(.horizontal)
-        }
-        .frame(maxWidth: .infinity)
-    }
-
-    private func stopChat() {
-        Task {
-            do {
-                try await stopChatAsync()
-                await MainActor.run {
-                    migrationState = initialRandomDBPassphraseGroupDefault.get() ? .passphraseNotSet : .passphraseConfirmation
-                }
-            } catch let e {
-                await MainActor.run {
-                    migrationState = .chatStopFailed(reason: e.localizedDescription)
-                }
-            }
-        }
-    }
-
-    private func exportArchive() {
-        Task {
-            do {
-                try? FileManager.default.createDirectory(at: getMigrationTempFilesDirectory(), withIntermediateDirectories: true)
-                let archivePath = try await exportChatArchive(getMigrationTempFilesDirectory())
-                if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
-                    let totalBytes = attrs[.size] as? Int64 {
-                    await MainActor.run {
-                        migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                    }
-                } else {
-                    await MainActor.run {
-                        alert = .error(title: "Exported file doesn't exist")
-                        migrationState = .uploadConfirmation
-                    }
-                }
-            } catch let error {
-                await MainActor.run {
-                    alert = .error(title: "Error exporting chat database", error: responseError(error))
-                    migrationState = .uploadConfirmation
-                }
-            }
-        }
-    }
-
-    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
-        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
-        showErrorOnMigrationIfNeeded(status, $alert)
-        do {
-            if let ctrl, let user = try startChatWithTemporaryDatabase(ctrl: ctrl) {
-                return (ctrl, user)
-            }
-        } catch let error {
-            logger.error("Error while starting chat in temporary database: \(error.localizedDescription)")
-        }
-        return nil
-    }
-
-    private func startUploading(_ totalBytes: Int64, _ archivePath: URL) {
-        Task {
-            guard let ctrlAndUser = initTemporaryDatabase() else {
-                return migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-            }
-            let (ctrl, user) = ctrlAndUser
-            chatReceiver = MigrationChatReceiver(ctrl: ctrl) { msg in
-                Task {
-                    await TerminalItems.shared.add(.resp(.now, msg))
-                }
-                logger.debug("processReceivedMsg: \(msg.responseType)")
-                await MainActor.run {
-                    switch msg {
-                    case let .sndFileProgressXFTP(_, _, fileTransferMeta, sentSize, totalSize):
-                        if case let .uploadProgress(uploaded, total, _, _, _) = migrationState, uploaded != total {
-                            migrationState = .uploadProgress(uploadedBytes: sentSize, totalBytes: totalSize, fileId: fileTransferMeta.fileId, archivePath: archivePath, ctrl: ctrl)
-                        }
-                    case let .sndFileRedirectStartXFTP(_, fileTransferMeta, _):
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkCreation(totalBytes: fileTransferMeta.fileSize)
-                        }
-                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                            migrationState = .linkShown(fileId: fileTransferMeta.fileId, link: rcvURIs[0], archivePath: archivePath, ctrl: ctrl)
-                        }
-                    default:
-                        logger.debug("unsupported event: \(msg.responseType)")
-                    }
-                }
-            }
-            chatReceiver?.start()
-
-            let (res, error) = await uploadStandaloneFile(user: user, file: CryptoFile.plain(archivePath.lastPathComponent), ctrl: ctrl)
-            guard let res = res else {
-                migrationState = .uploadFailed(totalBytes: totalBytes, archivePath: archivePath)
-                return alert = .error(title: "Error uploading the archive", error: error ?? "")
-            }
-            migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: res.fileSize, fileId: res.fileId, archivePath: archivePath, ctrl: ctrl)
-        }
-    }
-
-    private func cancelUploadedAchive(_ fileId: Int64, _ ctrl: chat_ctrl) async {
-        _ = await apiCancelFile(fileId: fileId, ctrl: ctrl)
-    }
-
-    private func cancelMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedAchive(fileId, ctrl)
-            await MainActor.run {
-                if !chatWasStoppedInitially {
-                    startChatAndDismiss()
-                } else {
-                    dismiss()
-                }
-            }
-        }
-    }
-
-    private func finishMigration(_ fileId: Int64, _ ctrl: chat_ctrl) {
-        Task {
-            await cancelUploadedAchive(fileId, ctrl)
-            await MainActor.run {
-                migrationState = .finished
-            }
-        }
-    }
-
-    private func deleteChatAndDismiss() {
-        Task {
-            do {
-                try await deleteChatAsync()
-                m.chatDbChanged = true
-                m.chatInitialized = false
-                showSettings = false
-                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                    resetChatCtrl()
-                    do {
-                        try initializeChat(start: false)
-                        m.chatDbChanged = false
-                        AppChatState.shared.set(.active)
-                    } catch let error {
-                        fatalError("Error starting chat \(responseError(error))")
-                    }
-                }
-                dismiss()
-            } catch let error {
-                alert = .error(title: "Error deleting database", error: responseError(error))
-            }
-        }
-    }
-
-    private func startChatAndDismiss() {
-        Task {
-            AppChatState.shared.set(.active)
-            try? startChat(refreshInvitations: true)
-            dismiss()
-        }
-    }
-
-    private static func urlForTemporaryDatabase() -> URL {
-        URL(fileURLWithPath: generateNewFileName(getMigrationTempFilesDirectory().path + "/" + "migration", "db", fullPath: true))
-    }
-}
-
-private struct PassphraseConfirmationView: View {
-    @Binding var migrationState: MigrationState
-    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
-    @State private var currentKey: String = ""
-    @State private var verifyingPassphrase: Bool = false
-    @Binding var alert: MigrateToAnotherDeviceViewAlert?
-
-    var body: some View {
-        ZStack {
-            List {
-                chatStoppedView()
-                Section {
-                    PassphraseField(key: $currentKey, placeholder: "Current passphrase…", valid: validKey(currentKey))
-                    Button(action: {
-                        verifyingPassphrase = true
-                        hideKeyboard()
-                        Task {
-                            await verifyDatabasePassphrase(currentKey)
-                            verifyingPassphrase = false
-                        }
-                    }) {
-                        settingsRow(useKeychain ? "key" : "lock", color: .secondary) {
-                            Text("Verify passphrase")
-                        }
-                    }
-                } header: {
-                    Text("Verify database passphrase to migrate it")
-                } footer: {
-                    Text("Make sure you remember database passphrase before migrating")
-                        .font(.callout)
-                }
-            }
-            if verifyingPassphrase {
-                progressView()
-            }
-        }
-    }
-
-    private func verifyDatabasePassphrase(_ dbKey: String) async {
-        do {
-            try await testStorageEncryption(key: dbKey)
-            migrationState = .uploadConfirmation
-        } catch {
-            showErrorOnMigrationIfNeeded(.errorNotADatabase(dbFile: ""), $alert)
-        }
-    }
-}
-
-private func showErrorOnMigrationIfNeeded(_ status: DBMigrationResult, _ alert: Binding<MigrateToAnotherDeviceViewAlert?>) {
-    switch status {
-    case .invalidConfirmation:
-        alert.wrappedValue = .invalidConfirmation()
-    case .errorNotADatabase:
-        alert.wrappedValue = .wrongPassphrase()
-    case .errorKeychain:
-        alert.wrappedValue = .keychainError()
-    case let .errorSQL(_, error):
-        alert.wrappedValue = .databaseError(message: error)
-    case let .unknown(error):
-        alert.wrappedValue = .unknownError(message: error)
-    case .errorMigration: ()
-    case .ok: ()
-    }
-}
-
-private func progressView() -> some View {
-    VStack {
-        ProgressView().scaleEffect(2)
-    }
-    .frame(maxWidth: .infinity, maxHeight: .infinity )
-}
-
-func chatStoppedView() -> some View {
-    settingsRow("exclamationmark.octagon.fill", color: .red) {
-        Text("Chat is stopped")
-    }
-}
-
-private class MigrationChatReceiver {
-    let ctrl: chat_ctrl
-    let processReceivedMsg: (ChatResponse) async -> Void
-    private var receiveLoop: Task<Void, Never>?
-    private var receiveMessages = true
-
-    init(ctrl: chat_ctrl, _ processReceivedMsg: @escaping (ChatResponse) async -> Void) {
-        self.ctrl = ctrl
-        self.processReceivedMsg = processReceivedMsg
-    }
-
-    func start() {
-        logger.debug("MigrationChatReceiver.start")
-        receiveMessages = true
-        if receiveLoop != nil { return }
-        receiveLoop = Task { await receiveMsgLoop() }
-    }
-
-    func receiveMsgLoop() async {
-        // TODO use function that has timeout
-        if let msg = await chatRecvMsg(ctrl) {
-            await processReceivedMsg(msg)
-        }
-        if self.receiveMessages {
-            _ = try? await Task.sleep(nanoseconds: 7_500_000)
-            await receiveMsgLoop()
-        }
-    }
-
-    func stop() {
-        logger.debug("MigrationChatReceiver.stop")
-        receiveMessages = false
-        receiveLoop?.cancel()
-        receiveLoop = nil
-        chat_close_store(ctrl)
-    }
-}
-
-struct MigrateToAnotherDevice_Previews: PreviewProvider {
-    static var previews: some View {
-        MigrateToAnotherDevice(showSettings: Binding.constant(true))
-    }
-}

apps/ios/Shared/Views/NewChat/NewChatView.swift

@@ -86,7 +86,7 @@ struct NewChatView: View {
                         }
                 }
                 if case .connect = selection {
-                    ConnectView(showQRCodeScanner: $showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
+                    ConnectView(showQRCodeScanner: showQRCodeScanner, pastedLink: $pastedLink, alert: $alert)
                         .transition(.move(edge: .trailing))
                 }
             }
@@ -284,7 +284,8 @@ private struct InviteView: View {
 
 private struct ConnectView: View {
     @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showQRCodeScanner: Bool
+    @State var showQRCodeScanner = false
+    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
     @Binding var pastedLink: String
     @Binding var alert: NewChatViewAlert?
     @State private var sheet: PlanAndConnectActionSheet?
@@ -294,13 +295,32 @@ private struct ConnectView: View {
             Section("Paste the link you received") {
                 pasteLinkView()
             }
-            Section("Or scan QR code") {
-                ScannerInView(showQRCodeScanner: $showQRCodeScanner, processQRCode: processQRCode)
-            }
+
+            scanCodeView()
         }
         .actionSheet(item: $sheet) { s in
             planAndConnectActionSheet(s, dismiss: true, cleanup: { pastedLink = "" })
         }
+        .onAppear {
+            let status = AVCaptureDevice.authorizationStatus(for: .video)
+            cameraAuthorizationStatus = status
+            if showQRCodeScanner {
+                switch status {
+                case .notDetermined: askCameraAuthorization()
+                case .restricted: showQRCodeScanner = false
+                case .denied: showQRCodeScanner = false
+                case .authorized: ()
+                @unknown default: askCameraAuthorization()
+                }
+            }
+        }
+    }
+
+    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
+        AVCaptureDevice.requestAccess(for: .video) { allowed in
+            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
+            if allowed { cb?() }
+        }
     }
 
     @ViewBuilder private func pasteLinkView() -> some View {
@@ -331,45 +351,8 @@ private struct ConnectView: View {
         }
     }
 
-    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
-        switch resp {
-        case let .success(r):
-            let link = r.string
-            if strIsSimplexLink(r.string) {
-                connect(link)
-            } else {
-                alert = .newChatSomeAlert(alert: .someAlert(
-                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
-                    id: "processQRCode: code is not a SimpleX link"
-                ))
-            }
-        case let .failure(e):
-            logger.error("processQRCode QR code error: \(e.localizedDescription)")
-            alert = .newChatSomeAlert(alert: .someAlert(
-                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
-                id: "processQRCode: failure"
-            ))
-        }
-    }
-
-    private func connect(_ link: String) {
-        planAndConnect(
-            link,
-            showAlert: { alert = .planAndConnectAlert(alert: $0) },
-            showActionSheet: { sheet = $0 },
-            dismiss: true,
-            incognito: nil
-        )
-    }
-}
-
-struct ScannerInView: View {
-    @Binding var showQRCodeScanner: Bool
-    let processQRCode: (_ resp: Result<ScanResult, ScanError>) -> Void
-    @State private var cameraAuthorizationStatus: AVAuthorizationStatus?
-
-    var body: some View {
-        Group {
+    private func scanCodeView() -> some View {
+        Section("Or scan QR code") {
             if showQRCodeScanner, case .authorized = cameraAuthorizationStatus {
                 CodeScannerView(codeTypes: [.qr], scanMode: .continuous, completion: processQRCode)
                     .aspectRatio(1, contentMode: .fit)
@@ -413,26 +396,37 @@ struct ScannerInView: View {
                 .disabled(cameraAuthorizationStatus == .restricted)
             }
         }
-        .onAppear {
-            let status = AVCaptureDevice.authorizationStatus(for: .video)
-            cameraAuthorizationStatus = status
-            if showQRCodeScanner {
-                switch status {
-                case .notDetermined: askCameraAuthorization()
-                case .restricted: showQRCodeScanner = false
-                case .denied: showQRCodeScanner = false
-                case .authorized: ()
-                @unknown default: askCameraAuthorization()
-                }
+    }
+
+    private func processQRCode(_ resp: Result<ScanResult, ScanError>) {
+        switch resp {
+        case let .success(r):
+            let link = r.string
+            if strIsSimplexLink(r.string) {
+                connect(link)
+            } else {
+                alert = .newChatSomeAlert(alert: .someAlert(
+                    alert: mkAlert(title: "Invalid QR code", message: "The code you scanned is not a SimpleX link QR code."),
+                    id: "processQRCode: code is not a SimpleX link"
+                ))
             }
+        case let .failure(e):
+            logger.error("processQRCode QR code error: \(e.localizedDescription)")
+            alert = .newChatSomeAlert(alert: .someAlert(
+                alert: mkAlert(title: "Invalid QR code", message: "Error scanning code: \(e.localizedDescription)"),
+                id: "processQRCode: failure"
+            ))
         }
     }
 
-    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
-        AVCaptureDevice.requestAccess(for: .video) { allowed in
-            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
-            if allowed { cb?() }
-        }
+    private func connect(_ link: String) {
+        planAndConnect(
+            link,
+            showAlert: { alert = .planAndConnectAlert(alert: $0) },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: nil
+        )
     }
 }
 

apps/ios/Shared/Views/Onboarding/HowItWorks.swift

@@ -37,7 +37,7 @@ struct HowItWorks: View {
             Spacer()
 
             if onboarding {
-                OnboardingActionButton(hideMigrate: true)
+                OnboardingActionButton()
                     .padding(.bottom, 8)
             }
         }

apps/ios/Shared/Views/Onboarding/SimpleXInfo.swift

@@ -42,7 +42,7 @@ struct SimpleXInfo: View {
 
                     Spacer()
                     if onboarding {
-                        OnboardingActionButton(hideMigrate: false)
+                        OnboardingActionButton()
                         Spacer()
                     }
 
@@ -87,28 +87,10 @@ struct SimpleXInfo: View {
 
 struct OnboardingActionButton: View {
     @EnvironmentObject var m: ChatModel
-    let hideMigrate: Bool
-    @State private var migrateFromAnotherDevice: Bool = false
 
     var body: some View {
         if m.currentUser == nil {
             actionButton("Create your profile", onboarding: .step2_CreateProfile)
-
-            if !hideMigrate {
-                actionButton("Migrate from another device") {
-                    migrateFromAnotherDevice = true
-                }
-                .sheet(isPresented: $migrateFromAnotherDevice) {
-                    VStack(alignment: .leading) {
-                        Text("Migrate here")
-                            .font(.largeTitle)
-                            .padding([.leading, .top, .trailing])
-                            .padding(.top)
-                        MigrateFromAnotherDevice()
-                    }
-                    .background(Color(uiColor: .tertiarySystemGroupedBackground))
-                }
-            }
         } else {
             actionButton("Make a private connection", onboarding: .onboardingComplete)
         }
@@ -129,21 +111,6 @@ struct OnboardingActionButton: View {
         .frame(maxWidth: .infinity)
         .padding(.bottom)
     }
-
-    private func actionButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
-        Button {
-            withAnimation {
-                action()
-            }
-        } label: {
-            HStack {
-                Text(label).font(.title2)
-                Image(systemName: "greaterthan")
-            }
-        }
-        .frame(maxWidth: .infinity)
-        .padding(.bottom)
-    }
 }
 
 struct SimpleXInfo_Previews: PreviewProvider {

apps/ios/Shared/Views/UserSettings/DeveloperView.swift

@@ -42,6 +42,25 @@ struct DeveloperView: View {
                 } footer: {
                     (developerTools ? Text("Show:") : Text("Hide:")) + Text(" ") + Text("Database IDs and Transport isolation option.")
                 }
+
+//                Section {
+//                    settingsRow("arrow.up.doc") {
+//                        Toggle("Send videos and files via XFTP", isOn: $xftpSendEnabled)
+//                            .onChange(of: xftpSendEnabled) { _ in
+//                                do {
+//                                    try setXFTPConfig(getXFTPCfg())
+//                                } catch {
+//                                    logger.error("setXFTPConfig: cannot set XFTP config \(responseError(error))")
+//                                }
+//                            }
+//                    }
+//                } header: {
+//                    Text("Experimental")
+//                } footer: {
+//                    if xftpSendEnabled {
+//                        Text("v4.6.1+ is required to receive via XFTP.")
+//                    }
+//                }
             }
         }
     }

apps/ios/Shared/Views/UserSettings/NotificationsView.swift

@@ -76,10 +76,6 @@ struct NotificationsView: View {
                         Text(m.notificationPreview.label)
                     }
                 }
-
-                if let server = m.notificationServer {
-                    smpServers("Push server", [server])
-                }
             } header: {
                 Text("Push notifications")
             } footer: {
@@ -91,9 +87,6 @@ struct NotificationsView: View {
             }
         }
         .disabled(legacyDatabase)
-        .onAppear {
-            (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
-        }
     }
 
     private func notificationAlert(_ alert: NotificationAlert, _ token: DeviceToken) -> Alert {
@@ -132,7 +125,6 @@ struct NotificationsView: View {
                         m.tokenStatus = .new
                         notificationMode = .off
                         m.notificationMode = .off
-                        m.notificationServer = nil
                     }
                 } catch let error {
                     await MainActor.run {
@@ -143,13 +135,11 @@ struct NotificationsView: View {
                 }
             default:
                 do {
-                    let _ = try await apiRegisterToken(token: token, notificationMode: mode)
-                    let (_, tknStatus, ntfMode, ntfServer) = apiGetNtfToken()
+                    let status = try await apiRegisterToken(token: token, notificationMode: mode)
                     await MainActor.run {
-                        m.tokenStatus = tknStatus
-                        notificationMode = ntfMode
-                        m.notificationMode = ntfMode
-                        m.notificationServer = ntfServer
+                        m.tokenStatus = status
+                        notificationMode = mode
+                        m.notificationMode = mode
                     }
                 } catch let error {
                     await MainActor.run {

apps/ios/Shared/Views/UserSettings/SettingsView.swift

@@ -163,57 +163,48 @@ struct SettingsView: View {
         NavigationView {
             List {
                 Section("You") {
-                    Group {
-                        if let user = user {
-                            NavigationLink {
-                                UserProfile()
-                                    .navigationTitle("Your current profile")
-                            } label: {
-                                ProfilePreview(profileOf: user)
-                                    .padding(.leading, -8)
-                            }
-                        }
-
+                    if let user = user {
                         NavigationLink {
-                            UserProfilesView(showSettings: $showSettings)
+                            UserProfile()
+                                .navigationTitle("Your current profile")
                         } label: {
-                            settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
-                        }
-
-
-                        if let user = user {
-                            NavigationLink {
-                                UserAddressView(shareViaProfile: user.addressShared)
-                                    .navigationTitle("SimpleX address")
-                                    .navigationBarTitleDisplayMode(.large)
-                            } label: {
-                                settingsRow("qrcode") { Text("Your SimpleX address") }
-                            }
-
-                            NavigationLink {
-                                PreferencesView(profile: user.profile, preferences: user.fullPreferences, currentPreferences: user.fullPreferences)
-                                    .navigationTitle("Your preferences")
-                            } label: {
-                                settingsRow("switch.2") { Text("Chat preferences") }
-                            }
-                        }
-
-                        NavigationLink {
-                            ConnectDesktopView(viaSettings: true)
-                        } label: {
-                            settingsRow("desktopcomputer") { Text("Use from desktop") }
+                            ProfilePreview(profileOf: user)
+                                .padding(.leading, -8)
                         }
                     }
-                    .disabled(chatModel.chatRunning != true)
 
                     NavigationLink {
-                        MigrateToAnotherDevice(showSettings: $showSettings)
-                            .navigationTitle("Migrate device")
-                            .navigationBarTitleDisplayMode(.large)
+                        UserProfilesView(showSettings: $showSettings)
                     } label: {
-                        settingsRow("tray.and.arrow.up") { Text("Migrate to another device") }
+                        settingsRow("person.crop.rectangle.stack") { Text("Your chat profiles") }
+                    }
+
+
+                    if let user = user {
+                        NavigationLink {
+                            UserAddressView(shareViaProfile: user.addressShared)
+                                .navigationTitle("SimpleX address")
+                                .navigationBarTitleDisplayMode(.large)
+                        } label: {
+                            settingsRow("qrcode") { Text("Your SimpleX address") }
+                        }
+
+                        NavigationLink {
+                            PreferencesView(profile: user.profile, preferences: user.fullPreferences, currentPreferences: user.fullPreferences)
+                                .navigationTitle("Your preferences")
+                        } label: {
+                            settingsRow("switch.2") { Text("Chat preferences") }
+                        }
+                    }
+
+                    NavigationLink {
+                        ConnectDesktopView(viaSettings: true)
+                    } label: {
+                        settingsRow("desktopcomputer") { Text("Use from desktop") }
                     }
                 }
+                .disabled(chatModel.chatRunning != true)
+                
                 Section("Settings") {
                     NavigationLink {
                         NotificationsView()

apps/ios/SimpleX NSE/NotificationService.swift

@@ -453,6 +453,7 @@ var receiverStarted = false
 let startLock = DispatchSemaphore(value: 1)
 let suspendLock = DispatchSemaphore(value: 1)
 var networkConfig: NetCfg = getNetCfg()
+let xftpConfig: XFTPFileConfig? = getXFTPCfg()
 
 // startChat uses semaphore startLock to ensure that only one didReceive thread can start chat controller
 // Subsequent calls to didReceive will be waiting on semaphore and won't start chat again, as it will be .active
@@ -498,6 +499,7 @@ func doStartChat() -> DBMigrationResult? {
             try setNetworkConfig(networkConfig)
             try apiSetTempFolder(tempFolder: getTempFilesDirectory().path)
             try apiSetFilesFolder(filesFolder: getAppFilesDirectory().path)
+            try setXFTPConfig(xftpConfig)
             try apiSetEncryptLocalFiles(privacyEncryptLocalFilesGroupDefault.get())
             // prevent suspension while starting chat
             suspendLock.wait()
@@ -640,9 +642,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
         cleanupDirectFile(aChatItem)
         return nil
     case let .sndFileRcvCancelled(_, aChatItem, _):
-        if let aChatItem = aChatItem {
-            cleanupDirectFile(aChatItem)
-        }
+        cleanupDirectFile(aChatItem)
         return nil
     case let .sndFileCompleteXFTP(_, aChatItem, _):
         cleanupFile(aChatItem)
@@ -733,6 +733,12 @@ func apiSetFilesFolder(filesFolder: String) throws {
     throw r
 }
 
+func setXFTPConfig(_ cfg: XFTPFileConfig?) throws {
+    let r = sendSimpleXCmd(.apiSetXFTPConfig(config: cfg))
+    if case .cmdOk = r { return }
+    throw r
+}
+
 func apiSetEncryptLocalFiles(_ enable: Bool) throws {
     let r = sendSimpleXCmd(.apiSetEncryptLocalFiles(enable: enable))
     if case .cmdOk = r { return }

apps/ios/SimpleX.xcodeproj/project.pbxproj

@@ -29,6 +29,11 @@
 		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 */; };
@@ -90,11 +95,6 @@
 		5CB0BA90282713D900B3292C /* SimpleXInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA8F282713D900B3292C /* SimpleXInfo.swift */; };
 		5CB0BA92282713FD00B3292C /* CreateProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA91282713FD00B3292C /* CreateProfile.swift */; };
 		5CB0BA9A2827FD8800B3292C /* HowItWorks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB0BA992827FD8800B3292C /* HowItWorks.swift */; };
-		5CB1CE9C2B8771DB00963938 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB1CE972B8771DB00963938 /* libffi.a */; };
-		5CB1CE9D2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB1CE982B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a */; };
-		5CB1CE9E2B8771DB00963938 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB1CE992B8771DB00963938 /* libgmpxx.a */; };
-		5CB1CE9F2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB1CE9A2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a */; };
-		5CB1CEA02B8771DB00963938 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CB1CE9B2B8771DB00963938 /* libgmp.a */; };
 		5CB2084F28DA4B4800D024EC /* RTCServers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB2084E28DA4B4800D024EC /* RTCServers.swift */; };
 		5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB346E42868AA7F001FD2EF /* SuspendChat.swift */; };
 		5CB346E72868D76D001FD2EF /* NotificationsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CB346E62868D76D001FD2EF /* NotificationsView.swift */; };
@@ -164,6 +164,11 @@
 		64466DC829FC2B3B00E3D48D /* CreateSimpleXAddress.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */; };
 		64466DCC29FFE3E800E3D48D /* MailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64466DCB29FFE3E800E3D48D /* MailView.swift */; };
 		6448BBB628FA9D56000D2AB9 /* GroupLinkView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */; };
+		6449333A2AF8E51000AC506E /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933352AF8E51000AC506E /* libgmpxx.a */; };
+		6449333B2AF8E51000AC506E /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933362AF8E51000AC506E /* libgmp.a */; };
+		6449333C2AF8E51000AC506E /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933372AF8E51000AC506E /* libffi.a */; };
+		6449333D2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */; };
+		6449333E2AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */; };
 		644EFFDE292BCD9D00525D5B /* ComposeVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */; };
 		644EFFE0292CFD7F00525D5B /* CIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */; };
 		644EFFE2292D089800525D5B /* FramedCIVoiceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */; };
@@ -185,8 +190,6 @@
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
 		8C05382E2B39887E006436DC /* VideoUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C05382D2B39887E006436DC /* VideoUtils.swift */; };
-		8C7D949A2B88952700B7B9E1 /* MigrateFromAnotherDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7D94992B88952700B7B9E1 /* MigrateFromAnotherDevice.swift */; };
-		8C7DF3202B7CDB0A00C886D0 /* MigrateToAnotherDevice.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7DF31F2B7CDB0A00C886D0 /* MigrateToAnotherDevice.swift */; };
 		D7197A1829AE89660055C05A /* WebRTC in Frameworks */ = {isa = PBXBuildFile; productRef = D7197A1729AE89660055C05A /* WebRTC */; };
 		D72A9088294BD7A70047C86D /* NativeTextEditor.swift in Sources */ = {isa = PBXBuildFile; fileRef = D72A9087294BD7A70047C86D /* NativeTextEditor.swift */; };
 		D741547829AF89AF0022400A /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D741547729AF89AF0022400A /* StoreKit.framework */; };
@@ -280,6 +283,11 @@
 		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>"; };
@@ -374,11 +382,6 @@
 		5CB0BA8F282713D900B3292C /* SimpleXInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimpleXInfo.swift; sourceTree = "<group>"; };
 		5CB0BA91282713FD00B3292C /* CreateProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateProfile.swift; sourceTree = "<group>"; };
 		5CB0BA992827FD8800B3292C /* HowItWorks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HowItWorks.swift; sourceTree = "<group>"; };
-		5CB1CE972B8771DB00963938 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		5CB1CE982B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a"; sourceTree = "<group>"; };
-		5CB1CE992B8771DB00963938 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		5CB1CE9A2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a"; sourceTree = "<group>"; };
-		5CB1CE9B2B8771DB00963938 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
 		5CB2084E28DA4B4800D024EC /* RTCServers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RTCServers.swift; sourceTree = "<group>"; };
 		5CB2085428DE647400D024EC /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 		5CB346E42868AA7F001FD2EF /* SuspendChat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SuspendChat.swift; sourceTree = "<group>"; };
@@ -452,6 +455,11 @@
 		64466DC729FC2B3B00E3D48D /* CreateSimpleXAddress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateSimpleXAddress.swift; sourceTree = "<group>"; };
 		64466DCB29FFE3E800E3D48D /* MailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MailView.swift; sourceTree = "<group>"; };
 		6448BBB528FA9D56000D2AB9 /* GroupLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GroupLinkView.swift; sourceTree = "<group>"; };
+		644933352AF8E51000AC506E /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		644933362AF8E51000AC506E /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		644933372AF8E51000AC506E /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		644933382AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8-ghc9.6.3.a"; sourceTree = "<group>"; };
+		644933392AF8E51000AC506E /* libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-5.4.0.3-EnhmkSQK6HvJ11g1uZERg8.a"; sourceTree = "<group>"; };
 		644EFFDD292BCD9D00525D5B /* ComposeVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeVoiceView.swift; sourceTree = "<group>"; };
 		644EFFDF292CFD7F00525D5B /* CIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIVoiceView.swift; sourceTree = "<group>"; };
 		644EFFE1292D089800525D5B /* FramedCIVoiceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FramedCIVoiceView.swift; sourceTree = "<group>"; };
@@ -475,8 +483,6 @@
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
 		8C05382D2B39887E006436DC /* VideoUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoUtils.swift; sourceTree = "<group>"; };
-		8C7D94992B88952700B7B9E1 /* MigrateFromAnotherDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateFromAnotherDevice.swift; sourceTree = "<group>"; };
-		8C7DF31F2B7CDB0A00C886D0 /* MigrateToAnotherDevice.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrateToAnotherDevice.swift; sourceTree = "<group>"; };
 		D72A9087294BD7A70047C86D /* NativeTextEditor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeTextEditor.swift; sourceTree = "<group>"; };
 		D741547729AF89AF0022400A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/StoreKit.framework; sourceTree = DEVELOPER_DIR; };
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
@@ -518,13 +524,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 */,
-				5CB1CEA02B8771DB00963938 /* libgmp.a in Frameworks */,
-				5CB1CE9E2B8771DB00963938 /* libgmpxx.a in Frameworks */,
-				5CB1CE9C2B8771DB00963938 /* libffi.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
-				5CB1CE9D2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a in Frameworks */,
-				5CB1CE9F2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a 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 */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -557,7 +563,6 @@
 				5CB924DD27A8622200ACCCDD /* NewChat */,
 				5CFA59C22860B04D00863A68 /* Database */,
 				5CB634AB29E46CDB0066AD6B /* LocalAuth */,
-				8C7D94982B8894D300B7B9E1 /* Migration */,
 				5CA8D01B2AD9B076001FD661 /* RemoteAccess */,
 				5CB924DF27A8678B00ACCCDD /* UserSettings */,
 				5C2E261127A30FEA00F70299 /* TerminalView.swift */,
@@ -587,11 +592,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				5CB1CE972B8771DB00963938 /* libffi.a */,
-				5CB1CE9B2B8771DB00963938 /* libgmp.a */,
-				5CB1CE992B8771DB00963938 /* libgmpxx.a */,
-				5CB1CE9A2B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI-ghc9.6.3.a */,
-				5CB1CE982B8771DB00963938 /* libHSsimplex-chat-5.5.5.0-4Xh8aGOq2uNGBj7gMJTaKI.a */,
+				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 */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -898,15 +903,6 @@
 			path = Group;
 			sourceTree = "<group>";
 		};
-		8C7D94982B8894D300B7B9E1 /* Migration */ = {
-			isa = PBXGroup;
-			children = (
-				8C7DF31F2B7CDB0A00C886D0 /* MigrateToAnotherDevice.swift */,
-				8C7D94992B88952700B7B9E1 /* MigrateFromAnotherDevice.swift */,
-			);
-			path = Migration;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -1138,7 +1134,6 @@
 				5CBD285A295711D700EC2CF4 /* ImageUtils.swift in Sources */,
 				6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */,
 				5CE4407927ADB701007B033A /* EmojiItemView.swift in Sources */,
-				8C7D949A2B88952700B7B9E1 /* MigrateFromAnotherDevice.swift in Sources */,
 				5C3F1D562842B68D00EC8A82 /* IntegrityErrorItemView.swift in Sources */,
 				5C029EAA283942EA004A9677 /* CallController.swift in Sources */,
 				5CBE6C142944CC12002D9531 /* ScanCodeView.swift in Sources */,
@@ -1235,7 +1230,6 @@
 				5CB0BA92282713FD00B3292C /* CreateProfile.swift in Sources */,
 				5C5F2B7027EBC704006A9D5F /* ProfileImage.swift in Sources */,
 				5C9329412929248A0090FFF9 /* ScanProtocolServer.swift in Sources */,
-				8C7DF3202B7CDB0A00C886D0 /* MigrateToAnotherDevice.swift in Sources */,
 				64AA1C6C27F3537400AC7277 /* DeletedItemView.swift in Sources */,
 				5C93293F2928E0FD0090FFF9 /* AudioRecPlay.swift in Sources */,
 				5C029EA82837DBB3004A9677 /* CICallItemView.swift in Sources */,
@@ -1525,7 +1519,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1547,7 +1541,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1568,7 +1562,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_PREVIEWS = YES;
@@ -1590,7 +1584,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1649,7 +1643,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1662,7 +1656,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1681,7 +1675,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1694,7 +1688,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1713,7 +1707,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1737,7 +1731,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -1759,7 +1753,7 @@
 				APPLICATION_EXTENSION_API_ONLY = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 199;
+				CURRENT_PROJECT_VERSION = 196;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1783,7 +1777,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
-				MARKETING_VERSION = 5.5.4;
+				MARKETING_VERSION = 5.5.2;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;

apps/ios/SimpleXChat/API.swift

@@ -54,18 +54,6 @@ public func chatMigrateInit(_ useKey: String? = nil, confirmMigrations: Migratio
     return result
 }
 
-public func chatInitTemporaryDatabase(url: URL, key: String? = nil) -> (DBMigrationResult, chat_ctrl?) {
-    let dbPath = url.path
-    let dbKey = key ?? randomDatabasePassword()
-    logger.debug("chatInitTemporaryDatabase path: \(dbPath)")
-    var temporaryController: chat_ctrl? = nil
-    var cPath = dbPath.cString(using: .utf8)!
-    var cKey = dbKey.cString(using: .utf8)!
-    var cConfirm = MigrationConfirmation.error.rawValue.cString(using: .utf8)!
-    let cjson = chat_migrate_init_key(&cPath, &cKey, 1, &cConfirm, 0, &temporaryController)!
-    return (dbMigrationResult(fromCString(cjson)), temporaryController)
-}
-
 public func chatCloseStore() {
     let err = fromCString(chat_close_store(getChatCtrl()))
     if err != "" {
@@ -85,22 +73,17 @@ public func resetChatCtrl() {
     migrationResult = nil
 }
 
-public func applyChatCtrl(ctrl: chat_ctrl?, result: (Bool, DBMigrationResult)) {
-    chatController = ctrl
-    migrationResult = result
-}
-
-public func sendSimpleXCmd(_ cmd: ChatCommand, _ ctrl: chat_ctrl? = nil) -> ChatResponse {
+public func sendSimpleXCmd(_ cmd: ChatCommand) -> ChatResponse {
     var c = cmd.cmdString.cString(using: .utf8)!
-    let cjson  = chat_send_cmd(ctrl ?? getChatCtrl(), &c)!
+    let cjson  = chat_send_cmd(getChatCtrl(), &c)!
     return chatResponse(fromCString(cjson))
 }
 
 // in microseconds
 let MESSAGE_TIMEOUT: Int32 = 15_000_000
 
-public func recvSimpleXMsg(_ ctrl: chat_ctrl? = nil) -> ChatResponse? {
-    if let cjson = chat_recv_msg_wait(ctrl ?? getChatCtrl(), MESSAGE_TIMEOUT) {
+public func recvSimpleXMsg() -> ChatResponse? {
+    if let cjson = chat_recv_msg_wait(getChatCtrl(), MESSAGE_TIMEOUT) {
         let s = fromCString(cjson)
         return s == "" ? nil : chatResponse(s)
     }

apps/ios/SimpleXChat/APITypes.swift

@@ -31,12 +31,12 @@ public enum ChatCommand {
     case apiSuspendChat(timeoutMicroseconds: Int)
     case setTempFolder(tempFolder: String)
     case setFilesFolder(filesFolder: String)
+    case apiSetXFTPConfig(config: XFTPFileConfig?)
     case apiSetEncryptLocalFiles(enable: Bool)
     case apiExportArchive(config: ArchiveConfig)
     case apiImportArchive(config: ArchiveConfig)
     case apiDeleteStorage
     case apiStorageEncryption(config: DBEncryptionConfig)
-    case testStorageEncryption(key: String)
     case apiGetChats(userId: Int64)
     case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
     case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
@@ -131,8 +131,6 @@ public enum ChatCommand {
     case listRemoteCtrls
     case stopRemoteCtrl
     case deleteRemoteCtrl(remoteCtrlId: Int64)
-    case apiUploadStandaloneFile(userId: Int64, file: CryptoFile)
-    case apiDownloadStandaloneFile(userId: Int64, url: String, file: CryptoFile)
     // misc
     case showVersion
     case string(String)
@@ -164,12 +162,16 @@ public enum ChatCommand {
             case let .apiSuspendChat(timeoutMicroseconds): return "/_app suspend \(timeoutMicroseconds)"
             case let .setTempFolder(tempFolder): return "/_temp_folder \(tempFolder)"
             case let .setFilesFolder(filesFolder): return "/_files_folder \(filesFolder)"
+            case let .apiSetXFTPConfig(cfg): if let cfg = cfg {
+                return "/_xftp on \(encodeJSON(cfg))"
+            } else {
+                return "/_xftp off"
+            }
             case let .apiSetEncryptLocalFiles(enable): return "/_files_encrypt \(onOff(enable))"
             case let .apiExportArchive(cfg): return "/_db export \(encodeJSON(cfg))"
             case let .apiImportArchive(cfg): return "/_db import \(encodeJSON(cfg))"
             case .apiDeleteStorage: return "/_db delete"
             case let .apiStorageEncryption(cfg): return "/_db encryption \(encodeJSON(cfg))"
-            case let .testStorageEncryption(key): return "/db test key \(key)"
             case let .apiGetChats(userId): return "/_get chats \(userId) pcc=on"
             case let .apiGetChat(type, id, pagination, search): return "/_get chat \(ref(type, id)) \(pagination.cmdString)" +
                 (search == "" ? "" : " search=\(search)")
@@ -282,8 +284,6 @@ public enum ChatCommand {
             case .listRemoteCtrls: return "/list remote ctrls"
             case .stopRemoteCtrl: return "/stop remote ctrl"
             case let .deleteRemoteCtrl(rcId): return "/delete remote ctrl \(rcId)"
-            case let .apiUploadStandaloneFile(userId, file): return "/_upload \(userId) \(file.filePath)"
-            case let .apiDownloadStandaloneFile(userId, link, file): return "/_download \(userId) \(link) \(file.filePath)"
             case .showVersion: return "/version"
             case let .string(str): return str
             }
@@ -311,12 +311,12 @@ public enum ChatCommand {
             case .apiSuspendChat: return "apiSuspendChat"
             case .setTempFolder: return "setTempFolder"
             case .setFilesFolder: return "setFilesFolder"
+            case .apiSetXFTPConfig: return "apiSetXFTPConfig"
             case .apiSetEncryptLocalFiles: return "apiSetEncryptLocalFiles"
             case .apiExportArchive: return "apiExportArchive"
             case .apiImportArchive: return "apiImportArchive"
             case .apiDeleteStorage: return "apiDeleteStorage"
             case .apiStorageEncryption: return "apiStorageEncryption"
-            case .testStorageEncryption: return "testStorageEncryption"
             case .apiGetChats: return "apiGetChats"
             case .apiGetChat: return "apiGetChat"
             case .apiGetChatItemInfo: return "apiGetChatItemInfo"
@@ -409,8 +409,6 @@ public enum ChatCommand {
             case .listRemoteCtrls: return "listRemoteCtrls"
             case .stopRemoteCtrl: return "stopRemoteCtrl"
             case .deleteRemoteCtrl: return "deleteRemoteCtrl"
-            case .apiUploadStandaloneFile: return "apiUploadStandaloneFile"
-            case .apiDownloadStandaloneFile: return "apiDownloadStandaloneFile"
             case .showVersion: return "showVersion"
             case .string: return "console command"
             }
@@ -445,8 +443,6 @@ public enum ChatCommand {
             return .apiUnhideUser(userId: userId, viewPwd: obfuscate(viewPwd))
         case let .apiDeleteUser(userId, delSMPQueues, viewPwd):
             return .apiDeleteUser(userId: userId, delSMPQueues: delSMPQueues, viewPwd: obfuscate(viewPwd))
-        case let .testStorageEncryption(key):
-            return .testStorageEncryption(key: obfuscate(key))
         default: return self
         }
     }
@@ -595,27 +591,20 @@ public enum ChatResponse: Decodable, Error {
     // receiving file events
     case rcvFileAccepted(user: UserRef, chatItem: AChatItem)
     case rcvFileAcceptedSndCancelled(user: UserRef, rcvFileTransfer: RcvFileTransfer)
-    case rcvStandaloneFileCreated(user: UserRef, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileStart(user: UserRef, chatItem: AChatItem) // send by chats
-    case rcvFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, receivedSize: Int64, totalSize: Int64, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileStart(user: UserRef, chatItem: AChatItem)
+    case rcvFileProgressXFTP(user: UserRef, chatItem: AChatItem, receivedSize: Int64, totalSize: Int64)
     case rcvFileComplete(user: UserRef, chatItem: AChatItem)
-    case rcvStandaloneFileComplete(user: UserRef, targetPath: String, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileCancelled(user: UserRef, chatItem_: AChatItem?, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
     case rcvFileSndCancelled(user: UserRef, chatItem: AChatItem, rcvFileTransfer: RcvFileTransfer)
-    case rcvFileError(user: UserRef, chatItem_: AChatItem?, rcvFileTransfer: RcvFileTransfer)
+    case rcvFileError(user: UserRef, chatItem: AChatItem)
     // sending file events
     case sndFileStart(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
     case sndFileComplete(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
-    case sndFileRcvCancelled(user: UserRef, chatItem_: AChatItem?, sndFileTransfer: SndFileTransfer)
-    case sndFileCancelled(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
-    case sndStandaloneFileCreated(user: UserRef, fileTransferMeta: FileTransferMeta) // returned by _upload
-    case sndFileStartXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta) // not used
-    case sndFileProgressXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
-    case sndFileRedirectStartXFTP(user: UserRef, fileTransferMeta: FileTransferMeta, redirectMeta: FileTransferMeta)
+    case sndFileCancelled(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sndFileTransfers: [SndFileTransfer])
+    case sndFileRcvCancelled(user: UserRef, chatItem: AChatItem, sndFileTransfer: SndFileTransfer)
+    case sndFileProgressXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta, sentSize: Int64, totalSize: Int64)
     case sndFileCompleteXFTP(user: UserRef, chatItem: AChatItem, fileTransferMeta: FileTransferMeta)
-    case sndStandaloneFileComplete(user: UserRef, fileTransferMeta: FileTransferMeta, rcvURIs: [String])
-    case sndFileCancelledXFTP(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
-    case sndFileError(user: UserRef, chatItem_: AChatItem?, fileTransferMeta: FileTransferMeta)
+    case sndFileError(user: UserRef, chatItem: AChatItem)
     // call events
     case callInvitation(callInvitation: RcvCallInvitation)
     case callOffer(user: UserRef, contact: Contact, callType: CallType, offer: WebRTCSession, sharedKey: String?, askConfirmation: Bool)
@@ -624,7 +613,7 @@ public enum ChatResponse: Decodable, Error {
     case callEnded(user: UserRef, contact: Contact)
     case callInvitations(callInvitations: [RcvCallInvitation])
     case ntfTokenStatus(status: NtfTknStatus)
-    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode, ntfServer: String)
+    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode)
     case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, msgTs: Date?, ntfMessages: [NtfMsgInfo])
     case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgInfo)
     case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
@@ -753,25 +742,18 @@ public enum ChatResponse: Decodable, Error {
             case .newMemberContactReceivedInv: return "newMemberContactReceivedInv"
             case .rcvFileAccepted: return "rcvFileAccepted"
             case .rcvFileAcceptedSndCancelled: return "rcvFileAcceptedSndCancelled"
-            case .rcvStandaloneFileCreated: return "rcvStandaloneFileCreated"
             case .rcvFileStart: return "rcvFileStart"
             case .rcvFileProgressXFTP: return "rcvFileProgressXFTP"
             case .rcvFileComplete: return "rcvFileComplete"
-            case .rcvStandaloneFileComplete: return "rcvStandaloneFileComplete"
             case .rcvFileCancelled: return "rcvFileCancelled"
             case .rcvFileSndCancelled: return "rcvFileSndCancelled"
             case .rcvFileError: return "rcvFileError"
             case .sndFileStart: return "sndFileStart"
             case .sndFileComplete: return "sndFileComplete"
             case .sndFileCancelled: return "sndFileCancelled"
-            case .sndStandaloneFileCreated: return "sndStandaloneFileCreated"
-            case .sndFileStartXFTP: return "sndFileStartXFTP"
-            case .sndFileProgressXFTP: return "sndFileProgressXFTP"
-            case .sndFileRedirectStartXFTP: return "sndFileRedirectStartXFTP"
             case .sndFileRcvCancelled: return "sndFileRcvCancelled"
+            case .sndFileProgressXFTP: return "sndFileProgressXFTP"
             case .sndFileCompleteXFTP: return "sndFileCompleteXFTP"
-            case .sndStandaloneFileComplete: return "sndStandaloneFileComplete"
-            case .sndFileCancelledXFTP: return "sndFileCancelledXFTP"
             case .sndFileError: return "sndFileError"
             case .callInvitation: return "callInvitation"
             case .callOffer: return "callOffer"
@@ -910,26 +892,19 @@ public enum ChatResponse: Decodable, Error {
             case let .newMemberContactReceivedInv(u, contact, groupInfo, member): return withUser(u, "contact: \(contact)\ngroupInfo: \(groupInfo)\nmember: \(member)")
             case let .rcvFileAccepted(u, chatItem): return withUser(u, String(describing: chatItem))
             case .rcvFileAcceptedSndCancelled: return noDetails
-            case .rcvStandaloneFileCreated: return noDetails
             case let .rcvFileStart(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .rcvFileProgressXFTP(u, chatItem, receivedSize, totalSize, _): return withUser(u, "chatItem: \(String(describing: chatItem))\nreceivedSize: \(receivedSize)\ntotalSize: \(totalSize)")
-            case let .rcvStandaloneFileComplete(u, targetPath, _): return withUser(u, targetPath)
+            case let .rcvFileProgressXFTP(u, chatItem, receivedSize, totalSize): return withUser(u, "chatItem: \(String(describing: chatItem))\nreceivedSize: \(receivedSize)\ntotalSize: \(totalSize)")
             case let .rcvFileComplete(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .rcvFileCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
             case let .rcvFileSndCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .rcvFileError(u, chatItem, _): return withUser(u, String(describing: chatItem))
+            case let .rcvFileError(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .sndFileStart(u, chatItem, _): return withUser(u, String(describing: chatItem))
             case let .sndFileComplete(u, chatItem, _): return withUser(u, String(describing: chatItem))
             case let .sndFileCancelled(u, chatItem, _, _): return withUser(u, String(describing: chatItem))
-            case .sndStandaloneFileCreated: return noDetails
-            case let .sndFileStartXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
             case let .sndFileRcvCancelled(u, chatItem, _): return withUser(u, String(describing: chatItem))
             case let .sndFileProgressXFTP(u, chatItem, _, sentSize, totalSize): return withUser(u, "chatItem: \(String(describing: chatItem))\nsentSize: \(sentSize)\ntotalSize: \(totalSize)")
-            case let .sndFileRedirectStartXFTP(u, _, redirectMeta): return withUser(u, String(describing: redirectMeta))
             case let .sndFileCompleteXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndStandaloneFileComplete(u, _, rcvURIs): return withUser(u, String(rcvURIs.count))
-            case let .sndFileCancelledXFTP(u, chatItem, _): return withUser(u, String(describing: chatItem))
-            case let .sndFileError(u, chatItem, _): return withUser(u, String(describing: chatItem))
+            case let .sndFileError(u, chatItem): return withUser(u, String(describing: chatItem))
             case let .callInvitation(inv): return String(describing: inv)
             case let .callOffer(u, contact, callType, offer, sharedKey, askConfirmation): return withUser(u, "contact: \(contact.id)\ncallType: \(String(describing: callType))\nsharedKey: \(sharedKey ?? "")\naskConfirmation: \(askConfirmation)\noffer: \(String(describing: offer))")
             case let .callAnswer(u, contact, answer): return withUser(u, "contact: \(contact.id)\nanswer: \(String(describing: answer))")
@@ -937,7 +912,7 @@ public enum ChatResponse: Decodable, Error {
             case let .callEnded(u, contact): return withUser(u, "contact: \(contact.id)")
             case let .callInvitations(invs): return String(describing: invs)
             case let .ntfTokenStatus(status): return String(describing: status)
-            case let .ntfToken(token, status, ntfMode, ntfServer): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)\nntfServer: \(ntfServer)"
+            case let .ntfToken(token, status, ntfMode): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)"
             case let .ntfMessages(u, connEntity, msgTs, ntfMessages): return withUser(u, "connEntity: \(String(describing: connEntity))\nmsgTs: \(String(describing: msgTs))\nntfMessages: \(String(describing: ntfMessages))")
             case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
             case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
@@ -1030,6 +1005,10 @@ struct ComposedMessage: Encodable {
     var msgContent: MsgContent
 }
 
+public struct XFTPFileConfig: Encodable {
+    var minFileSize: Int64
+}
+
 public struct ArchiveConfig: Encodable {
     var archivePath: String
     var disableCompression: Bool?
@@ -1753,7 +1732,6 @@ public enum StoreError: Decodable {
     case fileIdNotFoundBySharedMsgId(sharedMsgId: String)
     case sndFileNotFoundXFTP(agentSndFileId: String)
     case rcvFileNotFoundXFTP(agentRcvFileId: String)
-    case extraFileDescrNotFoundXFTP(fileId: Int64)
     case connectionNotFound(agentConnId: String)
     case connectionNotFoundById(connId: Int64)
     case connectionNotFoundByMemberId(groupMemberId: Int64)

apps/ios/SimpleXChat/AppGroup.swift

@@ -36,7 +36,7 @@ let GROUP_DEFAULT_NETWORK_TCP_KEEP_INTVL = "networkTCPKeepIntvl"
 let GROUP_DEFAULT_NETWORK_TCP_KEEP_CNT = "networkTCPKeepCnt"
 public let GROUP_DEFAULT_INCOGNITO = "incognito"
 let GROUP_DEFAULT_STORE_DB_PASSPHRASE = "storeDBPassphrase"
-public let GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE = "initialRandomDBPassphrase"
+let GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE = "initialRandomDBPassphrase"
 public let GROUP_DEFAULT_CONFIRM_DB_UPGRADES = "confirmDBUpgrades"
 public let GROUP_DEFAULT_CALL_KIT_ENABLED = "callKitEnabled"
 
@@ -265,6 +265,10 @@ public class Default<T> {
     }
 }
 
+public func getXFTPCfg() -> XFTPFileConfig {
+    return XFTPFileConfig(minFileSize: 0)
+}
+
 public func getNetCfg() -> NetCfg {
     let onionHosts = networkUseOnionHostsGroupDefault.get()
     let (hostMode, requiredHostMode) = onionHosts.hostMode

apps/ios/SimpleXChat/ChatTypes.swift

@@ -2268,7 +2268,7 @@ public struct ChatItem: Identifiable, Decodable {
         case .rcvDirectEvent(rcvDirectEvent: let rcvDirectEvent):
             switch rcvDirectEvent {
             case .contactDeleted: return false
-            case .profileUpdated: return false
+            case .profileUpdated: return true
             }
         case .rcvGroupEvent(rcvGroupEvent: let rcvGroupEvent):
             switch rcvGroupEvent {
@@ -3378,14 +3378,11 @@ public struct SndFileTransfer: Decodable {
 }
 
 public struct RcvFileTransfer: Decodable {
-    public let fileId: Int64
+
 }
 
 public struct FileTransferMeta: Decodable {
-    public let fileId: Int64
-    public let fileName: String
-    public let filePath: String
-    public let fileSize: Int64
+    
 }
 
 public enum CICallStatus: String, Decodable {

apps/ios/SimpleXChat/FileUtils.swift

@@ -83,7 +83,6 @@ public func deleteAppDatabaseAndFiles() {
     try? fm.removeItem(atPath: dbPath + CHAT_DB_BAK)
     try? fm.removeItem(atPath: dbPath + AGENT_DB_BAK)
     try? fm.removeItem(at: getTempFilesDirectory())
-    try? fm.removeItem(at: getMigrationTempFilesDirectory())
     try? fm.createDirectory(at: getTempFilesDirectory(), withIntermediateDirectories: true)
     deleteAppFiles()
     _ = kcDatabasePassword.remove()
@@ -184,10 +183,6 @@ public func getTempFilesDirectory() -> URL {
     getAppDirectory().appendingPathComponent("temp_files", isDirectory: true)
 }
 
-public func getMigrationTempFilesDirectory() -> URL {
-    getDocumentsDirectory().appendingPathComponent("migration_temp_files", isDirectory: true)
-}
-
 public func getAppFilesDirectory() -> URL {
     getAppDirectory().appendingPathComponent("app_files", isDirectory: true)
 }

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"

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.clipToCircle())
-      .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))
-    }
-  }
-}

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
@@ -73,7 +71,7 @@ class SimplexApp: Application(), LifecycleEventObserver {
 
   override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
     Log.d(TAG, "onStateChanged: $event")
-    withLongRunningApi {
+    withBGApi {
       when (event) {
         Lifecycle.Event.ON_START -> {
           isAppOnForeground = true
@@ -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()

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,9 +101,9 @@ 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
+    isStartingService = true
     withLongRunningApi {
       val chatController = ChatController
       waitDbMigrationEnds(chatController)
@@ -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)
         }
       }

apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.android.kt

@@ -13,7 +13,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 +33,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 +157,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)

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)

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)

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Images.android.kt

@@ -61,16 +61,6 @@ actual fun cropToSquare(image: ImageBitmap): ImageBitmap {
   return Bitmap.createBitmap(image.asAndroidBitmap(), xOffset, yOffset, side, side).asImageBitmap()
 }
 
-fun Bitmap.clipToCircle(): Bitmap {
-  val circle = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-  val path = android.graphics.Path()
-  path.addCircle(width / 2f, height / 2f, min(width, height) / 2f, android.graphics.Path.Direction.CCW)
-  val canvas = android.graphics.Canvas(circle)
-  canvas.clipPath(path)
-  canvas.drawBitmap(this, 0f, 0f, null)
-  return circle
-}
-
 actual fun compressImageStr(bitmap: ImageBitmap): String {
   val usePng = bitmap.hasAlpha()
   val ext = if (usePng) "png" else "jpg"

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/Share.android.kt

@@ -14,27 +14,17 @@ import chat.simplex.common.views.helpers.*
 import java.io.BufferedOutputStream
 import java.io.File
 import chat.simplex.res.MR
-import kotlin.math.min
 
 actual fun ClipboardManager.shareText(text: String) {
-  var text = text
-  for (i in 10 downTo 1) {
-    try {
-      val sendIntent: Intent = Intent().apply {
-        action = Intent.ACTION_SEND
-        putExtra(Intent.EXTRA_TEXT, text)
-        type = "text/plain"
-        flags = FLAG_ACTIVITY_NEW_TASK
-      }
-      val shareIntent = Intent.createChooser(sendIntent, null)
-      shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
-      androidAppContext.startActivity(shareIntent)
-      break
-    } catch (e: Exception) {
-      Log.e(TAG, "Failed to share text: ${e.stackTraceToString()}")
-      text = text.substring(0, min(i * 1000, text.length))
-    }
+  val sendIntent: Intent = Intent().apply {
+    action = Intent.ACTION_SEND
+    putExtra(Intent.EXTRA_TEXT, text)
+    type = "text/plain"
+    flags = FLAG_ACTIVITY_NEW_TASK
   }
+  val shareIntent = Intent.createChooser(sendIntent, null)
+  shareIntent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+  androidAppContext.startActivity(shareIntent)
 }
 
 actual fun shareFile(text: String, fileSource: CryptoFile) {

apps/multiplatform/common/src/androidMain/kotlin/chat/simplex/common/platform/UI.android.kt

@@ -114,8 +114,7 @@ actual class GlobalExceptionsHandler: Thread.UncaughtExceptionHandler {
     Handler(Looper.getMainLooper()).post {
       AlertManager.shared.showAlertMsg(
         title = generalGetString(MR.strings.app_was_crashed),
-        text = e.stackTraceToString(),
-        shareText = true
+        text = e.stackTraceToString()
       )
     }
   }

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")
@@ -133,15 +120,15 @@ actual fun ActiveCallView() {
           is WCallResponse.Capabilities -> withBGApi {
             val callType = CallType(call.localMedia, r.capabilities)
             chatModel.controller.apiSendCallInvitation(callRh, call.contact, callType)
-            updateActiveCall(call) { it.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities) }
+            chatModel.activeCall.value = call.copy(callState = CallState.InvitationSent, localCapabilities = r.capabilities)
           }
           is WCallResponse.Offer -> withBGApi {
             chatModel.controller.apiSendCallOffer(callRh, call.contact, r.offer, r.iceCandidates, call.localMedia, r.capabilities)
-            updateActiveCall(call) { it.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities) }
+            chatModel.activeCall.value = call.copy(callState = CallState.OfferSent, localCapabilities = r.capabilities)
           }
           is WCallResponse.Answer -> withBGApi {
             chatModel.controller.apiSendCallAnswer(callRh, call.contact, r.answer, r.iceCandidates)
-            updateActiveCall(call) { it.copy(callState = CallState.Negotiated) }
+            chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
           }
           is WCallResponse.Ice -> withBGApi {
             chatModel.controller.apiSendCallExtraInfo(callRh, call.contact, r.iceCandidates)
@@ -150,7 +137,7 @@ actual fun ActiveCallView() {
             try {
               val callStatus = json.decodeFromString<WebRTCCallStatus>("\"${r.state.connectionState}\"")
               if (callStatus == WebRTCCallStatus.Connected) {
-                updateActiveCall(call) { it.copy(callState = CallState.Connected, connectedAt = Clock.System.now()) }
+                chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectedAt = Clock.System.now())
                 setCallSound(call.soundSpeaker, audioViaBluetooth)
               }
               withBGApi { chatModel.controller.apiCallStatus(callRh, call.contact, callStatus) }
@@ -158,7 +145,7 @@ actual fun ActiveCallView() {
               Log.d(TAG,"call status ${r.state.connectionState} not used")
             }
           is WCallResponse.Connected -> {
-            updateActiveCall(call) { it.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo) }
+            chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
             scope.launch {
               setCallSound(call.soundSpeaker, audioViaBluetooth)
             }
@@ -167,29 +154,27 @@ actual fun ActiveCallView() {
             withBGApi { chatModel.callManager.endCall(call) }
           }
           is WCallResponse.Ended -> {
-            updateActiveCall(call) { it.copy(callState = CallState.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 ->
-              updateActiveCall(call) { it.copy(callState = CallState.Negotiated) }
+              chatModel.activeCall.value = call.copy(callState = CallState.Negotiated)
             is WCallCommand.Media -> {
-              updateActiveCall(call) {
-                when (cmd.media) {
-                  CallMediaType.Video -> it.copy(videoEnabled = cmd.enable)
-                  CallMediaType.Audio -> it.copy(audioEnabled = cmd.enable)
-                }
+              when (cmd.media) {
+                CallMediaType.Video -> chatModel.activeCall.value = call.copy(videoEnabled = cmd.enable)
+                CallMediaType.Audio -> chatModel.activeCall.value = call.copy(audioEnabled = cmd.enable)
               }
             }
             is WCallCommand.Camera -> {
-              updateActiveCall(call) { it.copy(localCamera = cmd.camera) }
+              chatModel.activeCall.value = call.copy(localCamera = cmd.camera)
               if (!call.audioEnabled) {
                 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 -> {
@@ -198,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
@@ -252,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")
@@ -308,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)
             }
           }
         }
@@ -380,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))
@@ -391,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)
 
@@ -420,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()) }
@@ -512,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(
@@ -534,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
     }
   }
@@ -564,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,
@@ -589,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 */ }
@@ -617,15 +554,6 @@ class WebRTCInterface(private val onResponse: (WVAPIMessage) -> Unit) {
   }
 }
 
-private fun updateActiveCall(initial: Call, transform: (Call) -> Call) {
-  val activeCall = chatModel.activeCall.value
-  if (activeCall != null && activeCall.contact.apiId == initial.contact.apiId) {
-    chatModel.activeCall.value = transform(activeCall)
-  } else {
-    Log.d(TAG, "withActiveCall: ignoring, not in call with the contact ${activeCall?.contact?.id}")
-  }
-}
-
 private class LocalContentWebViewClient(val webView: MutableState<WebView?>, private val assetLoader: WebViewAssetLoader) : WebViewClientCompat() {
   override fun shouldInterceptRequest(
     view: WebView,
@@ -638,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)
@@ -652,7 +579,6 @@ fun PreviewActiveCallOverlayVideo() {
     ActiveCallOverlayLayout(
       call = Call(
         remoteHostId = null,
-        userProfile = Profile.sampleData,
         contact = Contact.sampleData,
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Video,
@@ -679,7 +605,6 @@ fun PreviewActiveCallOverlayAudio() {
     ActiveCallOverlayLayout(
       call = Call(
         remoteHostId = null,
-        userProfile = Profile.sampleData,
         contact = Contact.sampleData,
         callState = CallState.Negotiated,
         localMedia = CallMediaType.Audio,

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>) {}

apps/multiplatform/common/src/commonMain/cpp/desktop/CMakeLists.txt

@@ -71,7 +71,7 @@ if(NOT APPLE)
 else()
 	# Without direct linking it can't find hs_init in linking step
 	add_library( rts SHARED IMPORTED )
-	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/libHSrts*_thr-*.${OS_LIB_EXT})
+	FILE(GLOB RTSLIB ${CMAKE_SOURCE_DIR}/libs/${OS_LIB_PATH}-${OS_LIB_ARCH}/deps/libHSrts*_thr-*.${OS_LIB_EXT})
 	set_target_properties( rts PROPERTIES IMPORTED_LOCATION ${RTSLIB})
 
 	target_link_libraries(app-lib rts simplex)

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
@@ -171,17 +169,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 +206,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 +216,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 +242,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) })
-    }
   }
 }
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt

@@ -96,7 +96,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)
@@ -1822,7 +1821,7 @@ data class ChatItem (
       is CIContent.SndGroupInvitation -> false
       is CIContent.RcvDirectEventContent -> when (content.rcvDirectEvent) {
         is RcvDirectEvent.ContactDeleted -> false
-        is RcvDirectEvent.ProfileUpdated -> false
+        is RcvDirectEvent.ProfileUpdated -> true
       }
       is CIContent.RcvGroupEventContent -> when (content.rcvGroupEvent) {
         is RcvGroupEvent.MemberAdded -> false

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt

@@ -451,21 +451,7 @@ object ChatController {
         }
         try {
           val msg = recvMsg(ctrl)
-          if (msg != null) {
-            val finishedWithoutTimeout = withTimeoutOrNull(60_000L) {
-              processReceivedMsg(msg)
-            }
-            if (finishedWithoutTimeout == null) {
-              Log.e(TAG, "Timeout reached while processing received message: " + msg.resp.responseType)
-              if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
-                AlertManager.shared.showAlertMsg(
-                  title = generalGetString(MR.strings.possible_slow_function_title),
-                  text = generalGetString(MR.strings.possible_slow_function_desc).format(60, msg.resp.responseType + "\n" + Exception().stackTraceToString()),
-                  shareText = true
-                )
-              }
-            }
-          }
+          if (msg != null) processReceivedMsg(msg)
         } catch (e: Exception) {
           Log.e(TAG, "ChatController recvMsg/processReceivedMsg exception: " + e.stackTraceToString());
         } catch (e: Throwable) {
@@ -631,6 +617,12 @@ object ChatController {
     throw Error("failed to set remote hosts folder: ${r.responseType} ${r.details}")
   }
 
+  suspend fun apiSetXFTPConfig(cfg: XFTPFileConfig?) {
+    val r = sendCmd(null, CC.ApiSetXFTPConfig(cfg))
+    if (r is CR.CmdOk) return
+    throw Error("apiSetXFTPConfig bad response: ${r.responseType} ${r.details}")
+  }
+
   suspend fun apiSetEncryptLocalFiles(enable: Boolean) = sendCommandOkResp(null, CC.ApiSetEncryptLocalFiles(enable))
 
   suspend fun apiExportArchive(config: ArchiveConfig) {
@@ -1693,7 +1685,7 @@ object ChatController {
           chatModel.networkStatuses[s.agentConnId] = s.networkStatus
         }
       }
-      is CR.NewChatItem -> withBGApi {
+      is CR.NewChatItem -> {
         val cInfo = r.chatItem.chatInfo
         val cItem = r.chatItem.chatItem
         if (active(r.user)) {
@@ -1708,7 +1700,7 @@ object ChatController {
             ((mc is MsgContent.MCImage && file.fileSize <= MAX_IMAGE_SIZE_AUTO_RCV)
                 || (mc is MsgContent.MCVideo && file.fileSize <= MAX_VIDEO_SIZE_AUTO_RCV)
                 || (mc is MsgContent.MCVoice && file.fileSize <= MAX_VOICE_SIZE_AUTO_RCV && file.fileStatus !is CIFileStatus.RcvAccepted))) {
-          receiveFile(rhId, r.user, file.fileId, auto = true)
+          withBGApi { receiveFile(rhId, r.user, file.fileId, auto = true) }
         }
         if (cItem.showNotification && (allowedToShowNotification() || chatModel.chatId.value != cInfo.id || chatModel.remoteHostId() != rhId)) {
           ntfManager.notifyMessageReceived(r.user, cInfo, cItem)
@@ -1908,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 ->
@@ -2165,6 +2159,10 @@ object ChatController {
     }
   }
 
+  fun getXFTPCfg(): XFTPFileConfig {
+    return XFTPFileConfig(minFileSize = 0)
+  }
+
   fun getNetCfg(): NetCfg {
     val useSocksProxy = appPrefs.networkUseSocksProxy.get()
     val proxyHostPort  = appPrefs.networkProxyHostPort.get()
@@ -2273,6 +2271,7 @@ sealed class CC {
   class SetTempFolder(val tempFolder: String): CC()
   class SetFilesFolder(val filesFolder: String): CC()
   class SetRemoteHostsFolder(val remoteHostsFolder: String): CC()
+  class ApiSetXFTPConfig(val config: XFTPFileConfig?): CC()
   class ApiSetEncryptLocalFiles(val enable: Boolean): CC()
   class ApiExportArchive(val config: ArchiveConfig): CC()
   class ApiImportArchive(val config: ArchiveConfig): CC()
@@ -2402,6 +2401,7 @@ sealed class CC {
     is SetTempFolder -> "/_temp_folder $tempFolder"
     is SetFilesFolder -> "/_files_folder $filesFolder"
     is SetRemoteHostsFolder -> "/remote_hosts_folder $remoteHostsFolder"
+    is ApiSetXFTPConfig -> if (config != null) "/_xftp on ${json.encodeToString(config)}" else "/_xftp off"
     is ApiSetEncryptLocalFiles -> "/_files_encrypt ${onOff(enable)}"
     is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
     is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
@@ -2536,6 +2536,7 @@ sealed class CC {
     is SetTempFolder -> "setTempFolder"
     is SetFilesFolder -> "setFilesFolder"
     is SetRemoteHostsFolder -> "setRemoteHostsFolder"
+    is ApiSetXFTPConfig -> "apiSetXFTPConfig"
     is ApiSetEncryptLocalFiles -> "apiSetEncryptLocalFiles"
     is ApiExportArchive -> "apiExportArchive"
     is ApiImportArchive -> "apiImportArchive"
@@ -2701,6 +2702,9 @@ sealed class ChatPagination {
 @Serializable
 class ComposedMessage(val fileSource: CryptoFile?, val quotedItemId: Long?, val msgContent: MsgContent)
 
+@Serializable
+class XFTPFileConfig(val minFileSize: Long)
+
 @Serializable
 class ArchiveConfig(val archivePath: String, val disableCompression: Boolean? = null, val parentTempDirectory: String? = null)
 

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/platform/Core.kt

@@ -91,6 +91,7 @@ suspend fun initChatController(useKey: String? = null, confirmMigrations: Migrat
     if (appPlatform.isDesktop) {
       controller.apiSetRemoteHostsFolder(remoteHostsDir.absolutePath)
     }
+    controller.apiSetXFTPConfig(controller.getXFTPCfg())
     controller.apiSetEncryptLocalFiles(controller.appPrefs.privacyEncryptLocalFiles.get())
     // If we migrated successfully means previous re-encryption process on database level finished successfully too
     if (appPreferences.encryptionStartedAt.get() != null) appPreferences.encryptionStartedAt.set(null)

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
 }
 /**

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
       }
     }
   }

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,

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt

@@ -301,9 +301,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))
               }
@@ -675,7 +673,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

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt

@@ -267,7 +267,7 @@ fun ComposeView(
   fun loadLinkPreview(url: String, wait: Long? = null) {
     if (pendingLinkUrl.value == url) {
       composeState.value = composeState.value.copy(preview = ComposePreview.CLinkPreview(null))
-      withLongRunningApi(slow = 60_000) {
+      withLongRunningApi(slow = 30_000, deadlock = 60_000) {
         if (wait != null) delay(wait)
         val lp = getLinkPreview(url)
         if (lp != null && pendingLinkUrl.value == url) {
@@ -551,7 +551,7 @@ fun ComposeView(
   }
 
   fun sendMessage(ttl: Int?) {
-    withLongRunningApi(slow = 120_000) {
+    withLongRunningApi(slow = 30_000, deadlock = 60_000) {
       sendMessageAsync(null, false, ttl)
     }
   }

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 = 120_000) {
+      withLongRunningApi(slow = 30_000, deadlock = 120_000) {
         for (contactId in selectedContacts) {
           val member = chatModel.controller.apiAddMember(rhId, groupInfo.groupId, contactId, selectedRole.value)
           if (member != null) {

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupChatInfoView.kt

@@ -152,7 +152,7 @@ fun leaveGroupDialog(rhId: Long?, groupInfo: GroupInfo, chatModel: ChatModel, cl
     text = generalGetString(MR.strings.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
     confirmText = generalGetString(MR.strings.leave_group_button),
     onConfirm = {
-      withLongRunningApi(60_000) {
+      withBGApi {
         chatModel.controller.leaveGroup(rhId, groupInfo.groupId)
         close?.invoke()
       }
@@ -424,47 +424,69 @@ private fun MemberVerifiedShield() {
 
 @Composable
 private fun DropDownMenuForMember(rhId: Long?, member: GroupMember, groupInfo: GroupInfo, showMenu: MutableState<Boolean>) {
-  if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
-    val canBlockForAll = member.canBlockForAll(groupInfo)
-    val canRemove = member.canBeRemoved(groupInfo)
-    if (canBlockForAll || canRemove) {
-      DefaultDropdownMenu(showMenu) {
-        if (canBlockForAll) {
-          if (member.blockedByAdmin) {
-            ItemAction(stringResource(MR.strings.unblock_for_all), painterResource(MR.images.ic_do_not_touch), onClick = {
-              unblockForAllAlert(rhId, groupInfo, member)
-              showMenu.value = false
-            })
-          } else {
-            ItemAction(stringResource(MR.strings.block_for_all), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
-              blockForAllAlert(rhId, groupInfo, member)
-              showMenu.value = false
-            })
-          }
-        }
-        if (canRemove) {
-          ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
-            removeMemberAlert(rhId, groupInfo, member)
-            showMenu.value = false
-          })
-        }
-      }
+  // revert from this:
+  DefaultDropdownMenu(showMenu) {
+    if (member.canBeRemoved(groupInfo)) {
+      ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
+        removeMemberAlert(rhId, groupInfo, member)
+        showMenu.value = false
+      })
     }
-  } else if (!member.blockedByAdmin) {
-    DefaultDropdownMenu(showMenu) {
-      if (member.memberSettings.showMessages) {
-        ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
-          blockMemberAlert(rhId, groupInfo, member)
-          showMenu.value = false
-        })
-      } else {
-        ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
-          unblockMemberAlert(rhId, groupInfo, member)
-          showMenu.value = false
-        })
-      }
+    if (member.memberSettings.showMessages) {
+      ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
+        blockMemberAlert(rhId, groupInfo, member)
+        showMenu.value = false
+      })
+    } else {
+      ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
+        unblockMemberAlert(rhId, groupInfo, member)
+        showMenu.value = false
+      })
     }
   }
+  // revert to this: vvv
+//    if (groupInfo.membership.memberRole >= GroupMemberRole.Admin) {
+//      val canBlockForAll = member.canBlockForAll(groupInfo)
+//      val canRemove = member.canBeRemoved(groupInfo)
+//      if (canBlockForAll || canRemove) {
+//        DefaultDropdownMenu(showMenu) {
+//          if (canBlockForAll) {
+//            if (member.blockedByAdmin) {
+//              ItemAction(stringResource(MR.strings.unblock_for_all), painterResource(MR.images.ic_do_not_touch), onClick = {
+//                unblockForAllAlert(rhId, groupInfo, member)
+//                showMenu.value = false
+//              })
+//            } else {
+//              ItemAction(stringResource(MR.strings.block_for_all), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
+//                blockForAllAlert(rhId, groupInfo, member)
+//                showMenu.value = false
+//              })
+//            }
+//          }
+//          if (canRemove) {
+//            ItemAction(stringResource(MR.strings.remove_member_button), painterResource(MR.images.ic_delete), color = MaterialTheme.colors.error, onClick = {
+//              removeMemberAlert(rhId, groupInfo, member)
+//              showMenu.value = false
+//            })
+//          }
+//        }
+//      }
+//    } else if (!member.blockedByAdmin) {
+//      DefaultDropdownMenu(showMenu) {
+//        if (member.memberSettings.showMessages) {
+//          ItemAction(stringResource(MR.strings.block_member_button), painterResource(MR.images.ic_back_hand), color = MaterialTheme.colors.error, onClick = {
+//            blockMemberAlert(rhId, groupInfo, member)
+//            showMenu.value = false
+//          })
+//        } else {
+//          ItemAction(stringResource(MR.strings.unblock_member_button), painterResource(MR.images.ic_do_not_touch), onClick = {
+//            unblockMemberAlert(rhId, groupInfo, member)
+//            showMenu.value = false
+//          })
+//        }
+//      }
+//    }
+  // ^^^
 }
 
 @Composable

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMemberInfoView.kt

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

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIFileView.kt

@@ -94,7 +94,7 @@ fun CIFileView(
             FileProtocol.LOCAL -> {}
           }
         file.fileStatus is CIFileStatus.RcvComplete || (file.fileStatus is CIFileStatus.SndStored && file.fileProtocol == FileProtocol.LOCAL) -> {
-          withLongRunningApi(slow = 600_000) {
+          withLongRunningApi(slow = 60_000, deadlock = 600_000) {
             var filePath = getLoadedFilePath(file)
             if (chatModel.connectedToRemote() && filePath == null) {
               file.loadRemoteFile(true)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/CIVIdeoView.kt

@@ -41,7 +41,7 @@ fun CIVideoView(
     val filePath = remember(file, CIFile.cachedRemoteFileRequests.toList()) { mutableStateOf(getLoadedFilePath(file)) }
     if (chatModel.connectedToRemote()) {
       LaunchedEffect(file) {
-        withLongRunningApi(slow = 600_000) {
+        withLongRunningApi(slow = 60_000, deadlock = 600_000) {
           if (file != null && file.loaded && getLoadedFilePath(file) == null) {
             file.loadRemoteFile(false)
             filePath.value = getLoadedFilePath(file)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt

@@ -213,7 +213,7 @@ fun ChatItemView(
                       showMenu.value = false
                     }
                     if (chatModel.connectedToRemote() && fileSource == null) {
-                      withLongRunningApi(slow = 600_000) {
+                      withLongRunningApi(slow = 60_000, deadlock = 600_000) {
                         cItem.file?.loadRemoteFile(true)
                         fileSource = getLoadedFileSource(cItem.file)
                         shareIfExists()

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")

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) {
@@ -143,7 +143,7 @@ private fun ShareList(chatModel: ChatModel, search: String) {
   }
   val chats by remember(search) {
     derivedStateOf {
-      if (search.isEmpty()) chatModel.chats.toList().filter { it.chatInfo.ready } else chatModel.chats.toList().filter { it.chatInfo.ready }.filter(filter)
+      if (search.isEmpty()) chatModel.chats.filter { it.chatInfo.ready } else chatModel.chats.filter { it.chatInfo.ready }.filter(filter)
     }
   }
   LazyColumn(

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AlertManager.kt

@@ -12,7 +12,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.*
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.style.TextAlign
@@ -23,7 +22,6 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.painterResource
-import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 
@@ -191,7 +189,6 @@ class AlertManager {
     title: String, text: String? = null,
     confirmText: String = generalGetString(MR.strings.ok),
     hostDevice: Pair<Long?, String>? = null,
-    shareText: Boolean? = null
   ) {
     showAlert {
       AlertDialog(
@@ -205,19 +202,10 @@ class AlertManager {
               delay(200)
               focusRequester.requestFocus()
             }
-            // Can pass shareText = false to prevent showing Share button if it's needed in a specific case
-            val showShareButton = text != null && (shareText == true || (shareText == null && text.length > 500))
             Row(
               Modifier.fillMaxWidth().padding(horizontal = DEFAULT_PADDING),
-              horizontalArrangement = if (showShareButton) Arrangement.SpaceBetween else Arrangement.Center
+              horizontalArrangement = Arrangement.Center
             ) {
-              val clipboard = LocalClipboardManager.current
-              if (showShareButton && text != null) {
-                TextButton(onClick = {
-                  clipboard.shareText(text)
-                  hideAlert()
-                }) { Text(stringResource(MR.strings.share_verb)) }
-              }
               TextButton(
                 onClick = {
                   hideAlert()

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)
           }

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
     )
   }
 }

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() }
     }
   }

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ProcessedErrors.kt

@@ -16,7 +16,7 @@ class ProcessedErrors <T: AgentErrorType>(val interval: Long) {
 
   fun newError(error: T, offerRestart: Boolean) {
     timer.cancel()
-    timer = withLongRunningApi(slow = 130_000) {
+    timer = withLongRunningApi(slow = 70_000, deadlock = 130_000) {
       val delayBeforeNext = (lastShownTimestamp + interval) - System.currentTimeMillis()
       if ((lastShownOfferRestart || !offerRestart) && delayBeforeNext >= 0) {
         delay(delayBeforeNext)

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Utils.kt

@@ -37,22 +37,30 @@ fun withBGApi(action: suspend CoroutineScope.() -> Unit): Job =
     CoroutineScope(singleThreadDispatcher).launch(block = { wrapWithLogging(action, it) })
   }
 
-fun withLongRunningApi(slow: Long = Long.MAX_VALUE, action: suspend CoroutineScope.() -> Unit): Job =
+fun withLongRunningApi(slow: Long = Long.MAX_VALUE, deadlock: Long = Long.MAX_VALUE, action: suspend CoroutineScope.() -> Unit): Job =
   Exception().let {
-    CoroutineScope(Dispatchers.Default).launch(block = { wrapWithLogging(action, it, slow = slow) })
+    CoroutineScope(Dispatchers.Default).launch(block = { wrapWithLogging(action, it, slow = slow, deadlock = deadlock) })
   }
 
-private suspend fun wrapWithLogging(action: suspend CoroutineScope.() -> Unit, exception: java.lang.Exception, slow: Long = 20_000) = coroutineScope {
+private suspend fun wrapWithLogging(action: suspend CoroutineScope.() -> Unit, exception: java.lang.Exception, slow: Long = 10_000, deadlock: Long = 60_000) = coroutineScope {
   val start = System.currentTimeMillis()
+  val job = launch {
+    delay(deadlock)
+    Log.e(TAG, "Possible deadlock of the thread, not finished after ${deadlock / 1000}s:\n${exception.stackTraceToString()}")
+    AlertManager.shared.showAlertMsg(
+      title = generalGetString(MR.strings.possible_deadlock_title),
+      text = generalGetString(MR.strings.possible_deadlock_desc).format(deadlock / 1000, exception.stackTraceToString()),
+    )
+  }
   action()
-  val end = System.currentTimeMillis()
-  if (end - start > slow) {
-    Log.e(TAG, "Possible problem with execution of the thread, took ${(end - start) / 1000}s:\n${exception.stackTraceToString()}")
-    if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
+  job.cancel()
+  if (appPreferences.developerTools.get() && appPreferences.showSlowApiCalls.get()) {
+    val end = System.currentTimeMillis()
+    if (end - start > slow) {
+      Log.e(TAG, "Possible problem with execution of the thread, took ${(end - start) / 1000}s:\n${exception.stackTraceToString()}")
       AlertManager.shared.showAlertMsg(
         title = generalGetString(MR.strings.possible_slow_function_title),
         text = generalGetString(MR.strings.possible_slow_function_desc).format((end - start) / 1000, exception.stackTraceToString()),
-        shareText = true
       )
     }
   }
@@ -411,7 +419,7 @@ expect fun ByteArray.toBase64StringForPassphrase(): String
 
 // Android's default implementation that was used before multiplatform, adds non-needed characters at the end of string
 // which can be bypassed by:
-// fun String.toByteArrayFromBase64(): ByteArray = Base64.getMimeDecoder().decode(this.trimEnd { it == '\n' || it == ' ' })
+// fun String.toByteArrayFromBase64(): ByteArray = Base64.getDecoder().decode(this.trimEnd { it == '\n' || it == ' ' })
 expect fun String.toByteArrayFromBase64ForPassphrase(): ByteArray
 
 val LongRange.Companion.saver

apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/PrivacySettings.kt

@@ -96,7 +96,7 @@ fun PrivacySettingsView(
     val currentUser = chatModel.currentUser.value
     if (currentUser != null) {
       fun setSendReceiptsContacts(enable: Boolean, clearOverrides: Boolean) {
-        withLongRunningApi(slow = 60_000) {
+        withLongRunningApi(slow = 30_000, deadlock = 60_000) {
           val mrs = UserMsgReceiptSettings(enable, clearOverrides)
           chatModel.controller.apiSetUserContactReceipts(currentUser, mrs)
           chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)
@@ -119,7 +119,7 @@ fun PrivacySettingsView(
       }
 
       fun setSendReceiptsGroups(enable: Boolean, clearOverrides: Boolean) {
-        withLongRunningApi(slow = 60_000) {
+        withLongRunningApi(slow = 30_000, deadlock = 60_000) {
           val mrs = UserMsgReceiptSettings(enable, clearOverrides)
           chatModel.controller.apiSetUserGroupReceipts(currentUser, mrs)
           chatModel.controller.appPrefs.privacyDeliveryReceiptsSet.set(true)

apps/multiplatform/common/src/commonMain/resources/MR/ar/strings.xml

@@ -1588,6 +1588,8 @@
     <string name="remote_ctrl_error_busy">سطح المكتب مشغول</string>
     <string name="remote_ctrl_error_bad_version">يحتوي سطح المكتب على إصدار غير مدعوم. يُرجى التأكد من استخدام نفس الإصدار على كلا الجهازين</string>
     <string name="past_member_vName">العضو السابق %1$s</string>
+    <string name="possible_deadlock_title">مأزق</string>
+    <string name="possible_deadlock_desc">يستغرق تنفيذ التعليمات البرمجية وقتًا طويلاً جدًا: %1$d ثانية. من المحتمل أن التطبيق مجمّد: %2$s</string>
     <string name="possible_slow_function_title">وظيفة بطيئة</string>
     <string name="developer_options_section">خيارات المطور</string>
     <string name="profile_update_event_member_name_changed">تغيّر العضو %1$s إلى %2$s</string>

apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml

@@ -147,6 +147,8 @@
   <string name="smp_server_test_delete_file">Delete file</string>
   <string name="error_deleting_user">Error deleting user profile</string>
   <string name="error_updating_user_privacy">Error updating user privacy</string>
+  <string name="possible_deadlock_title">Deadlock</string>
+  <string name="possible_deadlock_desc">Execution of code takes too long time: %1$d seconds. Probably, the app is frozen: %2$s</string>
   <string name="possible_slow_function_title">Slow function</string>
   <string name="possible_slow_function_desc">Execution of function takes too long time: %1$d seconds: %2$s</string>
 
@@ -177,9 +179,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 -->
@@ -804,10 +803,6 @@
   <string name="callstate_connected">connected</string>
   <string name="callstate_ended">ended</string>
 
-  <!-- CallView -->
-  <string name="unable_to_open_browser_title">Error opening browser</string>
-  <string name="unable_to_open_browser_desc">The default web browser is required for calls. Please configure the default browser in the system, and share more information with the developers.</string>
-
   <!-- SimpleXInfo -->
   <string name="next_generation_of_private_messaging">The next generation of private messaging</string>
   <string name="privacy_redefined">Privacy redefined</string>

apps/multiplatform/common/src/commonMain/resources/MR/bg/strings.xml

@@ -1555,6 +1555,7 @@
     <string name="chat_is_stopped_you_should_transfer_database">Чатът е спрян. Ако вече сте използвали тази база данни на друго устройство, трябва да я прехвърлите обратно, преди да стартирате чата отново.</string>
     <string name="remote_ctrl_error_bad_invitation">Настолното устройство има грешен код за връзка</string>
     <string name="remote_ctrl_error_bad_version">Настолното устройство е с неподдържана версия. Моля, уверете се, че използвате една и съща версия и на двете устройства</string>
+    <string name="possible_deadlock_desc">Изпълнението на кода отнема твърде много време: %1$d секунди. Вероятно приложението е замразено: %2$s</string>
     <string name="possible_slow_function_title">Бавна функция</string>
     <string name="possible_slow_function_desc">Изпълнението на функцията отнема твърде много време: %1$d секунди: %2$s</string>
     <string name="show_internal_errors">Покажи вътрешните грешки</string>
@@ -1590,4 +1591,5 @@
 \nПрепоръчително е да рестартирате приложението.</string>
     <string name="developer_options_section">Опции за разработчици</string>
     <string name="show_slow_api_calls">Показване на бавни API заявки</string>
+    <string name="possible_deadlock_title">Грешка в заключено положение</string>
 </resources>

apps/multiplatform/common/src/commonMain/resources/MR/de/strings.xml

@@ -1672,7 +1672,9 @@
     <string name="possible_slow_function_title">Langsame Funktion</string>
     <string name="show_slow_api_calls">Zeige langsame API-Aufrufe an</string>
     <string name="group_member_status_unknown_short">unbekannt</string>
+    <string name="possible_deadlock_title">Blockade</string>
     <string name="developer_options_section">Optionen für Entwickler</string>
+    <string name="possible_deadlock_desc">Die Code-Ausführung dauert zu lange: %1$d Sekunden. Wahrscheinlich ist die App eingefroren: %2$s</string>
     <string name="group_member_status_unknown">unbekannter Gruppenmitglieds-Status</string>
     <string name="v5_5_private_notes_descr">Mit verschlüsselten Dateien und Medien.</string>
     <string name="v5_5_private_notes">Private Notizen</string>

apps/multiplatform/common/src/commonMain/resources/MR/fr/strings.xml

@@ -1559,9 +1559,11 @@
     <string name="remote_host_error_bad_state"><![CDATA[État médiocre de la connexion au mobile <b>%s</b>.]]></string>
     <string name="remote_ctrl_was_disconnected_title">Connexion interrompue</string>
     <string name="remote_ctrl_error_bad_state">État médiocre de la connexion avec le bureau</string>
+    <string name="possible_deadlock_title">Impasse</string>
     <string name="remote_ctrl_error_bad_version">La version de l\'ordinateur de bureau n\'est pas prise en charge. Veillez à utiliser la même version sur les deux appareils.</string>
     <string name="remote_ctrl_error_disconnected">Le bureau a été déconnecté</string>
     <string name="developer_options_section">Options pour les développeurs</string>
+    <string name="possible_deadlock_desc">Le code prend trop de temps à s\'exécuter : %1$d secondes. Il est probable que l\'application soit figée : %2$s</string>
     <string name="agent_internal_error_title">Erreur interne</string>
     <string name="remote_host_error_bad_version"><![CDATA[La version du mobile <b>%s</b> n\'est pas prise en charge. Veillez à utiliser la même version sur les deux appareils.]]></string>
     <string name="show_internal_errors">Afficher les erreurs internes</string>

apps/multiplatform/common/src/commonMain/resources/MR/hu/strings.xml

@@ -1583,7 +1583,9 @@
     <string name="possible_slow_function_title">Lassú funkció</string>
     <string name="show_slow_api_calls">Lassú API-hívások megjelenítése</string>
     <string name="remote_host_error_inactive"><![CDATA[A(z) <b>%s</b> mobil eszköz inaktív]]></string>
+    <string name="possible_deadlock_title">Elakadt</string>
     <string name="developer_options_section">Fejlesztői beállítások</string>
+    <string name="possible_deadlock_desc">A kód végrehajtása túl sokáig tart: %1$d másodperc. Valószínűleg az alkalmazás lefagyott: %2$s</string>
     <string name="possible_slow_function_desc">A funkció végrehajtása túl sokáig tart: %1$d másodperc: %2$s</string>
     <string name="remote_host_error_busy"><![CDATA[A(z) <b>%s</b> mobil eszköz elfoglalt]]></string>
     <string name="past_member_vName">Legutóbbi tag %1$s</string>

apps/multiplatform/common/src/commonMain/resources/MR/it/strings.xml

@@ -1591,7 +1591,9 @@
     <string name="possible_slow_function_title">Funzione lenta</string>
     <string name="show_slow_api_calls">Mostra chiamate API lente</string>
     <string name="group_member_status_unknown_short">sconosciuto</string>
+    <string name="possible_deadlock_desc">L\'esecuzione del codice impiega troppo tempo: %1$d secondi. Probabilmente l\'app è congelata: %2$s</string>
     <string name="group_member_status_unknown">stato sconosciuto</string>
+    <string name="possible_deadlock_title">Stallo</string>
     <string name="developer_options_section">Opzioni sviluppatore</string>
     <string name="v5_5_private_notes">Note private</string>
     <string name="v5_5_new_interface_languages">Interfaccia in ungherese e turco</string>

apps/multiplatform/common/src/commonMain/resources/MR/ja/strings.xml

@@ -1571,7 +1571,9 @@
     <string name="remote_ctrl_error_busy">PC版が処理中</string>
     <string name="remote_ctrl_error_disconnected">PC版が切断されました</string>
     <string name="remote_ctrl_error_bad_version">ご利用のPC版のバージョンがサポートされてません。両端末が同じバージョンかどうか、ご確認ください。</string>
+    <string name="possible_deadlock_title">デッドロック状態</string>
     <string name="developer_options_section">開発者向けの設定</string>
+    <string name="possible_deadlock_desc">処理時間が異常にかかるようです: %1$d 秒。アプリが固まった恐れがあります: %2$s</string>
     <string name="remote_host_error_busy"><![CDATA[携帯版 <b>%s</b> がただいま処理中]]></string>
     <string name="possible_slow_function_desc">機能の処理時間が以上にかかってます: %1$d 秒: %2$s</string>
     <string name="show_internal_errors">内部エラーを表示</string>

apps/multiplatform/common/src/commonMain/resources/MR/nl/strings.xml

@@ -1574,6 +1574,7 @@
     <string name="remote_host_error_missing"><![CDATA[Mobiel <b>%s</b> ontbreekt]]></string>
     <string name="remote_host_error_bad_state"><![CDATA[De verbinding met de mobiel <b>%s</b> is in slechte staat]]></string>
     <string name="remote_ctrl_error_disconnected">De verbinding met desktop is verbroken</string>
+    <string name="possible_deadlock_title">Impasse</string>
     <string name="possible_slow_function_desc">Uitvoering van functie duurt te lang: %1$d seconden: %2$s</string>
     <string name="possible_slow_function_title">Langzame functie</string>
     <string name="developer_options_section">Ontwikkelaars opties</string>
@@ -1587,6 +1588,7 @@
     <string name="restart_chat_button">Chat opnieuw starten</string>
     <string name="remote_host_error_timeout"><![CDATA[Time-out bereikt tijdens het verbinden met de mobiel <b>%s</b>]]></string>
     <string name="remote_ctrl_error_bad_state">De verbinding met de desktop is in slechte staat</string>
+    <string name="possible_deadlock_desc">Het uitvoeren van de code duurt te lang: %1$d seconden. Waarschijnlijk is de app vastgelopen: %2$s</string>
     <string name="remote_ctrl_error_bad_invitation">Desktop heeft verkeerde uitnodigingscode</string>
     <string name="remote_host_error_bad_version"><![CDATA[Mobiel <b>%s</b> heeft een niet-ondersteunde versie. Zorg ervoor dat u op beide apparaten dezelfde versie gebruikt]]></string>
     <string name="remote_ctrl_error_timeout">Time-out bereikt tijdens het verbinden met de desktop</string>

apps/multiplatform/common/src/commonMain/resources/MR/pl/strings.xml

@@ -1606,6 +1606,7 @@
     <string name="remote_ctrl_error_bad_version">Komputer ma niewspieraną wersję. Proszę upewnić się, że używasz tych samych wersji na obu urządzeniach</string>
     <string name="blocked_by_admin_items_description">%d wiadomości zablokowanych przez admina</string>
     <string name="error_creating_message">Błąd tworzenia wiadomości</string>
+    <string name="possible_deadlock_desc">Wykonanie kodu zajmuje za dużo czasu: %1$d sekund. Prawdopodobnie aplikacja jest zamrożona: %2$s</string>
     <string name="possible_slow_function_desc">Wykonanie kodu zajmuje za dużo czasu: %1$d sekund: %2$s</string>
     <string name="note_folder_local_display_name">Prywatne notatki</string>
     <string name="group_member_status_unknown">nieznany status</string>
@@ -1620,6 +1621,7 @@
     <string name="remote_host_error_inactive"><![CDATA[Telefon <b>%s</b> jest nieaktywny]]></string>
     <string name="remote_host_error_bad_version"><![CDATA[Telefon <b>%s</b> ma niewspieraną wersję. Proszę, upewnij się, że używasz tej samej wersji na obydwu urządzeniach]]></string>
     <string name="group_member_status_unknown_short">nieznany</string>
+    <string name="possible_deadlock_title">Blokada</string>
     <string name="profile_update_event_contact_name_changed">kontakt %1$s zmieniony na %2$s</string>
     <string name="profile_update_event_removed_address">usunięto adres kontaktu</string>
     <string name="profile_update_event_removed_picture">usunięto zdjęcie profilu</string>

apps/multiplatform/common/src/commonMain/resources/MR/ru/strings.xml

@@ -1680,6 +1680,8 @@
     <string name="error_showing_message">ошибка отображения сообщения</string>
     <string name="error_showing_content">ошибка отображения содержания</string>
     <string name="remote_ctrl_disconnected_with_reason">Отсоединён по причине: %s</string>
+    <string name="possible_deadlock_title">Взаимная блокировка</string>
+    <string name="possible_deadlock_desc">Выполнение задачи занимает долгое время: %1$d секунд. Возможно, приложение заблокировано: %2$s</string>
     <string name="possible_slow_function_desc">Выполнение задачи занимает долгое время: %1$d секунд: %2$s</string>
     <string name="possible_slow_function_title">Медленный вызов</string>
     <string name="profile_update_event_contact_name_changed">контакт %1$s изменён на %2$s</string>

apps/multiplatform/common/src/commonMain/resources/MR/zh-rCN/strings.xml

@@ -1586,6 +1586,8 @@
     <string name="remote_host_error_bad_state"><![CDATA[到移动主机 <b>%s</b>的连接状态不佳]]></string>
     <string name="remote_host_error_timeout"><![CDATA[连接到移动主机<b>%s</b>时超时]]></string>
     <string name="failed_to_create_user_invalid_desc">显示名无效。请另选一个名称。</string>
+    <string name="possible_deadlock_title">死锁</string>
+    <string name="possible_deadlock_desc">代码执行花费的时间过久：%1$d秒。应用可能卡住了：%2$s</string>
     <string name="possible_slow_function_title">慢函数</string>
     <string name="show_slow_api_calls">显示缓慢的 API 调用</string>
     <string name="past_member_vName">过往成员 %1$s</string>

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

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;

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 = {

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

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;

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/DesktopApp.kt

@@ -39,8 +39,7 @@ fun showApp() {
           WindowExceptionHandler { e ->
             AlertManager.shared.showAlertMsg(
               title = generalGetString(MR.strings.app_was_crashed),
-              text = e.stackTraceToString(),
-              shareText = true
+              text = e.stackTraceToString()
             )
             Log.e(TAG, "App crashed, thread name: " + Thread.currentThread().name + ", exception: " + e.stackTraceToString())
             window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/platform/Images.desktop.kt

@@ -17,14 +17,14 @@ import javax.imageio.stream.MemoryCacheImageOutputStream
 import kotlin.math.sqrt
 
 private fun errorBitmap(): ImageBitmap =
-  ImageIO.read(ByteArrayInputStream(Base64.getMimeDecoder().decode("iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAKVJREFUeF7t1kENACEUQ0FQhnVQ9lfGO+xggITQdvbMzArPey+8fa3tAfwAEdABZQspQStgBssEcgAIkSAJkiAJljtEgiRIgmUCSZAESZAESZAEyx0iQRIkwTKBJEiCv5fgvTd1wDmn7QAP4AeIgA4oW0gJWgEzWCZwbQ7gAA7ggLKFOIADOKBMIAeAEAmSIAmSYLlDJEiCJFgmkARJkARJ8N8S/ADTZUewBvnTOQAAAABJRU5ErkJggg=="))).toComposeImageBitmap()
+  ImageIO.read(ByteArrayInputStream(Base64.getDecoder().decode("iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAKVJREFUeF7t1kENACEUQ0FQhnVQ9lfGO+xggITQdvbMzArPey+8fa3tAfwAEdABZQspQStgBssEcgAIkSAJkiAJljtEgiRIgmUCSZAESZAESZAEyx0iQRIkwTKBJEiCv5fgvTd1wDmn7QAP4AeIgA4oW0gJWgEzWCZwbQ7gAA7ggLKFOIADOKBMIAeAEAmSIAmSYLlDJEiCJFgmkARJkARJ8N8S/ADTZUewBvnTOQAAAABJRU5ErkJggg=="))).toComposeImageBitmap()
 
 actual fun base64ToBitmap(base64ImageString: String): ImageBitmap {
   val imageString = base64ImageString
     .removePrefix("data:image/png;base64,")
     .removePrefix("data:image/jpg;base64,")
   return try {
-    ImageIO.read(ByteArrayInputStream(Base64.getMimeDecoder().decode(imageString))).toComposeImageBitmap()
+    ImageIO.read(ByteArrayInputStream(Base64.getDecoder().decode(imageString))).toComposeImageBitmap()
   } catch (e: IOException) {
     Log.e(TAG, "base64ToBitmap error: $e")
     errorBitmap()
@@ -77,7 +77,7 @@ actual fun compressImageStr(bitmap: ImageBitmap): String {
   return try {
     val encoded  = Base64.getEncoder().encodeToString(compressImageData(bitmap, usePng).toByteArray())
     "data:image/$ext;base64,$encoded"
-  } catch (e: Exception) {
+  } catch (e: IOException) {
     Log.e(TAG, "resizeImageToStrSize error: $e")
     throw e
   }

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/call/CallView.desktop.kt

@@ -146,21 +146,8 @@ private fun SendStateUpdates() {
 @Composable
 fun WebRTCController(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIMessage) -> Unit) {
   val uriHandler = LocalUriHandler.current
-  val endCall = {
-    val call = chatModel.activeCall.value
-    if (call != null) withBGApi { chatModel.callManager.endCall(call) }
-  }
   val server = remember {
-    try {
-      uriHandler.openUri("http://${SERVER_HOST}:$SERVER_PORT/simplex/call/")
-    } catch (e: Exception) {
-      Log.e(TAG, "Unable to open browser: ${e.stackTraceToString()}")
-      AlertManager.shared.showAlertMsg(
-        title = generalGetString(MR.strings.unable_to_open_browser_title),
-        text = generalGetString(MR.strings.unable_to_open_browser_desc)
-      )
-      endCall()
-    }
+    uriHandler.openUri("http://${SERVER_HOST}:$SERVER_PORT/simplex/call/")
     startServer(onResponse)
   }
   fun processCommand(cmd: WCallCommand) {

apps/multiplatform/common/src/desktopMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.desktop.kt

@@ -42,7 +42,7 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
     }
     var fileSource = getLoadedFileSource(cItem.file)
     if (chatModel.connectedToRemote() && fileSource == null) {
-      withLongRunningApi(slow = 600_000) {
+      withLongRunningApi(slow = 60_000, deadlock = 600_000) {
         cItem.file?.loadRemoteFile(true)
         fileSource = getLoadedFileSource(cItem.file)
         saveIfExists()
@@ -51,7 +51,7 @@ actual fun SaveContentItemAction(cItem: ChatItem, saveFileLauncher: FileChooserL
   })
 }
 
-actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) = withLongRunningApi(slow = 600_000) {
+actual fun copyItemToClipboard(cItem: ChatItem, clipboard: ClipboardManager) = withLongRunningApi(slow = 60_000, deadlock = 600_000) {
   var fileSource = getLoadedFileSource(cItem.file)
   if (chatModel.connectedToRemote() && fileSource == null) {
     cItem.file?.loadRemoteFile(true)

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(

apps/multiplatform/gradle.properties

@@ -25,11 +25,11 @@ android.nonTransitiveRClass=true
 android.enableJetifier=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-android.version_name=5.5.5
-android.version_code=185
+android.version_name=5.5.2
+android.version_code=179
 
-desktop.version_name=5.5.5
-desktop.version_code=31
+desktop.version_name=5.5.2
+desktop.version_code=28
 
 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2

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: 0d843ea4ce1b26a25b55756bf86d1007629896c5
+    tag: a516c2f72c81bb4a433c4065b1b5aa484b8292b1
 
 source-repository-package
     type: git

docs/DOWNLOADS.md

@@ -1,13 +1,13 @@
 ---
 title: Download SimpleX apps
 permalink: /downloads/index.html
-revision: 11.02.2024
+revision: 25.11.2023
 ---
 
-| Updated 11.02.2024 | Languages: EN |
+| Updated 25.11.2023 | Languages: EN |
 # Download SimpleX apps
 
-The latest stable version is v5.5.3.
+The latest stable version is v5.5.
 
 You can get the latest beta releases from [GitHub](https://github.com/simplex-chat/simplex-chat/releases).
 
@@ -21,24 +21,24 @@ You can get the latest beta releases from [GitHub](https://github.com/simplex-ch
 
 Using the same profile as on mobile device is not yet supported – you need to create a separate profile to use desktop apps.
 
-**Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-ubuntu-22_04-x86_64.deb).
+**Linux**: [AppImage](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-x86_64.AppImage) (most Linux distros), [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-ubuntu-20_04-x86_64.deb) (and Debian-based distros), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-ubuntu-22_04-x86_64.deb).
 
-**Mac**: [aarch64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-macos-aarch64.dmg) (Apple Silicon), [x86_64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-macos-x86_64.dmg) (Intel).
+**Mac**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-macos-x86_64.dmg) (Intel), [aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-macos-aarch64.dmg) (Apple Silicon).
 
-**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-desktop-windows-x86_64.msi).
+**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-desktop-windows-x86_64.msi).
 
 ## Mobile apps
 
 **iOS**: [App store](https://apps.apple.com/us/app/simplex-chat/id1605771084), [TestFlight](https://testflight.apple.com/join/DWuT2LQu).
 
-**Android**: [Play store](https://play.google.com/store/apps/details?id=chat.simplex.app), [F-Droid](https://simplex.chat/fdroid/), [APK aarch64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex.apk), [APK armv7](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-armv7a.apk).
+**Android**: [Play store](https://play.google.com/store/apps/details?id=chat.simplex.app), [F-Droid](https://simplex.chat/fdroid/), [APK aarch64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex.apk), [APK armv7](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-armv7a.apk).
 
 ## Terminal (console) app
 
 See [Using terminal app](/docs/CLI.md).
 
-**Linux**: [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-chat-ubuntu-20_04-x86-64), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-chat-ubuntu-22_04-x86-64).
+**Linux**: [Ubuntu 20.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-chat-ubuntu-20_04-x86-64), [Ubuntu 22.04](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-chat-ubuntu-22_04-x86-64).
 
-**Mac** [x86_64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-chat-macos-x86-64), aarch64 - [compile from source](/docs/CLI.md#).
+**Mac** [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-chat-macos-x86-64), aarch64 - [compile from source](/docs/CLI.md#).
 
-**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/latest/download/simplex-chat-windows-x86-64).
+**Windows**: [x86_64](https://github.com/simplex-chat/simplex-chat/releases/download/v5.5.0/simplex-chat-windows-x86-64).

docs/SERVER.md

@@ -24,7 +24,7 @@ _Please note_: when you change the servers in the app configuration, it only aff
    - Semi-automatic deployment:
      - [Offical installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
      - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
+     - [Linode StackScript](https://github.com/simplex-chat/simplexmq#deploy-smp-server-on-linode)
 
 Manual installation requires some preliminary actions:
 
@@ -33,7 +33,7 @@ Manual installation requires some preliminary actions:
    - Using offical binaries:
 
      ```sh
-     curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/smp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/smp-server && chmod +x /usr/local/bin/smp-server
+     curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/smp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/smp-server
      ```
 
    - Compiling from source:
@@ -417,63 +417,6 @@ To import `csv` to `Grafana` one should:
 
 For further documentation, see: [CSV Data Source for Grafana - Documentation](https://grafana.github.io/grafana-csv-datasource/)
 
-# Updating your SMP server
-
-To update your smp-server to latest version, choose your installation method and follow the steps:
-
-   - Manual deployment
-     1. Stop the server:
-        ```sh
-        sudo systemctl stop smp-server
-        ```
-     2. Update the binary:
-        ```sh
-         curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/smp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/smp-server && chmod +x /usr/local/bin/smp-server
-        ```
-     3. Start the server:
-        ```sh
-        sudo systemctl start smp-server
-        ```
-
-   - [Offical installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
-     1. Execute the followin command:
-        ```sh
-        sudo simplex-servers-update
-        ```
-     2. Done!
-
-   - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     1. Stop and remove the container:
-        ```sh
-        docker rm $(docker stop $(docker ps -a -q --filter ancestor=simplexchat/smp-server --format="{{.ID}}"))
-        ```
-     2. Pull latest image:
-        ```sh
-        docker pull simplexchat/smp-server:latest
-        ```
-     3. Start new container:
-        ```sh
-        docker run -d \
-          -p 5223:5223 \
-          -v $HOME/simplex/smp/config:/etc/opt/simplex:z \
-          -v $HOME/simplex/smp/logs:/var/opt/simplex:z \
-          simplexchat/smp-server:latest
-        ```
-
-   - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
-     1. Pull latest images:
-        ```sh
-        docker-compose --project-directory /etc/docker/compose/simplex pull
-        ```
-     2. Restart the containers:
-        ```sh
-        docker-compose --project-directory /etc/docker/compose/simplex up -d --remove-orphans
-        ```
-     3. Remove obsolete images:
-        ```sh
-        docker image prune
-        ```
-
 ### Configuring the app to use the server
 
 To configure the app to use your messaging server copy it's full address, including password, and add it to the app. You have an option to use your server together with preset servers or without them - you can remove or disable them.

docs/XFTP-SERVER.md

@@ -24,7 +24,6 @@ XFTP is a new file transfer protocol focussed on meta-data protection - it is ba
    - Semi-automatic deployment:
      - [Offical installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
      - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
 
 Manual installation requires some preliminary actions:
 
@@ -33,7 +32,7 @@ Manual installation requires some preliminary actions:
    - Using offical binaries:
 
      ```sh
-     curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/xftp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/xftp-server && chmod +x /usr/local/bin/xftp-server
+     curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/xftp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/xftp-server
      ```
 
    - Compiling from source:
@@ -419,65 +418,6 @@ To import `csv` to `Grafana` one should:
 
 For further documentation, see: [CSV Data Source for Grafana - Documentation](https://grafana.github.io/grafana-csv-datasource/)
 
-
-# Updating your XFTP server
-
-To update your XFTP server to latest version, choose your installation method and follow the steps:
-
-   - Manual deployment
-     1. Stop the server:
-        ```sh
-        sudo systemctl stop xftp-server
-        ```
-     2. Update the binary:
-        ```sh
-         curl -L https://github.com/simplex-chat/simplexmq/releases/latest/download/xftp-server-ubuntu-20_04-x86-64 -o /usr/local/bin/xftp-server && chmod +x /usr/local/bin/xftp-server
-        ```
-     3. Start the server:
-        ```sh
-        sudo systemctl start xftp-server
-        ```
-
-   - [Offical installation script](https://github.com/simplex-chat/simplexmq#using-installation-script)
-     1. Execute the followin command:
-        ```sh
-        sudo simplex-servers-update
-        ```
-     2. Done!
-
-   - [Docker container](https://github.com/simplex-chat/simplexmq#using-docker)
-     1. Stop and remove the container:
-        ```sh
-        docker rm $(docker stop $(docker ps -a -q --filter ancestor=simplexchat/xftp-server --format="{{.ID}}"))
-        ```
-     2. Pull latest image:
-        ```sh
-        docker pull simplexchat/xftp-server:latest
-        ```
-     3. Start new container:
-        ```sh
-        docker run -d \
-          -p 443:443 \
-          -v $HOME/simplex/xftp/config:/etc/opt/simplex-xftp:z \
-          -v $HOME/simplex/xftp/logs:/var/opt/simplex-xftp:z \
-          -v $HOME/simplex/xftp/files:/srv/xftp:z \
-          simplexchat/xftp-server:latest
-        ```
-
-   - [Linode Marketplace](https://www.linode.com/marketplace/apps/simplex-chat/simplex-chat/)
-     1. Pull latest images:
-        ```sh
-        docker-compose --project-directory /etc/docker/compose/simplex pull
-        ```
-     2. Restart the containers:
-        ```sh
-        docker-compose --project-directory /etc/docker/compose/simplex up -d --remove-orphans
-        ```
-     3. Remove obsolete images:
-        ```sh
-        docker image prune
-        ```
-
 ### Configuring the app to use the server
 
 Please see: [SMP Server: Configuring the app to use the server](./SERVER.md#configuring-the-app-to-use-the-server).

docs/rfcs/2023-09-30-pq-double-ratchet.md

@@ -82,7 +82,7 @@ def RatchetInitAlicePQ2HE(state, SK, bob_dh_public_key, shared_hka, shared_nhkb,
     state.PQRs = GENERATE_PQKEM()
     state.PQRr = bob_pq_kem_encapsulation_key
     state.PQRss = random // shared secret for KEM
-    state.PQRct = PQKEM-ENC(state.PQRr, state.PQRss) // encapsulated additional shared secret
+    state.PQRenc_ss = PQKEM-ENC(state.PQRr.encaps, state.PQRss) // encapsulated additional shared secret
     // above added for KEM
     // below augments DH key agreement with PQ shared secret
     state.RK, state.CKs, state.NHKs = KDF_RK_HE(SK, DH(state.DHRs, state.DHRr) || state.PQRss) 
@@ -103,7 +103,7 @@ def RatchetInitBobPQ2HE(state, SK, bob_dh_key_pair, shared_hka, shared_nhkb, bob
     state.PQRs = bob_pq_kem_key_pair
     state.PQRr = None
     state.PQRss = None
-    state.PQRct = None
+    state.PQRenc_ss = None
     // above added for KEM
     state.RK = SK 
     state.CKs = None
@@ -132,10 +132,10 @@ def RatchetEncryptPQ2HE(state, plaintext, AD):
     // encapsulation key from PQRs and encapsulated shared secret is added to header
     header = HEADER_PQ2(
       dh = state.DHRs.public,
-      kem = state.PQRs.public, // added for KEM #2
-      ct = state.PQRct // added for KEM #1
       pn = state.PN,
       n = state.Ns,
+      encaps = state.PQRs.encaps, // added for KEM #1
+      enc_ss = state.PQRenc_ss // added for KEM #2
     )
     enc_header = HENCRYPT(state.HKs, header)
     state.Ns += 1
@@ -162,16 +162,6 @@ def RatchetDecryptPQ2HE(state, enc_header, ciphertext, AD):
     state.Nr += 1
     return DECRYPT(mk, ciphertext, CONCAT(AD, enc_header))
 
-// DecryptHeader is the same as in double ratchet specification
-def DecryptHeader(state, enc_header):
-    header = HDECRYPT(state.HKr, enc_header)
-    if header != None:
-        return header, False
-    header = HDECRYPT(state.NHKr, enc_header)
-    if header != None:
-        return header, True
-    raise Error()
-
 def DHRatchetPQ2HE(state, header):
     state.PN = state.Ns
     state.Ns = 0
@@ -180,16 +170,16 @@ def DHRatchetPQ2HE(state, header):
     state.HKr = state.NHKr
     state.DHRr = header.dh
     // save new encapsulation key from header
-    state.PQRr = header.kem
+    state.PQRr = header.encaps
     // decapsulate shared secret from header - KEM #2
-    ss = PQKEM-DEC(state.PQRs.private, header.ct)
+    ss = PQKEM-DEC(state.PQRs.decaps, header.enc_ss)
     // use decapsulated shared secret with receiving ratchet
     state.RK, state.CKr, state.NHKr = KDF_RK_HE(state.RK, DH(state.DHRs, state.DHRr) || ss)
     state.DHRs = GENERATE_DH()
     // below is added for KEM
     state.PQRs = GENERATE_PQKEM() // generate new PQ key pair
     state.PQRss = random // shared secret for KEM
-    state.PQRct = PQKEM-ENC(state.PQRr, state.PQRss) // encapsulated additional shared secret KEM #1
+    state.PQRenc_ss = PQKEM-ENC(state.PQRr.encaps, state.PQRss) // encapsulated additional shared secret KEM #1
     // above is added for KEM
     // use new shared secret with sending ratchet
     state.RK, state.CKs, state.NHKs = KDF_RK_HE(state.RK, DH(state.DHRs, state.DHRr) || state.PQRss)
@@ -211,7 +201,7 @@ The main downside is the absense of performance-efficient implementation for aar
 
 ## Implementation considerations for SimpleX Chat
 
-As SimpleX Chat pads messages to a fixed size, using 16kb transport blocks, the size increase introduced by this scheme will not cause additional traffic in most cases. For large texts it may require additional messages to be sent. Similarly, for media previews it may require either reducing the preview size (and quality), or sending additional messages, or compressing the current JSON encoding, e.g. with zstd algorithm.
+As SimpleX Chat pads messages to a fixed size, using 16kb transport blocks, the size increase introduced by this scheme will not cause additional traffic in most cases. For large texts it may require additional messages to be sent. Similarly, for media previews it may require either reducing the preview size (and quality) or sending additional messages.
 
 That might be the primary reason why this scheme was not adopted by Signal, as it would have resulted in substantial traffic growth – to the best of our knowledge, Signal messages are not padded to a fixed size.
 
@@ -219,8 +209,6 @@ Sharing the initial keys in case of SimpleX Chat it is equivalent to sharing the
 
 It is possible to postpone sharing the encapsulation key until the first message from Alice (confirmation message in SMP protocol), the party sending connection request. The upside here is that the invitation link size would not increase. The downside is that the user profile shared in this confirmation will not be encrypted with PQ-resistant algorithm. To mitigate it, the hadnshake protocol can be modified to postpone sending the user profile until the second message from Alice (HELLO message in SMP protocol).
 
-Another consideration is pairwise ratchets in groups. Key generation in sntrup761 is quite slow - on slow devices it can probably be as slow as 10 keys per second, so using this primitive in groups larger than 10 members would result in slow performance. An option could be not to use ratchets in groups at all, but that would result in the lack of protection in small groups that simply combine multiple devices of 1-3 people. So a better option would be to support dynamically adding and removing sntrup761 keys for pairwise ratchets in groups, which means that when sending each message a boolean flag needs to be passed whether to use PQ KEM or not.
-
 ## Summary
 
 If chosen PQ KEM proves secure against quantum computer attacks, then the proposed augmented double ratchet will also be secure against quantum computer attack, including break-in recovery property, while keeping deniability and forward secrecy, because the [same proof](https://eprint.iacr.org/2016/1013.pdf) as for double ratchet algorithm would hold here, provided KEM is secure.

docs/rfcs/2023-11-21-inactive-group-members.md

@@ -108,33 +108,3 @@ Sending member builds messages history starting starting from requested/remember
 \***
 
 Same XGrpMsgHistory protocol event could be sent by host to new members, after sending introductions.
-
----
-
-Update 2024-02-12:
-
-### Group "pings"
-
-Alternatively to tracking unanswered messages counts per member, which is complex and in some cases as discussed above ineffective, group members could periodically send group wide pings indicating their active presence.
-
-```haskell
-XGrpPing :: ChatMsgEvent 'Json
-```
-
-Members track:
-
-- inactive flag (as above - set on QUOTA errors as well)
-- last_snd_ts on group
-- last_rcv_ts on group member
-
-Clients run a worker process for checking last_snd_ts in each of their groups, and send pings to groups on a periodic basis.
-
-- part of cleanup manager or separate process?
-- on each worker step, for each group matching criteria to send ping, send ping with a random delay to reduce correlation between groups (spawn a separate thread with a random delay for each group)
-- criteria for sending ping: last_snd_ts earlier than group_ping_interval ago
-- configure group_ping_interval to, for example, 23 hours (so that if user opens app each day at same time client will match criteria to send pings daily)
-
-Clients receiving pings:
-
-- update last_rcv_ts
-- when sending a message to group, check only for timestamp difference (no unanswered snd msg count logic as above)

docs/rfcs/2024-02-12-database-migration.md

@@ -1,130 +0,0 @@
-# Database migration and other operations
-
-## Problem
-
-Migrating database to another device is very complex for most people - it is multi-step and error-prone.
-
-In addition to that, any database operation is confusing as it requires stopping chat.
-
-## Solution
-
-Let users migrate database to another device by scanning QR code.
-
-Simplify other database operations by removing the need to compose multiple actions, stop chat, etc.
-
-To support it, we already added the way to represent the file as link/QR code (by uploading file description to XFTP, and supporting "recursive" descriptions).
-
-There will be these actions in the Database settings (no stop/start chat toggle):
-
-- Export database.
-- Import database.
-- Migrate from another device.
-- Set passphrase (or Change passphrase if it was set).
-- Remove passphrase from device / Store passphrase on the device.
-
-Stop chat toggle will be moved to dev tools.
-
-Migrate to another device will be available in the top part of the settings, 
-
-
-### Database export
-
-Currently, it requires these steps:
-
-1. Open Database settings.
-2. Stop chat (many users don't understand it).
-3. Tap "Export database" in settings.
-4. Look at the alert that says "set passphrase".
-5. Tap Ok.
-6. Tap Set passphrase.
-7. Enter passphrase and confirm.
-8. Exit back to Database settings.
-9. Tap "Export database" again.
-10. Choose file location and save.
-11. Tap "New archive".
-12. Remove exported archive.
-
-These steps are all very confusing, and if they were to stay as composable steps, they belong to dev tools.
-
-Instead we can offer these simple steps:
-
-1. Open Database settings.
-2. Tap "Export database".
-3. Alert will appear saying: "The chat will stop, and you will need to set (or verify) database passphrase. Continue?".
-4. Tap "Ok".
-5. Enter passphrase and confirm in the window that appears (or verify if it was already set, possibly allowing to skip this step).
-7. Choose whether to save file or upload to XFTP and generate link.
-8. File: choose file location and save.
-   Link: show upload progress and then show link to copy.
-9. Alert will appear saying: "Database exported!", exported archive will be automatically removed.
-
-So instead of asking users to understand the required sequence of steps, we will guide them through the required process.
-
-### Database import
-
-1. Open Database settings.
-2. Tap "Import database".
-3. Alert will appear saying: "The chat will stop, you will import?".
-4. File: choose file location and tap "Import".
-   Link: paste link (or scan QR code) and tap "Import".
-5. Confirm to replace database.
-6. Start chat automatically once imported.
-
-### Set or change passphrase
-
-1. Open Database settings.
-2. Tap "Set passphrase" or "Change passphrase" (if it was set).
-3. Choose - store passphrase on the device or enter it every time the app starts.
-
-### Remove / store passphrase from the device
-
-To remove:
-
-1. Open Database settings.
-2. Tap "Remove passphrase".
-3. Confirm to remove passphrase in alert.
-4. Button is replaced with Store.
-
-To store:
-
-1. Open Database settings.
-2. Tap "Store passphrase".
-3. Enter current passphrase - it is verified.
-4. Button is replaced with Remove.
-
-### Migrate database to / from another device
-
-#### User experience
-
-This function is the most important, and it should be available from the main section in settings, under "Use from desktop" (or under "Link from mobile" on desktop).
-
-On the receiving device it will be available via Database settings and also on the Onboarding screen, so users don't need to create a profile.
-
-The steps are:
-
-On the source device:
-1. Tap "Migrate to another device".
-2. The chat will stop showing "Stopping chat" to the user.
-3. If passphrase was:
-   - not set: make user set it in a separate screen.
-   - set: make user verify it.
-5. Show the screen to confirm the upload.
-6. Upload progress (full screen circular progress showing the share, with the %s and total/uploaded size) will be shown.
-7. Once upload is completed, show QR code (with option to copy link), instruct to tap "Migrate from another device" on the receiving device.
-
-On the receiving device:
-2. Tap "Migrate from another device".
-2. The chat will stop (if not from Onboarding) showing "Stopping chat" to the user.
-4. Scan QR code (with option to paste link on desktop only).
-5. Show similar download progress, but probably in reversed direction - design TBC.
-6. Once download is completed, show "Replace the current database" (if not from Onboarding).
-7. Once imported, start chat automatically, and once chat started show "Tap remove database on source device".
-
-On the source device:
-1. Tap "Remove database" on the showing screen (this should also remove uploaded file).
-
-#### Implementation considerations
-
-The latest updates allow uploading and downloading XFTP files without messages.
-
-So to perform the above, the second instance of the chat controller will be required, that probably requires supporting additional/optional chat controller parameter in the APIs that are required for that process.

docs/rfcs/2024-02-19-settings.md

@@ -1,60 +0,0 @@
-# Migrating app settings to another device
-
-## Problem
-
-This is related to simplified database migration UX in the [previous RFC](./2024-02-12-database-migration.md).
-
-Currently, when database is imported after the onboarding is complete, users can configure the app prior to the import.
-
-Some of the settings are particularly important for privacy and security:
-- SOCKS proxy settings
-- Automatic image etc. downloads
-- Link previews
-
-With the new UX, the chat will start automatically, without giving users a chance to configure the app. That means that we have to migrate settings to a new device as well, as part of the archive.
-
-## Solution
-
-There are several possible approaches:
-- put settings to the database via the API
-- save settings as some file with cross-platform format (e.g. JSON or YAML or properties used on desktop).
-
-The second approach seems much simpler than maintaining the settings in the database.
-
-If we save a file, then there are two options:
-- native apps maintain cross-platform schemas for this file, support any JSON and parse it in a safe way (so that even invalid or incorrect JSON - e.g., array instead of object - or invalid types in some properties do not cause the failure of properties that are correct).
-- this schema and type will be maintained in the core library, that will be responsible for storing and reading the settings and passing to native UI as correct record of a given type.
-
-The downside of the second approach is that addition of any property that needs to be migrated will have to be done on any change in either of the platforms. The downside of the first approach is that neither app platform will be self-sufficient any more, and not only iOS/Android would have to take into account code, but also each other code.
-
-If we go with the second approach, there will be these types:
-
-```haskell
-data AppSettings = AppSettings
-  { networkConfig :: NetworkConfig, -- existing type in Haskell and all UIs
-    privacyConfig :: PrivacyConfig -- new type, etc.
-    -- ... additional properties after the initial release should be added as Maybe, as all extensions
-  }
-
-data ArchiveConfig = ArchiveConfig
-  { -- existing properties
-    archivePath :: FilePath,
-    disableCompression :: Maybe Bool,
-    parentTempDirectory :: Maybe FilePath,
-    -- new property
-    appSettings :: AppSettings
-    -- for export, these settings will contain the settings passed from the UI and will be saved to JSON file as simplex_v1_settings.json in the archive
-    -- for import, these settings will contain the defaults that will be used if some property or subproperty is missing in JSON
-  }
-
--- importArchive :: ChatMonad m => ArchiveConfig -> m [ArchiveError] -- current type
-importArchive :: ChatMonad m => ArchiveConfig -> m ArchiveImportResult -- new type
-
--- | CRArchiveImported {archiveErrors :: [ArchiveError]} -- current type
-  | CRArchiveImported {importResult :: ArchiveImportResult} -- new type
-
-data ArchiveImportResult = ArchiveImportResult
-  { archiveErrors :: [ArchiveError],
-    appSettings :: Maybe AppSettings
-  }
-```