mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-11-11 11:47:44 +00:00
* plan: UI improvements to improve LLM usage via SimpleX * core, ui: types for chat layout * core, ui: settings for alternative terminal-like chat layout for managing LLMs or other service bots * plan: message priority * fixes * query plan * update plans * remove silent messages plan * rename migrations * implement layout * amend * fix * fix * fix * improve * time on the right, sender name in blue * no avatar in direct chats * better previews * update, fixes * update * time gap * changes * ui: terminal layout line heights, gaps and time placement * ui: simplify terminal meta layout, correct its docs and tests * ui: right-to-left emoji edge in terminal rows, time placement tests * android, desktop: raise Kotlin compiler memory to 4 GB * ui: terminal captions as follow-up text, classic event separators * ui: terminal media edge and overlay time, plan decisions * ui: simplify terminal row separation, correct doc line references * ui: keep the media time inside terminal rows, restore caption conditions * ui: terminal heading capitals at large font scales, idle live message time * ui: rename the classic voice-with-text flag, correct the meta copy docs * ui: smaller terminal layout diff, sender gap and meta names * ui: terminal row as tall as the media time * docs: remove the chat layout section from the bots readme * docs: shorten the terminal layout section of the chat view * core: address settings API as on master, /auto_accept reads the stored layout * ui: smaller terminal headings * ui: classic sender rows and avatar rule as on master * ui: classic reply quote text colour as on master * ios: keep the chat layout setting with other UI settings * ui: go-to button at the end of terminal rows, no gutter in direct chats * ui: forwarded arrow on the header line of terminal rows, above the time * ui: forwarded arrow centred above the time line of terminal rows * ios: terminal chat layout, chosen per app, profile and chat * ios: event time reserve of three spaces, app layout picker as Kotlin * ios: spec and plan of the terminal chat layout * ios: classic message text at 87% in dark themes, as terminal rows * ios: terminal gaps scaled by the body size, 17/16 of Kotlin values * ios: terminal quote sender at 13.5pt, thumbnail at the item end * ios: product docs of the terminal layout, plans updated for iOS * ios: chat scenes rendered to PNG by a unit test in the simulator CI * ios: snapshots rendered by the smoke test script, workflow unchanged * ios: terminal names at 13.5 x 17/16 pt, as the gaps * ios: Markdown views at the 87% message colour in dark themes * ios: terminal quote thumbnail 12pt after the quote text or the bar * ios: terminal rule-only message widened by a wider quote or header * ios: member avatars scaled with the text size, as in the chat list * ios: snapshot rows at their own height, as list cells, so text wraps * ios: member avatars back at 34pt, for the snapshot before scaling * ios: member avatars scaled with the text size, as in the chat list * ui: terminal quote thumbnail 12dp after the quote text or the bar * ios: classic group bubble width follows the scaled member avatar * ci: ios-sim README describes the snapshots rendered after the smoke test * ios: scratch, padding variants for the I7 and I8 renders, to revert * ios: revert the scratch padding variants after their renders * ui: contrast of the voice message button in terminal rows * ios: scratch, spacing variants and list margins to render, to revert * ios: revert the scratch spacing variants after their renders * ios: snapshots at a fixed date, in UTC and the en_US locale * ios: snapshots drawn as 8-bit sRGB without alpha * ci: compare iOS snapshots with the references in the repository * ci: record and check iOS snapshot references on GitHub's runner * ios: scratch, list margins on the remaining screens, to revert * ios: revert the scratch list margins after their measurement * ci: snapshot scripts executable, as the other CI scripts * ios: scratch, voice circle variants in light themes, to revert * ios: revert the scratch voice circle variants * ios: one 12pt padding at the edges and after avatars in terminal rows * ios: classic group sender name on the bubble edge * ui: one 12dp padding at the edges and after avatars in terminal rows * ios: one heading scale in both chat layouts * ios: snapshot references of the chat scenes * docs: leave the headings and classic lines of the plan to ep/classic-bubbles * ios: declare terminal layout functions inside types * ios: keep layout constants at file scope * ios: keep file-scope functions, move only extension members into types * ios: snapshot tests record row heights at first layout and the appearance layout switch * ios: appearance preview follows the chat layout setting at once * ios: snapshot test measures first-layout rows by SwiftUI and by cells * ios: chat rows measured at the chat width when they first appear * ios: snapshot test checks that chat rows keep their first height after a reload * ios, ci: references of terminal and classic chat scenes, dark message text * ios: message text at 95% in dark themes * ios, ci: references with message text at 95% in dark themes * ios: media in terminal rows end at the time's right inset * ios, ci: references with terminal media at the time's right inset --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>
239 lines
10 KiB
Swift
239 lines
10 KiB
Swift
//
|
|
// CIRcvDecryptionError.swift
|
|
// SimpleX (iOS)
|
|
//
|
|
// Created by Evgeny on 15/04/2023.
|
|
// Copyright © 2023 SimpleX Chat. All rights reserved.
|
|
//
|
|
// Spec: spec/client/chat-view.md
|
|
|
|
import SwiftUI
|
|
import SimpleXChat
|
|
|
|
let decryptErrorReason: LocalizedStringKey = "It can happen when you or your connection used the old database backup."
|
|
|
|
// Spec: spec/client/chat-view.md#CIRcvDecryptionError
|
|
struct CIRcvDecryptionError: View {
|
|
@EnvironmentObject var m: ChatModel
|
|
@EnvironmentObject var theme: AppTheme
|
|
@ObservedObject var chat: Chat
|
|
@Environment(\.showTimestamp) var showTimestamp: Bool
|
|
var msgDecryptError: MsgDecryptError
|
|
var msgCount: UInt32
|
|
var chatItem: ChatItem
|
|
@State private var alert: CIRcvDecryptionErrorAlert?
|
|
|
|
@AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
|
|
|
|
enum CIRcvDecryptionErrorAlert: Identifiable {
|
|
case syncAllowedAlert(_ syncConnection: () -> Void)
|
|
case syncNotSupportedContactAlert
|
|
case syncNotSupportedMemberAlert
|
|
case decryptionErrorAlert
|
|
case error(title: LocalizedStringKey, error: LocalizedStringKey?)
|
|
|
|
var id: String {
|
|
switch self {
|
|
case .syncAllowedAlert: return "syncAllowedAlert"
|
|
case .syncNotSupportedContactAlert: return "syncNotSupportedContactAlert"
|
|
case .syncNotSupportedMemberAlert: return "syncNotSupportedMemberAlert"
|
|
case .decryptionErrorAlert: return "decryptionErrorAlert"
|
|
case let .error(title, _): return "error \(title)"
|
|
}
|
|
}
|
|
}
|
|
|
|
var body: some View {
|
|
ItemWithMeta {
|
|
CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
|
|
} content: { inlineMeta in
|
|
viewBody(inlineMeta)
|
|
}
|
|
.onAppear {
|
|
// for direct chat ConnectionStats are populated on opening chat, see ChatView onAppear
|
|
if case let .group(groupInfo, _) = chat.chatInfo,
|
|
case let .groupRcv(groupMember) = chatItem.chatDir {
|
|
do {
|
|
let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
|
|
if let s = stats {
|
|
m.updateGroupMemberConnectionStats(groupInfo, member, s)
|
|
}
|
|
} catch let error {
|
|
logger.error("apiGroupMemberInfo error: \(responseError(error))")
|
|
}
|
|
}
|
|
}
|
|
.alert(item: $alert) { alertItem in
|
|
switch(alertItem) {
|
|
case let .syncAllowedAlert(syncConnection): return syncAllowedAlert(syncConnection)
|
|
case .syncNotSupportedContactAlert: return Alert(title: Text("Fix not supported by contact"), message: message())
|
|
case .syncNotSupportedMemberAlert: return Alert(title: Text("Fix not supported by group member"), message: message())
|
|
case .decryptionErrorAlert: return Alert(title: Text("Decryption error"), message: message())
|
|
case let .error(title, error): return mkAlert(title: title, message: error)
|
|
}
|
|
}
|
|
}
|
|
|
|
private func viewBody(_ inlineMeta: CIMetaView?) -> some View {
|
|
Group {
|
|
if case let .direct(contact) = chat.chatInfo,
|
|
let contactStats = contact.activeConn?.connectionStats {
|
|
if contactStats.ratchetSyncAllowed {
|
|
decryptionErrorItemFixButton(syncSupported: true, inlineMeta) {
|
|
alert = .syncAllowedAlert { syncContactConnection(contact) }
|
|
}
|
|
} else if !contactStats.ratchetSyncSupported {
|
|
decryptionErrorItemFixButton(syncSupported: false, inlineMeta) {
|
|
alert = .syncNotSupportedContactAlert
|
|
}
|
|
} else {
|
|
basicDecryptionErrorItem(inlineMeta)
|
|
}
|
|
} else if case let .group(groupInfo, _) = chat.chatInfo,
|
|
case let .groupRcv(groupMember) = chatItem.chatDir,
|
|
let mem = m.getGroupMember(groupMember.groupMemberId),
|
|
let memberStats = mem.wrapped.activeConn?.connectionStats {
|
|
if memberStats.ratchetSyncAllowed {
|
|
decryptionErrorItemFixButton(syncSupported: true, inlineMeta) {
|
|
alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
|
|
}
|
|
} else if !memberStats.ratchetSyncSupported {
|
|
decryptionErrorItemFixButton(syncSupported: false, inlineMeta) {
|
|
alert = .syncNotSupportedMemberAlert
|
|
}
|
|
} else {
|
|
basicDecryptionErrorItem(inlineMeta)
|
|
}
|
|
} else {
|
|
basicDecryptionErrorItem(inlineMeta)
|
|
}
|
|
}
|
|
.background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
|
|
.if(inlineMeta == nil) { $0.modifier(ChatItemClipped(chatItem, tailVisible: false)) }
|
|
}
|
|
|
|
private func basicDecryptionErrorItem(_ inlineMeta: CIMetaView?) -> some View {
|
|
decryptionErrorItem(inlineMeta) { alert = .decryptionErrorAlert }
|
|
}
|
|
|
|
private func decryptionErrorItemFixButton(syncSupported: Bool, _ inlineMeta: CIMetaView?, _ onClick: @escaping (() -> Void)) -> some View {
|
|
ZStack(alignment: .bottomTrailing) {
|
|
VStack(alignment: .leading, spacing: 2) {
|
|
HStack {
|
|
Text(chatItem.content.text)
|
|
.foregroundColor(.red)
|
|
.italic()
|
|
}
|
|
(
|
|
Text(Image(systemName: "exclamationmark.arrow.triangle.2.circlepath"))
|
|
.foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
|
|
.font(.callout)
|
|
+ textSpace
|
|
+ Text("Fix connection")
|
|
.foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
|
|
.font(.callout)
|
|
+ metaReserve(inlineMeta)
|
|
)
|
|
}
|
|
.padding(.horizontal, 12)
|
|
if let inlineMeta {
|
|
inlineMeta
|
|
.padding(.horizontal, 12)
|
|
}
|
|
}
|
|
.simultaneousGesture(TapGesture().onEnded(onClick))
|
|
.padding(.vertical, 6)
|
|
.textSelection(.disabled)
|
|
}
|
|
|
|
private func decryptionErrorItem(_ inlineMeta: CIMetaView?, _ onClick: @escaping (() -> Void)) -> some View {
|
|
return ZStack(alignment: .bottomTrailing) {
|
|
HStack {
|
|
Text(chatItem.content.text)
|
|
.foregroundColor(.red)
|
|
.italic()
|
|
+ metaReserve(inlineMeta)
|
|
}
|
|
.padding(.horizontal, 12)
|
|
if let inlineMeta {
|
|
inlineMeta
|
|
.padding(.horizontal, 12)
|
|
}
|
|
}
|
|
.simultaneousGesture(TapGesture().onEnded(onClick))
|
|
.padding(.vertical, 6)
|
|
.textSelection(.disabled)
|
|
}
|
|
|
|
private func metaReserve(_ inlineMeta: CIMetaView?) -> Text {
|
|
inlineMeta == nil
|
|
? Text(verbatim: "")
|
|
: Text(verbatim: " ") + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
|
|
}
|
|
|
|
private func message() -> Text {
|
|
var message: Text
|
|
let why = Text(decryptErrorReason)
|
|
switch msgDecryptError {
|
|
case .ratchetHeader:
|
|
message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
|
|
case .tooManySkipped:
|
|
message = Text("\(msgCount) messages skipped.") + textNewLine + why
|
|
case .ratchetEarlier:
|
|
message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
|
|
case .other:
|
|
message = Text("\(msgCount) messages failed to decrypt.") + textNewLine + why
|
|
case .ratchetSync:
|
|
message = Text("Encryption re-negotiation failed.")
|
|
}
|
|
return message
|
|
}
|
|
|
|
private func syncMemberConnection(_ groupInfo: GroupInfo, _ member: GroupMember) {
|
|
Task {
|
|
do {
|
|
let (mem, stats) = try apiSyncGroupMemberRatchet(groupInfo.apiId, member.groupMemberId, false)
|
|
await MainActor.run {
|
|
m.updateGroupMemberConnectionStats(groupInfo, mem, stats)
|
|
}
|
|
} catch let error {
|
|
logger.error("syncMemberConnection apiSyncGroupMemberRatchet error: \(responseError(error))")
|
|
await MainActor.run {
|
|
showErrorAlert(error, NSLocalizedString("Error synchronizing connection", comment: ""))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func syncContactConnection(_ contact: Contact) {
|
|
Task {
|
|
do {
|
|
let stats = try apiSyncContactRatchet(contact.apiId, false)
|
|
await MainActor.run {
|
|
m.updateContactConnectionStats(contact, stats)
|
|
}
|
|
} catch let error {
|
|
logger.error("syncContactConnection apiSyncContactRatchet error: \(responseError(error))")
|
|
await MainActor.run {
|
|
showErrorAlert(error, NSLocalizedString("Error synchronizing connection", comment: ""))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
private func syncAllowedAlert(_ syncConnection: @escaping () -> Void) -> Alert {
|
|
Alert(
|
|
title: Text("Fix connection?"),
|
|
message: message(),
|
|
primaryButton: .default(Text("Fix"), action: syncConnection),
|
|
secondaryButton: .cancel()
|
|
)
|
|
}
|
|
}
|
|
|
|
//struct CIRcvDecryptionError_Previews: PreviewProvider {
|
|
// static var previews: some View {
|
|
// CIRcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 1, chatItem: ChatItem.getIntegrityErrorSample())
|
|
// }
|
|
//}
|