android, desktop: moved to Compose 1.6.0

android: refactor clipboard access to prevent Android error in logs (#3758 )
core: fix invitation as rejected when deleting group (#3759 )
2024-12-17 17:20:21 +01:00 · 2024-01-26 23:06:02 +07:00 · 2024-01-26 14:00:53 +00:00 · 2024-01-26 17:56:17 +04:00 · 2024-01-26 09:57:04 +00:00 · 2024-01-26 09:37:49 +00:00
40 changed files with 550 additions and 358 deletions
@@ -1172,7 +1172,7 @@ func filterMembersToAdd(_ ms: [GMember]) -> [Contact] {
    let memberContactIds = ms.compactMap{ m in m.wrapped.memberCurrent ? m.wrapped.memberContactId : nil }
    return ChatModel.shared.chats
        .compactMap{ $0.chatInfo.contact }
-        .filter{ !memberContactIds.contains($0.apiId) }
+        .filter{ c in c.ready && c.active && !memberContactIds.contains(c.apiId) }
        .sorted{ $0.displayName.lowercased() < $1.displayName.lowercased() }
 }

@@ -65,6 +65,8 @@ struct MarkedDeletedItemView: View {
        }
    }

+    // same texts are in markedDeletedText in ChatPreviewView, but it returns String;
+    // can be refactored into a single function if functions calling these are changed to return same type
    var markedDeletedText: LocalizedStringKey {
        switch chatItem.meta.itemDeleted {
        case let .moderated(_, byGroupMember): "moderated by \(byGroupMember.displayName)"
@@ -159,12 +159,13 @@ struct ChatView: View {
                switch cInfo {
                case let .direct(contact):
                    HStack {
-                        if contact.allowsFeature(.calls) {
+                        let callsPrefEnabled = contact.mergedPreferences.calls.enabled.forUser
+                        if callsPrefEnabled {
                            callButton(contact, .audio, imageName: "phone")
                                .disabled(!contact.ready || !contact.active)
                        }
                        Menu {
-                            if contact.allowsFeature(.calls) {
+                            if callsPrefEnabled {
                                Button {
                                    CallController.shared.startCall(contact, .video)
                                } label: {
@@ -748,7 +749,9 @@ struct ChatView: View {
                if ci.meta.editable && !mc.isVoice && !live {
                    menu.append(editAction(ci))
                }
-                menu.append(viewInfoUIAction(ci))
+                if !ci.isLiveDummy {
+                    menu.append(viewInfoUIAction(ci))
+                }
                if revealed {
                    menu.append(hideUIAction())
                }
@@ -978,6 +978,9 @@ struct ComposeView: View {
    }

    private func cancelLinkPreview() {
+        if let pendingLink = pendingLinkUrl?.absoluteString {
+            cancelledLinks.insert(pendingLink)
+        }
        if let uri = composeState.linkPreview?.uri.absoluteString {
            cancelledLinks.insert(uri)
        }
@@ -370,7 +370,11 @@ struct GroupChatInfoView: View {

    private func addOrEditWelcomeMessage() -> some View {
        NavigationLink {
-            GroupWelcomeView(groupId: groupInfo.groupId, groupInfo: $groupInfo)
+            GroupWelcomeView(
+                groupInfo: $groupInfo,
+                groupProfile: groupInfo.groupProfile,
+                welcomeText: groupInfo.groupProfile.description ?? ""
+            )
            .navigationTitle("Welcome message")
            .navigationBarTitleDisplayMode(.large)
        } label: {
@@ -11,29 +11,32 @@ import SimpleXChat

 struct GroupWelcomeView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
-    @EnvironmentObject private var m: ChatModel
-    var groupId: Int64
    @Binding var groupInfo: GroupInfo
-    @State private var welcomeText: String = ""
+    @State var groupProfile: GroupProfile
+    @State var welcomeText: String
    @State private var editMode = true
    @FocusState private var keyboardVisible: Bool
    @State private var showSaveDialog = false

+    let maxByteCount = 1200
+
    var body: some View {
        VStack {
            if groupInfo.canEdit {
                editorView()
                    .modifier(BackButton {
-                        if welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil) {
+                        if welcomeTextUnchanged() {
                            dismiss()
                        } else {
                            showSaveDialog = true
                        }
                    })
-                    .confirmationDialog("Save welcome message?", isPresented: $showSaveDialog) {
-                        Button("Save and update group profile") {
-                            save()
-                            dismiss()
+                    .confirmationDialog(
+                        welcomeTextFitsLimit() ? "Save welcome message?" : "Welcome message is too long",
+                        isPresented: $showSaveDialog
+                    ) {
+                        if welcomeTextFitsLimit() {
+                            Button("Save and update group profile") { save() }
                        }
                        Button("Exit without saving") { dismiss() }
                    }
@@ -47,14 +50,15 @@ struct GroupWelcomeView: View {
            }
        }
        .onAppear {
-            welcomeText = groupInfo.groupProfile.description ?? ""
-            keyboardVisible = true
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                keyboardVisible = true
+            }
        }
    }

    private func textPreview() -> some View {
        messageText(welcomeText, parseSimpleXMarkdown(welcomeText), nil, showSecrets: false)
-            .frame(minHeight: 140, alignment: .topLeading)
+            .frame(minHeight: 130, alignment: .topLeading)
            .frame(maxWidth: .infinity, alignment: .leading)
    }

@@ -74,7 +78,7 @@ struct GroupWelcomeView: View {
                        }
                        .padding(.horizontal, -5)
                        .padding(.top, -8)
-                        .frame(height: 140, alignment: .topLeading)
+                        .frame(height: 130, alignment: .topLeading)
                        .frame(maxWidth: .infinity, alignment: .leading)
                    }
                } else {
@@ -93,6 +97,9 @@ struct GroupWelcomeView: View {
                }
                .disabled(welcomeText.isEmpty)
                copyButton()
+            } footer: {
+                Text(!welcomeTextFitsLimit() ? "Message too large" : "")
+                    .foregroundColor(.red)
            }

            Section {
@@ -113,7 +120,15 @@ struct GroupWelcomeView: View {
        Button("Save and update group profile") {
            save()
        }
-        .disabled(welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil))
+        .disabled(welcomeTextUnchanged() || !welcomeTextFitsLimit())
+    }
+
+    private func welcomeTextUnchanged() -> Bool {
+        welcomeText == groupInfo.groupProfile.description || (welcomeText == "" && groupInfo.groupProfile.description == nil)
+    }
+
+    private func welcomeTextFitsLimit() -> Bool {
+        chatJsonLength(welcomeText) <= maxByteCount
    }

    private func save() {
@@ -123,11 +138,13 @@ struct GroupWelcomeView: View {
                if welcome?.count == 0 {
                    welcome = nil
                }
-                var groupProfileUpdated = groupInfo.groupProfile
-                groupProfileUpdated.description = welcome
-                groupInfo = try await apiUpdateGroup(groupId, groupProfileUpdated)
-                m.updateGroup(groupInfo)
-                welcomeText = welcome ?? ""
+                groupProfile.description = welcome
+                let gInfo = try await apiUpdateGroup(groupInfo.groupId, groupProfile)
+                await MainActor.run {
+                    groupInfo = gInfo
+                    ChatModel.shared.updateGroup(gInfo)
+                    dismiss()
+                }
            } catch let error {
                logger.error("apiUpdateGroup error: \(responseError(error))")
            }
@@ -137,6 +154,6 @@ struct GroupWelcomeView: View {

 struct GroupWelcomeView_Previews: PreviewProvider {
    static var previews: some View {
-        GroupWelcomeView(groupId: 1, groupInfo: Binding.constant(GroupInfo.sampleData))
+        GroupProfileView(groupInfo: Binding.constant(GroupInfo.sampleData), groupProfile: GroupProfile.sampleData)
    }
 }
@@ -34,7 +34,7 @@ struct ChatPreviewView: View {
                HStack(alignment: .top) {
                    chatPreviewTitle()
                    Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.updatedAt))
+                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
                        .font(.subheadline)
                        .frame(minWidth: 60, alignment: .trailing)
                        .foregroundColor(.secondary)
@@ -171,10 +171,21 @@ struct ChatPreviewView: View {
    }

    func chatItemPreview(_ cItem: ChatItem) -> Text {
-        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
+        let itemText = cItem.meta.itemDeleted == nil ? cItem.text : markedDeletedText()
        let itemFormattedText = cItem.meta.itemDeleted == nil ? cItem.formattedText : nil
        return messageText(itemText, itemFormattedText, cItem.memberDisplayName, icon: attachment(), preview: true, showSecrets: false)

+        // same texts are in markedDeletedText in MarkedDeletedItemView, but it returns LocalizedStringKey;
+        // can be refactored into a single function if functions calling these are changed to return same type
+        func markedDeletedText() -> String {
+            switch cItem.meta.itemDeleted {
+            case let .moderated(_, byGroupMember): String.localizedStringWithFormat(NSLocalizedString("moderated by %@", comment: "marked deleted chat item preview text"), byGroupMember.displayName)
+            case .blocked: NSLocalizedString("blocked", comment: "marked deleted chat item preview text")
+            case .blockedByAdmin: NSLocalizedString("blocked by admin", comment: "marked deleted chat item preview text")
+            case .deleted, nil: NSLocalizedString("marked deleted", comment: "marked deleted chat item preview text")
+            }
+        }
+
        func attachment() -> String? {
            switch cItem.content.msgContent {
            case .file: return "doc.fill"
@@ -105,6 +105,11 @@ public func parseSimpleXMarkdown(_ s: String) -> [FormattedText]? {
    return nil
 }

+public func chatJsonLength(_ s: String) -> Int {
+    var c = s.cString(using: .utf8)!
+    return Int(chat_json_length(&c))
+}
+
 struct ParsedMarkdown: Decodable {
    var formattedText: [FormattedText]?
 }
@@ -1367,6 +1367,17 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat {
        }
    }

+    public var chatTs: Date {
+        switch self {
+        case let .direct(contact): return contact.chatTs ?? contact.updatedAt
+        case let .group(groupInfo): return groupInfo.chatTs ?? groupInfo.updatedAt
+        case let .local(noteFolder): return noteFolder.chatTs
+        case let .contactRequest(contactRequest): return contactRequest.updatedAt
+        case let .contactConnection(contactConnection): return contactConnection.updatedAt
+        case .invalidJSON: return .now
+        }
+    }
+
    public struct SampleData {
        public var direct: ChatInfo
        public var group: ChatInfo
@@ -1425,6 +1436,7 @@ public struct Contact: Identifiable, Decodable, NamedChat {
    public var mergedPreferences: ContactUserPreferences
    var createdAt: Date
    var updatedAt: Date
+    var chatTs: Date?
    var contactGroupMemberId: Int64?
    var contactGrpInvSent: Bool

@@ -1744,6 +1756,7 @@ public struct GroupInfo: Identifiable, Decodable, NamedChat {
    public var chatSettings: ChatSettings
    var createdAt: Date
    var updatedAt: Date
+    var chatTs: Date?

    public var id: ChatId { get { "#\(groupId)" } }
    public var apiId: Int64 { get { groupId } }
@@ -2049,6 +2062,7 @@ public struct NoteFolder: Identifiable, Decodable, NamedChat {
    public var unread: Bool
    var createdAt: Date
    public var updatedAt: Date
+    var chatTs: Date

    public var id: ChatId { get { "*\(noteFolderId)" } }
    public var apiId: Int64 { get { noteFolderId } }
@@ -2070,7 +2084,8 @@ public struct NoteFolder: Identifiable, Decodable, NamedChat {
        favorite: false,
        unread: false,
        createdAt: .now,
-        updatedAt: .now
+        updatedAt: .now,
+        chatTs: .now
    )
 }

@@ -25,6 +25,7 @@ extern char *chat_parse_markdown(char *str);
 extern char *chat_parse_server(char *str);
 extern char *chat_password_hash(char *pwd, char *salt);
 extern char *chat_valid_name(char *name);
+extern int chat_json_length(char *str);
 extern char *chat_encrypt_media(chat_ctrl ctl, char *key, char *frame, int len);
 extern char *chat_decrypt_media(char *key, char *frame, int len);

@@ -1,11 +1,12 @@
 package chat.simplex.app

+import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.*
 import android.view.WindowManager
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.ui.platform.ClipboardManager
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.getUserIdFromIntent
@@ -58,6 +59,17 @@ class MainActivity: FragmentActivity() {
  override fun onResume() {
    super.onResume()
    AppLock.recheckAuthState()
+    withApi {
+      delay(1000)
+      if (!isAppOnForeground) return@withApi
+      /**
+       * When the app calls [ClipboardManager.shareText] and a user copies text in clipboard, Android denies
+       * access to clipboard because the app considered in background.
+       * This will ensure that the app will get the event on resume
+       * */
+      val service = getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+      chatModel.clipboardHasText.value = service.hasPrimaryClip()
+    }
  }

  override fun onPause() {
@@ -97,13 +97,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        }
        Lifecycle.Event.ON_RESUME -> {
          isAppOnForeground = true
-          /**
-           * When the app calls [ClipboardManager.shareText] and a user copies text in clipboard, Android denies
-           * access to clipboard because the app considered in background.
-           * This will ensure that the app will get the event on resume
-           * */
-          val service = androidAppContext.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
-          chatModel.clipboardHasText.value = service.hasPrimaryClip()
          if (chatModel.controller.appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete && chatModel.currentUser.value != null) {
            SimplexService.showBackgroundServiceNoticeIfNeeded()
          }
@@ -197,10 +190,18 @@ class SimplexApp: Application(), LifecycleEventObserver {
        }
        SimplexService.StartReceiver.toggleReceiver(mode == NotificationsMode.SERVICE)
        CoroutineScope(Dispatchers.Default).launch {
-          if (mode == NotificationsMode.SERVICE)
+          if (mode == NotificationsMode.SERVICE) {
            SimplexService.start()
-          else
+            // Sometimes, when we change modes fast from one to another, system destroys the service after start.
+            // We can wait a little and restart the service, and it will work in 100% of cases
+            delay(2000)
+            if (!SimplexService.isServiceStarted && appPrefs.notificationsMode.get() == NotificationsMode.SERVICE) {
+              Log.i(TAG, "Service tried to start but destroyed by system, repeating once more")
+              SimplexService.start()
+            }
+          } else {
            SimplexService.safeStopService()
+          }
        }

        if (mode != NotificationsMode.PERIODIC) {
@@ -262,7 +262,7 @@ class SimplexService: Service() {
    private const val SHARED_PREFS_SERVICE_STATE = "SIMPLEX_SERVICE_STATE"
    private const val WORK_NAME_ONCE = "ServiceStartWorkerOnce"

-    private var isServiceStarted = false
+    var isServiceStarted = false
    private var stopAfterStart = false

    fun scheduleStart(context: Context) {
@@ -4,6 +4,7 @@ import android.app.*
 import android.app.TaskStackBuilder
 import android.content.*
 import android.content.pm.PackageManager
+import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.hardware.display.DisplayManager
 import android.media.AudioAttributes
@@ -217,7 +218,7 @@ object NtfManager {
      .setGroup(MessageGroup)
      .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
      .setSmallIcon(R.drawable.ntf_icon)
-      .setLargeIcon(null)
+      .setLargeIcon(null as Bitmap?)
      .setColor(0x88FFFF)
      .setAutoCancel(true)
      .setVibrate(null)
@@ -0,0 +1,106 @@
+package chat.simplex.common.views.helpers
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.common.model.CustomTimeUnit
+import chat.simplex.common.ui.theme.DEFAULT_PADDING
+import com.sd.lib.compose.wheel_picker.*
+
+@Composable
+actual fun CustomTimePicker(
+  selection: MutableState<Int>,
+  timeUnitsLimits: List<TimeUnitLimits>
+) {
+  fun getUnitValues(unit: CustomTimeUnit, selectedValue: Int): List<Int> {
+    val unitLimits = timeUnitsLimits.firstOrNull { it.timeUnit == unit } ?: TimeUnitLimits.defaultUnitLimits(unit)
+    val regularUnitValues = (unitLimits.minValue..unitLimits.maxValue).toList()
+    return regularUnitValues + if (regularUnitValues.contains(selectedValue)) emptyList() else listOf(selectedValue)
+  }
+
+  val (unit, duration) = CustomTimeUnit.toTimeUnit(selection.value)
+  val selectedUnit: MutableState<CustomTimeUnit> = remember { mutableStateOf(unit) }
+  val selectedDuration = remember { mutableStateOf(duration) }
+  val selectedUnitValues = remember { mutableStateOf(getUnitValues(selectedUnit.value, selectedDuration.value)) }
+  val isTriggered = remember { mutableStateOf(false) }
+
+  LaunchedEffect(selectedUnit.value) {
+    // on initial composition, if passed selection doesn't fit into picker bounds, so that selectedDuration is bigger than selectedUnit maxValue
+    // (e.g., for selection = 121 seconds: selectedUnit would be Second, selectedDuration would be 121 > selectedUnit maxValue of 120),
+    // selectedDuration would've been replaced by maxValue - isTriggered check prevents this by skipping LaunchedEffect on initial composition
+    if (isTriggered.value) {
+      val maxValue = timeUnitsLimits.firstOrNull { it.timeUnit == selectedUnit.value }?.maxValue
+      if (maxValue != null && selectedDuration.value > maxValue) {
+        selectedDuration.value = maxValue
+        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
+      } else {
+        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
+        selection.value = selectedUnit.value.toSeconds * selectedDuration.value
+      }
+    } else {
+      isTriggered.value = true
+    }
+  }
+
+  LaunchedEffect(selectedDuration.value) {
+    selection.value = selectedUnit.value.toSeconds * selectedDuration.value
+  }
+
+  Row(
+    Modifier
+      .fillMaxWidth()
+      .padding(horizontal = DEFAULT_PADDING),
+    horizontalArrangement = Arrangement.spacedBy(0.dp)
+  ) {
+    Column(Modifier.weight(1f)) {
+      val durationPickerState = rememberFWheelPickerState(selectedUnitValues.value.indexOf(selectedDuration.value))
+      FVerticalWheelPicker(
+        count = selectedUnitValues.value.count(),
+        state = durationPickerState,
+        unfocusedCount = 2,
+        focus = {
+          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
+        }
+      ) { index ->
+        Text(
+          selectedUnitValues.value[index].toString(),
+          fontSize = 18.sp,
+          color = MaterialTheme.colors.primary
+        )
+      }
+      LaunchedEffect(durationPickerState) {
+        snapshotFlow { durationPickerState.currentIndex }
+          .collect {
+            selectedDuration.value = selectedUnitValues.value[it]
+          }
+      }
+    }
+    Column(Modifier.weight(1f)) {
+      val unitPickerState = rememberFWheelPickerState(timeUnitsLimits.indexOfFirst { it.timeUnit == selectedUnit.value })
+      FVerticalWheelPicker(
+        count = timeUnitsLimits.count(),
+        state = unitPickerState,
+        unfocusedCount = 2,
+        focus = {
+          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
+        }
+      ) { index ->
+        Text(
+          timeUnitsLimits[index].timeUnit.text,
+          fontSize = 18.sp,
+          color = MaterialTheme.colors.primary
+        )
+      }
+      LaunchedEffect(unitPickerState) {
+        snapshotFlow { unitPickerState.currentIndex }
+          .collect {
+            selectedUnit.value = timeUnitsLimits[it].timeUnit
+          }
+      }
+    }
+  }
+}
@@ -66,6 +66,7 @@ extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
+extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
@@ -163,6 +164,14 @@ Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz
    return res;
 }

+JNIEXPORT int JNICALL
+Java_chat_simplex_common_platform_CoreKt_chatJsonLength(JNIEnv *env, jclass clazz, jstring str) {
+    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
+    int res = chat_json_length(_str);
+    (*env)->ReleaseStringUTFChars(env, str, _str);
+    return res;
+}
+
 JNIEXPORT jstring JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jlong controller, jstring path, jobject buffer) {
    const char *_path = (*env)->GetStringUTFChars(env, path, JNI_FALSE);
@@ -39,6 +39,7 @@ extern char *chat_parse_markdown(const char *str);
 extern char *chat_parse_server(const char *str);
 extern char *chat_password_hash(const char *pwd, const char *salt);
 extern char *chat_valid_name(const char *name);
+extern int chat_json_length(const char *str);
 extern char *chat_write_file(chat_ctrl ctrl, const char *path, char *ptr, int length);
 extern char *chat_read_file(const char *path, const char *key, const char *nonce);
 extern char *chat_encrypt_file(chat_ctrl ctrl, const char *from_path, const char *to_path);
@@ -173,6 +174,14 @@ Java_chat_simplex_common_platform_CoreKt_chatValidName(JNIEnv *env, jclass clazz
    return res;
 }

+JNIEXPORT int JNICALL
+Java_chat_simplex_common_platform_CoreKt_chatJsonLength(JNIEnv *env, jclass clazz, jstring str) {
+    const char *_str = encode_to_utf8_chars(env, str);
+    int res = chat_json_length(_str);
+    (*env)->ReleaseStringUTFChars(env, str, _str);
+    return res;
+}
+
 JNIEXPORT jstring JNICALL
 Java_chat_simplex_common_platform_CoreKt_chatWriteFile(JNIEnv *env, jclass clazz, jlong controller, jstring path, jobject buffer) {
    const char *_path = encode_to_utf8_chars(env, path);
@@ -63,8 +63,6 @@ object ChatModel {

  val terminalItems = mutableStateOf<List<TerminalItem>>(listOf())
  val userAddress = mutableStateOf<UserContactLinkRec?>(null)
-  // Allows to temporary save servers that are being edited on multiple screens
-  val userSMPServersUnsaved = mutableStateOf<(List<ServerCfg>)?>(null)
  val chatItemTTL = mutableStateOf<ChatItemTTL>(ChatItemTTL.None)

  // set when app opened from external intent
@@ -969,6 +967,16 @@ sealed class ChatInfo: SomeChat, NamedChat {
      is Group -> groupInfo.chatSettings
      else -> null
    }
+
+  val chatTs: Instant
+    get() = when(this) {
+      is Direct -> contact.chatTs ?: contact.updatedAt
+      is Group -> groupInfo.chatTs ?: groupInfo.updatedAt
+      is Local -> noteFolder.chatTs
+      is ContactRequest -> contactRequest.updatedAt
+      is ContactConnection -> contactConnection.updatedAt
+      is InvalidJSON -> updatedAt
+    }
 }

@Serializable
@@ -1009,6 +1017,7 @@ data class Contact(
  val mergedPreferences: ContactUserPreferences,
  override val createdAt: Instant,
  override val updatedAt: Instant,
+  val chatTs: Instant?,
  val contactGroupMemberId: Long? = null,
  val contactGrpInvSent: Boolean
 ): SomeChat, NamedChat {
@@ -1077,6 +1086,7 @@ data class Contact(
      mergedPreferences = ContactUserPreferences.sampleData,
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now(),
+      chatTs = Clock.System.now(),
      contactGrpInvSent = false
    )
  }
@@ -1204,7 +1214,8 @@ data class GroupInfo (
  val hostConnCustomUserProfileId: Long? = null,
  val chatSettings: ChatSettings,
  override val createdAt: Instant,
-  override val updatedAt: Instant
+  override val updatedAt: Instant,
+  val chatTs: Instant?
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Group
  override val id get() = "#$groupId"
@@ -1245,7 +1256,8 @@ data class GroupInfo (
      hostConnCustomUserProfileId = null,
      chatSettings = ChatSettings(enableNtfs = MsgFilter.All, sendRcpts = null, favorite = false),
      createdAt = Clock.System.now(),
-      updatedAt = Clock.System.now()
+      updatedAt = Clock.System.now(),
+      chatTs = Clock.System.now()
    )
  }
 }
@@ -1507,7 +1519,8 @@ class NoteFolder(
  val favorite: Boolean,
  val unread: Boolean,
  override val createdAt: Instant,
-  override val updatedAt: Instant
+  override val updatedAt: Instant,
+  val chatTs: Instant
 ): SomeChat, NamedChat {
  override val chatType get() = ChatType.Local
  override val id get() = "*$noteFolderId"
@@ -1530,7 +1543,8 @@ class NoteFolder(
      favorite = false,
      unread = false,
      createdAt = Clock.System.now(),
-      updatedAt = Clock.System.now()
+      updatedAt = Clock.System.now(),
+      chatTs = Clock.System.now()
    )
  }
 }
@@ -28,6 +28,7 @@ external fun chatParseMarkdown(str: String): String
 external fun chatParseServer(str: String): String
 external fun chatPasswordHash(pwd: String, salt: String): String
 external fun chatValidName(name: String): String
+external fun chatJsonLength(str: String): Int
 external fun chatWriteFile(ctrl: ChatCtrl, path: String, buffer: ByteBuffer): String
 external fun chatReadFile(path: String, key: String, nonce: String): Array<Any>
 external fun chatEncryptFile(ctrl: ChatCtrl, fromPath: String, toPath: String): String
@@ -324,7 +324,7 @@ fun ChatItemInfoView(chatModel: ChatModel, ci: ChatItem, ciInfo: ChatItemInfo, d
          .fillMaxHeight(),
        verticalArrangement = Arrangement.SpaceBetween
      ) {
-        LaunchedEffect(Unit) {
+        LaunchedEffect(ciInfo) {
          if (ciInfo.memberDeliveryStatuses != null) {
            selection.value = CIInfoTab.Delivery(ciInfo.memberDeliveryStatuses)
          }
@@ -68,12 +68,14 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
      snapshotFlow { chatModel.chatId.value }
        .distinctUntilChanged()
        .onEach { Log.d(TAG, "TODOCHAT: chatId: activeChatId ${activeChat.value?.id} == new chatId $it ${activeChat.value?.id == it} ") }
-        .filter { it != null && activeChat.value?.id != it }
+        .filterNotNull()
        .collect { chatId ->
-          // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
-          // Also for situation when chatId changes after clicking in notification, etc
-          activeChat.value = chatModel.getChat(chatId!!)
-          Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
+          if (activeChat.value?.id != chatId) {
+            // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
+            // Also for situation when chatId changes after clicking in notification, etc
+            activeChat.value = chatModel.getChat(chatId)
+            Log.d(TAG, "TODOCHAT: chatId: activeChatId became ${activeChat.value?.id}")
+          }
          markUnreadChatAsRead(activeChat, chatModel)
        }
    }
@@ -404,12 +406,15 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
                  setGroupMembers(chatRh, chat.chatInfo.groupInfo, chatModel)
                }
                ModalManager.end.closeModals()
-                ModalManager.end.showModal(endButtons = {
+                ModalManager.end.showModalCloseable(endButtons = {
                  ShareButton {
                    clipboard.shareText(itemInfoShareText(chatModel, cItem, ciInfo, chatModel.controller.appPrefs.developerTools.get()))
                  }
-                }) {
+                }) { close ->
                  ChatItemInfoView(chatModel, cItem, ciInfo, devTools = chatModel.controller.appPrefs.developerTools.get())
+                  KeyChangeEffect(chatModel.chatId.value) {
+                    close()
+                  }
                }
              }
            }
@@ -647,7 +652,7 @@ fun ChatInfoToolbar(
    }
  }

-  if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.allowsFeature(ChatFeature.Calls)) {
+  if (chat.chatInfo is ChatInfo.Direct && chat.chatInfo.contact.mergedPreferences.calls.enabled.forUser) {
    if (activeCall == null) {
      barButtons.add {
        if (appPlatform.isAndroid) {
@@ -583,6 +583,10 @@ fun ComposeView(
  }

  fun cancelLinkPreview() {
+    val pendingLink = pendingLinkUrl.value
+    if (pendingLink != null) {
+      cancelledLinks.add(pendingLink)
+    }
    val uri = composeState.value.linkPreview?.uri
    if (uri != null) {
      cancelledLinks.add(uri)
@@ -59,14 +59,6 @@ fun SendMsgView(
 ) {
  val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }

-  if (showCustomDisappearingMessageDialog.value) {
-    CustomDisappearingMessageDialog(
-      sendMessage = sendMessage,
-      setShowDialog = { showCustomDisappearingMessageDialog.value = it },
-      customDisappearingMessageTimePref = customDisappearingMessageTimePref
-    )
-  }
-
  Box(Modifier.padding(vertical = 8.dp)) {
    val cs = composeState.value
    var progressByTimeout by rememberSaveable { mutableStateOf(false) }
@@ -203,6 +195,11 @@ fun SendMsgView(
            DefaultDropdownMenu(showDropdown) {
              menuItems.forEach { composable -> composable() }
            }
+            CustomDisappearingMessageDialog(
+              showCustomDisappearingMessageDialog,
+              sendMessage = sendMessage,
+              customDisappearingMessageTimePref = customDisappearingMessageTimePref
+            )
          } else {
            SendMsgButton(icon, sendButtonSize, sendButtonAlpha, sendButtonColor, !sendMsgButtonDisabled, sendMessage)
          }
@@ -220,93 +217,43 @@ expect fun VoiceButtonWithoutPermissionByPlatform()

@Composable
 private fun CustomDisappearingMessageDialog(
+  showMenu: MutableState<Boolean>,
  sendMessage: (Int?) -> Unit,
-  setShowDialog: (Boolean) -> Unit,
  customDisappearingMessageTimePref: SharedPreference<Int>?
 ) {
-  val showCustomTimePicker = remember { mutableStateOf(false) }
-
-  if (showCustomTimePicker.value) {
-    val selectedDisappearingMessageTime = remember {
-      mutableStateOf(customDisappearingMessageTimePref?.get?.invoke() ?: 300)
-    }
-    CustomTimePickerDialog(
-      selectedDisappearingMessageTime,
-      title = generalGetString(MR.strings.delete_after),
-      confirmButtonText = generalGetString(MR.strings.send_disappearing_message_send),
-      confirmButtonAction = { ttl ->
-        sendMessage(ttl)
-        customDisappearingMessageTimePref?.set?.invoke(ttl)
-        setShowDialog(false)
-      },
-      cancel = { setShowDialog(false) }
+  DefaultDropdownMenu(showMenu) {
+    Text(
+      generalGetString(MR.strings.send_disappearing_message),
+      Modifier.padding(vertical = DEFAULT_PADDING_HALF, horizontal = DEFAULT_PADDING * 1.5f),
+      fontSize = 16.sp,
+      color = MaterialTheme.colors.secondary
    )
-  } else {
-    @Composable
-    fun ChoiceButton(
-      text: String,
-      onClick: () -> Unit
-    ) {
-      TextButton(onClick) {
-        Text(
-          text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-    }

-    DefaultDialog(onDismissRequest = { setShowDialog(false) }) {
-      Surface(
-        shape = RoundedCornerShape(corner = CornerSize(25.dp)),
-        contentColor = LocalContentColor.current
-      ) {
-        Box(
-          contentAlignment = Alignment.Center
-        ) {
-          Column(
-            modifier = Modifier.padding(DEFAULT_PADDING),
-            verticalArrangement = Arrangement.spacedBy(6.dp),
-            horizontalAlignment = Alignment.CenterHorizontally
-          ) {
-            Row(
-              modifier = Modifier.fillMaxWidth(),
-              horizontalArrangement = Arrangement.SpaceBetween,
-              verticalAlignment = Alignment.CenterVertically
-            ) {
-              Text(" ") // centers title
-              Text(
-                generalGetString(MR.strings.send_disappearing_message),
-                fontSize = 16.sp,
-                color = MaterialTheme.colors.secondary
-              )
-              Icon(
-                painterResource(MR.images.ic_close),
-                generalGetString(MR.strings.icon_descr_close_button),
-                tint = MaterialTheme.colors.secondary,
-                modifier = Modifier
-                  .size(25.dp)
-                  .clickable { setShowDialog(false) }
-              )
-            }
-            ChoiceButton(generalGetString(MR.strings.send_disappearing_message_30_seconds)) {
-              sendMessage(30)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(MR.strings.send_disappearing_message_1_minute)) {
-              sendMessage(60)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(MR.strings.send_disappearing_message_5_minutes)) {
-              sendMessage(300)
-              setShowDialog(false)
-            }
-            ChoiceButton(generalGetString(MR.strings.send_disappearing_message_custom_time)) {
-              showCustomTimePicker.value = true
-            }
-          }
-        }
-      }
+    ItemAction(generalGetString(MR.strings.send_disappearing_message_30_seconds)) {
+      sendMessage(30)
+      showMenu.value = false
+    }
+    ItemAction(generalGetString(MR.strings.send_disappearing_message_1_minute)) {
+      sendMessage(60)
+      showMenu.value = false
+    }
+    ItemAction(generalGetString(MR.strings.send_disappearing_message_5_minutes)) {
+      sendMessage(300)
+      showMenu.value = false
+    }
+    ItemAction(generalGetString(MR.strings.send_disappearing_message_custom_time)) {
+      showMenu.value = false
+      val selectedDisappearingMessageTime = mutableStateOf(customDisappearingMessageTimePref?.get?.invoke() ?: 300)
+      showCustomTimePickerDialog(
+        selectedDisappearingMessageTime,
+        title = generalGetString(MR.strings.delete_after),
+        confirmButtonText = generalGetString(MR.strings.send_disappearing_message_send),
+        confirmButtonAction = { ttl ->
+          sendMessage(ttl)
+          customDisappearingMessageTimePref?.set?.invoke(ttl)
+        },
+        cancel = { showMenu.value = false }
+      )
    }
  }
 }
@@ -86,7 +86,7 @@ fun getContactsToAdd(chatModel: ChatModel, search: String): List<Contact> {
    .map { it.chatInfo }
    .filterIsInstance<ChatInfo.Direct>()
    .map { it.contact }
-    .filter { it.contactId !in memberContactIds && it.chatViewName.lowercase().contains(s) }
+    .filter { c -> c.ready && c.active && c.contactId !in memberContactIds && c.chatViewName.lowercase().contains(s) }
    .sortedBy { it.displayName.lowercase() }
    .toList()
 }
@@ -3,6 +3,7 @@ package chat.simplex.common.views.chat.group
 import SectionBottomSpacer
 import SectionDividerSpaced
 import SectionItemView
+import SectionTextFooter
 import SectionView
 import TextIconSpaced
 import androidx.compose.foundation.layout.*
@@ -14,6 +15,7 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
@@ -27,9 +29,13 @@ import chat.simplex.common.views.chat.item.MarkdownText
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.GroupInfo
+import chat.simplex.common.platform.chatJsonLength
+import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay

+private const val maxByteCount = 1200
+
@Composable
 fun GroupWelcomeView(m: ChatModel, rhId: Long?, groupInfo: GroupInfo, close: () -> Unit) {
  var gInfo by remember { mutableStateOf(groupInfo) }
@@ -54,8 +60,11 @@ fun GroupWelcomeView(m: ChatModel, rhId: Long?, groupInfo: GroupInfo, close: ()

  ModalView(
    close = {
-      if (welcomeText.value == gInfo.groupProfile.description || (welcomeText.value == "" && gInfo.groupProfile.description == null)) close()
-      else showUnsavedChangesAlert({ save(close) }, close)
+      when {
+        welcomeTextUnchanged(welcomeText, gInfo) -> close()
+        !welcomeTextFitsLimit(welcomeText) -> showUnsavedChangesTooLongAlert(close)
+        else -> showUnsavedChangesAlert({ save(close) }, close)
+      }
    },
  ) {
    GroupWelcomeLayout(
@@ -67,6 +76,14 @@ fun GroupWelcomeView(m: ChatModel, rhId: Long?, groupInfo: GroupInfo, close: ()
  }
 }

+private fun welcomeTextUnchanged(welcomeText: MutableState<String>, groupInfo: GroupInfo): Boolean {
+  return welcomeText.value == groupInfo.groupProfile.description || (welcomeText.value == "" && groupInfo.groupProfile.description == null)
+}
+
+private fun welcomeTextFitsLimit(welcomeText: MutableState<String>): Boolean {
+  return chatJsonLength(welcomeText.value) <= maxByteCount
+}
+
@Composable
 private fun GroupWelcomeLayout(
  welcomeText: MutableState<String>,
@@ -95,6 +112,13 @@ private fun GroupWelcomeLayout(
      } else {
        TextPreview(wt.value, linkMode)
      }
+      SectionTextFooter(
+        if (!welcomeTextFitsLimit(wt)) { generalGetString(MR.strings.message_too_large) } else "",
+        color = if (welcomeTextFitsLimit(wt)) MaterialTheme.colors.secondary else Color.Red
+      )
+
+      Spacer(Modifier.size(8.dp))
+
      ChangeModeButton(
        editMode.value,
        click = {
@@ -104,10 +128,18 @@ private fun GroupWelcomeLayout(
      )
      val clipboard = LocalClipboardManager.current
      CopyTextButton { clipboard.setText(AnnotatedString(wt.value)) }
-      SectionDividerSpaced(maxBottomPadding = false)
+
+      Divider(
+        Modifier.padding(
+          start = DEFAULT_PADDING_HALF,
+          top = 8.dp,
+          end = DEFAULT_PADDING_HALF,
+          bottom = 8.dp)
+      )
+
      SaveButton(
        save = save,
-        disabled = wt.value == groupInfo.groupProfile.description || (wt.value == "" && groupInfo.groupProfile.description == null)
+        disabled = welcomeTextUnchanged(wt, groupInfo) || !welcomeTextFitsLimit(wt)
      )
    } else {
      val clipboard = LocalClipboardManager.current
@@ -182,3 +214,11 @@ private fun showUnsavedChangesAlert(save: () -> Unit, revert: () -> Unit) {
    onDismiss = revert,
  )
 }
+
+private fun showUnsavedChangesTooLongAlert(revert: () -> Unit) {
+  AlertManager.shared.showAlertDialogStacked(
+    title = generalGetString(MR.strings.welcome_message_is_too_long),
+    confirmText = generalGetString(MR.strings.exit_without_saving),
+    onConfirm = revert,
+  )
+}
@@ -103,7 +103,7 @@ fun ChatItemView(
              setReaction(cInfo, cItem, !r.userReacted, r.reaction)
            }
          }
-          Row(modifier.padding(2.dp)) {
+          Row(modifier.padding(2.dp), verticalAlignment = Alignment.CenterVertically) {
            ReactionIcon(r.reaction.text, fontSize = 12.sp)
            if (r.totalReacted > 1) {
              Spacer(Modifier.width(4.dp))
@@ -112,7 +112,6 @@ fun ChatItemView(
                fontSize = 11.5.sp,
                fontWeight = if (r.userReacted) FontWeight.Bold else FontWeight.Normal,
                color = if (r.userReacted) MaterialTheme.colors.primary else MaterialTheme.colors.secondary,
-                modifier = if (appPlatform.isAndroid) Modifier else Modifier.padding(top = 4.dp)
              )
            }
          }
@@ -178,7 +177,8 @@ fun ChatItemView(
        fun MsgContentItemDropdownMenu() {
          val saveFileLauncher = rememberSaveFileLauncher(ciFile = cItem.file)
          when {
-            cItem.content.msgContent != null -> {
+            // cItem.id check is a special case for live message chat item which has negative ID while not sent yet
+            cItem.content.msgContent != null && cItem.id >= 0 -> {
              DefaultDropdownMenu(showMenu) {
                if (cInfo.featureEnabled(ChatFeature.Reactions) && cItem.allowAddReaction) {
                  MsgReactionsMenu()
@@ -651,6 +651,23 @@ fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Colo
  }
 }

+@Composable
+fun ItemAction(text: String, color: Color = Color.Unspecified, onClick: () -> Unit) {
+  val finalColor = if (color == Color.Unspecified) {
+    MenuTextColor
+  } else color
+  DropdownMenuItem(onClick, contentPadding = PaddingValues(horizontal = DEFAULT_PADDING * 1.5f)) {
+    Text(
+      text,
+      modifier = Modifier
+        .fillMaxWidth()
+        .weight(1F)
+        .padding(end = 15.dp),
+      color = finalColor
+    )
+  }
+}
+
 fun cancelFileAlertDialog(fileId: Long, cancelFile: (Long) -> Unit, cancelAction: CancelAction) {
  AlertManager.shared.showAlertDialog(
    title = generalGetString(cancelAction.alert.titleId),
@@ -91,7 +91,7 @@ private fun MergedMarkedDeletedText(chatItem: ChatItem, revealed: MutableState<B
  )
 }

-private fun markedDeletedText(meta: CIMeta): String =
+fun markedDeletedText(meta: CIMeta): String =
  when (meta.itemDeleted) {
    is CIDeleted.Moderated ->
      String.format(generalGetString(MR.strings.moderated_item_description), meta.itemDeleted.byGroupMember.displayName)
@@ -26,6 +26,7 @@ import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.*
 import chat.simplex.common.model.GroupInfo
 import chat.simplex.common.platform.chatModel
+import chat.simplex.common.views.chat.item.markedDeletedText
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource

@@ -170,7 +171,7 @@ fun ChatPreviewView(
        val (text: CharSequence, inlineTextContent) = when {
          chatModelDraftChatId == chat.id && chatModelDraft != null -> remember(chatModelDraft) { messageDraft(chatModelDraft) }
          ci.meta.itemDeleted == null -> ci.text to null
-          else -> generalGetString(MR.strings.marked_deleted_description) to null
+          else -> markedDeletedText(ci.meta) to null
        }
        val formattedText = when {
          chatModelDraftChatId == chat.id && chatModelDraft != null -> null
@@ -286,7 +287,7 @@ fun ChatPreviewView(
    Box(
      contentAlignment = Alignment.TopEnd
    ) {
-      val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.updatedAt)
+      val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.chatTs)
      Text(
        ts,
        color = MaterialTheme.colors.secondary,
@@ -22,6 +22,7 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
 import dev.icerock.moko.resources.compose.painterResource
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow

 class AlertManager {
@@ -128,6 +129,8 @@ class AlertManager {
            ) {
              val focusRequester = remember { FocusRequester() }
              LaunchedEffect(Unit) {
+                // Wait before focusing to prevent auto-confirming if a user used Enter key on hardware keyboard
+                delay(200)
                focusRequester.requestFocus()
              }
              TextButton(onClick = {
@@ -195,6 +198,8 @@ class AlertManager {
          AlertContent(text, hostDevice, extraPadding = true) {
            val focusRequester = remember { FocusRequester() }
            LaunchedEffect(Unit) {
+              // Wait before focusing to prevent auto-confirming if a user used Enter key on hardware keyboard
+              delay(200)
              focusRequester.requestFocus()
            }
            Row(
@@ -1,116 +1,21 @@
 package chat.simplex.common.views.helpers

-import androidx.compose.foundation.clickable
+import SectionItemView
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import dev.icerock.moko.resources.compose.painterResource
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.compose.ui.window.Dialog
-import chat.simplex.common.ui.theme.DEFAULT_PADDING
+import androidx.compose.ui.text.style.TextAlign
 import chat.simplex.common.model.CustomTimeUnit
 import chat.simplex.common.model.timeText
 import chat.simplex.res.MR
-import com.sd.lib.compose.wheel_picker.*

@Composable
-fun CustomTimePicker(
+expect fun CustomTimePicker(
  selection: MutableState<Int>,
  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits
-) {
-  fun getUnitValues(unit: CustomTimeUnit, selectedValue: Int): List<Int> {
-    val unitLimits = timeUnitsLimits.firstOrNull { it.timeUnit == unit } ?: TimeUnitLimits.defaultUnitLimits(unit)
-    val regularUnitValues = (unitLimits.minValue..unitLimits.maxValue).toList()
-    return regularUnitValues + if (regularUnitValues.contains(selectedValue)) emptyList() else listOf(selectedValue)
-  }
-
-  val (unit, duration) = CustomTimeUnit.toTimeUnit(selection.value)
-  val selectedUnit: MutableState<CustomTimeUnit> = remember { mutableStateOf(unit) }
-  val selectedDuration = remember { mutableStateOf(duration) }
-  val selectedUnitValues = remember { mutableStateOf(getUnitValues(selectedUnit.value, selectedDuration.value)) }
-  val isTriggered = remember { mutableStateOf(false) }
-
-  LaunchedEffect(selectedUnit.value) {
-    // on initial composition, if passed selection doesn't fit into picker bounds, so that selectedDuration is bigger than selectedUnit maxValue
-    // (e.g., for selection = 121 seconds: selectedUnit would be Second, selectedDuration would be 121 > selectedUnit maxValue of 120),
-    // selectedDuration would've been replaced by maxValue - isTriggered check prevents this by skipping LaunchedEffect on initial composition
-    if (isTriggered.value) {
-      val maxValue = timeUnitsLimits.firstOrNull { it.timeUnit == selectedUnit.value }?.maxValue
-      if (maxValue != null && selectedDuration.value > maxValue) {
-        selectedDuration.value = maxValue
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-      } else {
-        selectedUnitValues.value = getUnitValues(selectedUnit.value, selectedDuration.value)
-        selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-      }
-    } else {
-      isTriggered.value = true
-    }
-  }
-
-  LaunchedEffect(selectedDuration.value) {
-    selection.value = selectedUnit.value.toSeconds * selectedDuration.value
-  }
-
-  Row(
-    Modifier
-      .fillMaxWidth()
-      .padding(horizontal = DEFAULT_PADDING),
-    horizontalArrangement = Arrangement.spacedBy(0.dp)
-  ) {
-    Column(Modifier.weight(1f)) {
-      val durationPickerState = rememberFWheelPickerState(selectedUnitValues.value.indexOf(selectedDuration.value))
-      FVerticalWheelPicker(
-        count = selectedUnitValues.value.count(),
-        state = durationPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          selectedUnitValues.value[index].toString(),
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(durationPickerState) {
-        snapshotFlow { durationPickerState.currentIndex }
-          .collect {
-            selectedDuration.value = selectedUnitValues.value[it]
-          }
-      }
-    }
-    Column(Modifier.weight(1f)) {
-      val unitPickerState = rememberFWheelPickerState(timeUnitsLimits.indexOfFirst { it.timeUnit == selectedUnit.value })
-      FVerticalWheelPicker(
-        count = timeUnitsLimits.count(),
-        state = unitPickerState,
-        unfocusedCount = 2,
-        focus = {
-          FWheelPickerFocusVertical(dividerColor = MaterialTheme.colors.primary)
-        }
-      ) { index ->
-        Text(
-          timeUnitsLimits[index].timeUnit.text,
-          fontSize = 18.sp,
-          color = MaterialTheme.colors.primary
-        )
-      }
-      LaunchedEffect(unitPickerState) {
-        snapshotFlow { unitPickerState.currentIndex }
-          .collect {
-            selectedUnit.value = timeUnitsLimits[it].timeUnit
-          }
-      }
-    }
-  }
-}
+)

 data class TimeUnitLimits(
  val timeUnit: CustomTimeUnit,
@@ -141,8 +46,7 @@ data class TimeUnitLimits(
  }
 }

-@Composable
-fun CustomTimePickerDialog(
+fun showCustomTimePickerDialog(
  selection: MutableState<Int>,
  timeUnitsLimits: List<TimeUnitLimits> = TimeUnitLimits.defaultUnitsLimits,
  title: String,
@@ -150,53 +54,26 @@ fun CustomTimePickerDialog(
  confirmButtonAction: (Int) -> Unit,
  cancel: () -> Unit
 ) {
-  DefaultDialog(onDismissRequest = cancel) {
-    Surface(
-      shape = RoundedCornerShape(corner = CornerSize(25.dp)),
-      contentColor = LocalContentColor.current
-    ) {
-      Box(
-        contentAlignment = Alignment.Center
+  AlertManager.shared.showAlertDialogButtonsColumn(
+    title = title,
+    onDismissRequest = cancel
+  ) {
+    Column(horizontalAlignment = Alignment.CenterHorizontally) {
+      CustomTimePicker(
+        selection,
+        timeUnitsLimits
+      )
+      SectionItemView({
+        AlertManager.shared.hideAlert()
+        confirmButtonAction(selection.value)
+      }
      ) {
-        Column(
-          modifier = Modifier.padding(DEFAULT_PADDING),
-          verticalArrangement = Arrangement.spacedBy(6.dp),
-          horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-          Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.SpaceBetween,
-            verticalAlignment = Alignment.CenterVertically
-          ) {
-            Text(" ") // centers title
-            Text(
-              title,
-              fontSize = 16.sp,
-              color = MaterialTheme.colors.secondary
-            )
-            Icon(
-              painterResource(MR.images.ic_close),
-              generalGetString(MR.strings.icon_descr_close_button),
-              tint = MaterialTheme.colors.secondary,
-              modifier = Modifier
-                .size(25.dp)
-                .clickable { cancel() }
-            )
-          }
-
-          CustomTimePicker(
-            selection,
-            timeUnitsLimits
-          )
-
-          TextButton(onClick = { confirmButtonAction(selection.value) }) {
-            Text(
-              confirmButtonText,
-              fontSize = 18.sp,
-              color = MaterialTheme.colors.primary
-            )
-          }
-        }
+        Text(
+          confirmButtonText,
+          Modifier.fillMaxWidth(),
+          textAlign = TextAlign.Center,
+          color = MaterialTheme.colors.primary
+        )
      }
    }
  }
@@ -220,7 +97,6 @@ fun DropdownCustomTimePickerSettingRow(

  val dropdownSelection: MutableState<DropdownSelection> = remember { mutableStateOf(DropdownSelection.DropdownValue(selection.value)) }
  val values: MutableState<List<DropdownSelection>> = remember { mutableStateOf(getValues(selection.value)) }
-  val showCustomTimePicker = remember { mutableStateOf(false) }

  fun updateValue(selectedValue: Int?) {
    values.value = getValues(selectedValue)
@@ -247,28 +123,22 @@ fun DropdownCustomTimePickerSettingRow(
    onSelected = { sel: DropdownSelection ->
      when (sel) {
        is DropdownSelection.DropdownValue -> updateValue(sel.value)
-        DropdownSelection.Custom -> showCustomTimePicker.value = true
+        DropdownSelection.Custom -> {
+          val selectedCustomTime = mutableStateOf(selection.value ?: 86400)
+          showCustomTimePickerDialog(
+            selectedCustomTime,
+            timeUnitsLimits = customPickerTimeUnitsLimits,
+            title = customPickerTitle,
+            confirmButtonText = customPickerConfirmButtonText,
+            confirmButtonAction = ::updateValue,
+            cancel = {
+              dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
+            }
+          )
+        }
      }
    }
  )
-
-  if (showCustomTimePicker.value) {
-    val selectedCustomTime = remember { mutableStateOf(selection.value ?: 86400) }
-    CustomTimePickerDialog(
-      selectedCustomTime,
-      timeUnitsLimits = customPickerTimeUnitsLimits,
-      title = customPickerTitle,
-      confirmButtonText = customPickerConfirmButtonText,
-      confirmButtonAction = { time ->
-        updateValue(time)
-        showCustomTimePicker.value = false
-      },
-      cancel = {
-        dropdownSelection.value = DropdownSelection.DropdownValue(selection.value)
-        showCustomTimePicker.value = false
-      }
-    )
-  }
 }

 private sealed class DropdownSelection {
@@ -61,10 +61,10 @@ class ModalManager(private val placement: ModalPlacement? = null) {
    }
  }

-  fun showModalCloseable(settings: Boolean = false, showClose: Boolean = true, content: @Composable ModalData.(close: () -> Unit) -> Unit) {
+  fun showModalCloseable(settings: Boolean = false, showClose: Boolean = true, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable ModalData.(close: () -> Unit) -> Unit) {
    val data = ModalData()
    showCustomModal { close ->
-      ModalView(close, showClose = showClose, content = { data.content(close) })
+      ModalView(close, showClose = showClose, endButtons = endButtons, content = { data.content(close) })
    }
  }

@@ -198,16 +198,16 @@ fun <T> SectionItemWithValue(
 }

@Composable
-fun SectionTextFooter(text: String) {
-  SectionTextFooter(AnnotatedString(text))
+fun SectionTextFooter(text: String, color: Color = MaterialTheme.colors.secondary) {
+  SectionTextFooter(AnnotatedString(text), color = color)
 }

@Composable
-fun SectionTextFooter(text: AnnotatedString, textAlign: TextAlign = TextAlign.Start) {
+fun SectionTextFooter(text: AnnotatedString, textAlign: TextAlign = TextAlign.Start, color: Color = MaterialTheme.colors.secondary) {
  Text(
    text,
    Modifier.padding(start = DEFAULT_PADDING, end = DEFAULT_PADDING, top = DEFAULT_PADDING_HALF).fillMaxWidth(0.9F),
-    color = MaterialTheme.colors.secondary,
+    color = color,
    lineHeight = 18.sp,
    fontSize = 14.sp,
    textAlign = textAlign
@@ -47,10 +47,6 @@ fun NetworkAndServersView(
  val onionHosts = remember { mutableStateOf(netCfg.onionHosts) }
  val sessionMode = remember { mutableStateOf(netCfg.sessionMode) }

-  LaunchedEffect(Unit) {
-    chatModel.userSMPServersUnsaved.value = null
-  }
-
  val proxyPort = remember { derivedStateOf { chatModel.controller.appPrefs.networkProxyHostPort.state.value?.split(":")?.lastOrNull()?.toIntOrNull() ?: 9050 } }
  NetworkAndServersLayout(
    currentRemoteHost = currentRemoteHost,
@@ -28,19 +28,18 @@ import chat.simplex.res.MR
@Composable
 fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: ServerProtocol, close: () -> Unit) {
  var presetServers by remember(rhId) { mutableStateOf(emptyList<String>()) }
-  var servers by remember(rhId) {
-    mutableStateOf(m.userSMPServersUnsaved.value ?: emptyList())
-  }
+  var servers by remember { stateGetOrPut("servers") { emptyList<ServerCfg>() } }
+  var serversAlreadyLoaded by remember { stateGetOrPut("serversAlreadyLoaded") { false } }
  val currServers = remember(rhId) { mutableStateOf(servers) }
  val testing = rememberSaveable(rhId) { mutableStateOf(false) }
-  val serversUnchanged = remember { derivedStateOf { servers == currServers.value || testing.value } }
-  val allServersDisabled = remember { derivedStateOf { servers.all { !it.enabled } } }
-  val saveDisabled = remember {
+  val serversUnchanged = remember(servers) { derivedStateOf { servers == currServers.value || testing.value } }
+  val allServersDisabled = remember { derivedStateOf { servers.none { it.enabled } } }
+  val saveDisabled = remember(servers) {
    derivedStateOf {
      servers.isEmpty() ||
      servers == currServers.value ||
      testing.value ||
-      !servers.all { srv ->
+      servers.none { srv ->
        val address = parseServerAddress(srv.server)
        address != null && uniqueAddress(srv, address, servers)
      } ||
@@ -49,8 +48,8 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
  }

  KeyChangeEffect(rhId) {
-    m.userSMPServersUnsaved.value = null
    servers = emptyList()
+    serversAlreadyLoaded = false
  }

  LaunchedEffect(rhId) {
@@ -59,8 +58,9 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
      if (res != null) {
        currServers.value = res.protoServers
        presetServers = res.presetServers
-        if (servers.isEmpty()) {
+        if (servers.isEmpty() && !serversAlreadyLoaded) {
          servers = currServers.value
+          serversAlreadyLoaded = true
        }
      }
    }
@@ -80,13 +80,11 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
          newServers.add(index, updated)
          old = updated
          servers = newServers
-          m.userSMPServersUnsaved.value = servers
        },
        onDelete = {
          val newServers = ArrayList(servers)
          newServers.removeAt(index)
          servers = newServers
-          m.userSMPServersUnsaved.value = servers
          close()
        })
    }
@@ -125,7 +123,6 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
                    ScanProtocolServer(rhId) {
                      close()
                      servers = servers + it
-                      m.userSMPServersUnsaved.value = servers
                    }
                  }
                }
@@ -150,13 +147,11 @@ fun ModalData.ProtocolServersView(m: ChatModel, rhId: Long?, serverProtocol: Ser
        testServersJob.value = withLongRunningApi {
          testServers(testing, servers, m) {
            servers = it
-            m.userSMPServersUnsaved.value = servers
          }
        }
      },
      resetServers = {
-        servers = currServers.value ?: emptyList()
-        m.userSMPServersUnsaved.value = null
+        servers = currServers.value
      },
      saveSMPServers = {
        saveServers(rhId, serverProtocol, currServers, servers, m)
@@ -355,7 +350,6 @@ private fun saveServers(rhId: Long?, protocol: ServerProtocol, currServers: Muta
  withBGApi {
    if (m.controller.setUserProtoServers(rhId, protocol, servers)) {
      currServers.value = servers
-      m.userSMPServersUnsaved.value = null
    }
    afterSave()
  }
@@ -1377,9 +1377,11 @@
  <!-- GroupWelcomeView.kt -->
  <string name="group_welcome_title">Welcome message</string>
  <string name="save_welcome_message_question">Save welcome message?</string>
+  <string name="welcome_message_is_too_long">Welcome message is too long</string>
  <string name="save_and_update_group_profile">Save and update group profile</string>
  <string name="group_welcome_preview">Preview</string>
  <string name="enter_welcome_message">Enter welcome message…</string>
+  <string name="message_too_large">Message too large</string>

  <!-- ConnectionStats -->
  <string name="conn_stats_section_title_servers">SERVERS</string>
@@ -0,0 +1,80 @@
+package chat.simplex.common.views.helpers
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.MaterialTheme
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import chat.simplex.common.model.CustomTimeUnit
+import chat.simplex.common.ui.theme.DEFAULT_PADDING
+
+@Composable
+actual fun CustomTimePicker(
+  selection: MutableState<Int>,
+  timeUnitsLimits: List<TimeUnitLimits>
+) {
+  val unit = remember {
+    var res: CustomTimeUnit = CustomTimeUnit.Second
+    val found = timeUnitsLimits.asReversed().any {
+      if (selection.value >= it.minValue * it.timeUnit.toSeconds && selection.value <= it.maxValue * it.timeUnit.toSeconds) {
+        res = it.timeUnit
+        selection.value = (selection.value / it.timeUnit.toSeconds).coerceIn(it.minValue, it.maxValue) * it.timeUnit.toSeconds
+        true
+      } else {
+        false
+      }
+    }
+    if (!found) {
+      // If custom interval doesn't fit in any category, set it to 1 second interval
+      selection.value = 1
+    }
+    mutableStateOf(res)
+  }
+  val values = remember(unit.value) {
+    val limit = timeUnitsLimits.first { it.timeUnit == unit.value }
+    val res = ArrayList<Pair<Int, String>>()
+    for (i in limit.minValue..limit.maxValue) {
+      val seconds = i * limit.timeUnit.toSeconds
+      val desc = i.toString()
+      res.add(seconds to desc)
+    }
+    if (res.none { it.first == selection.value }) {
+      // Doesn't fit into min..max, put it equal to the closest value
+      selection.value = selection.value.coerceIn(res.first().first, res.last().first)
+      //selection.value = res.last { it.first <= selection.value }.first
+    }
+    res
+  }
+  val units = remember {
+    val res = ArrayList<Pair<CustomTimeUnit, String>>()
+    for (unit in timeUnitsLimits) {
+      res.add(unit.timeUnit to unit.timeUnit.text)
+    }
+    res
+  }
+
+  Row(
+    Modifier.padding(bottom = DEFAULT_PADDING),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceEvenly
+  ) {
+    ExposedDropDownSetting(
+      values,
+      selection,
+      textColor = MaterialTheme.colors.onBackground,
+      enabled = remember { mutableStateOf(true) },
+      onSelected = { selection.value = it }
+    )
+    Spacer(Modifier.width(DEFAULT_PADDING))
+    ExposedDropDownSetting(
+      units,
+      unit,
+      textColor = MaterialTheme.colors.onBackground,
+      enabled = remember { mutableStateOf(true) },
+      onSelected = {
+        selection.value = selection.value / unit.value.toSeconds * it.toSeconds
+        unit.value = it
+      }
+    )
+  }
+}
@@ -33,4 +33,4 @@ desktop.version_code=26

 kotlin.version=1.8.20
 gradle.plugin.version=7.4.2
-compose.version=1.5.10
+compose.version=1.6.0-beta01
@@ -1035,6 +1035,7 @@ processChatCommand' vr = \case
        withStore' $ \db -> deleteGroup db user gInfo
        let contactIds = mapMaybe memberContactId members
        deleteAgentConnectionsAsync user . concat =<< mapM deleteUnusedContact contactIds
+        updateCIGroupInvitationStatus user gInfo CIGISRejected `catchChatError` \_ -> pure ()
        pure $ CRGroupDeletedUser user gInfo
      where
        deleteUnusedContact :: ContactId -> m [ConnId]
@@ -1686,17 +1687,9 @@ processChatCommand' vr = \case
            createMemberConnection db userId fromMember agentConnId (fromJVersionRange peerChatVRange) subMode
            updateGroupMemberStatus db userId fromMember GSMemAccepted
            updateGroupMemberStatus db userId membership GSMemAccepted
-          updateCIGroupInvitationStatus user
+          updateCIGroupInvitationStatus user g CIGISAccepted `catchChatError` \_ -> pure ()
          pure $ CRUserAcceptedGroupSent user g {membership = membership {memberStatus = GSMemAccepted}} Nothing
        Nothing -> throwChatError $ CEContactNotActive ct
-    where
-      updateCIGroupInvitationStatus user = do
-        AChatItem _ _ cInfo ChatItem {content, meta = CIMeta {itemId}} <- withStore $ \db -> getChatItemByGroupId db vr user groupId
-        case (cInfo, content) of
-          (DirectChat ct, CIRcvGroupInvitation ciGroupInv memRole) -> do
-            let aciContent = ACIContent SMDRcv $ CIRcvGroupInvitation ciGroupInv {status = CIGISAccepted} memRole
-            updateDirectChatItemView user ct itemId aciContent False Nothing
-          _ -> pure () -- prohibited
  APIMemberRole groupId memberId memRole -> withUser $ \user -> do
    Group gInfo@GroupInfo {membership} members <- withStore $ \db -> getGroup db vr user groupId
    if memberId == groupMemberId' membership
@@ -2512,6 +2505,14 @@ processChatCommand' vr = \case
        cReqHashes :: (ConnReqUriHash, ConnReqUriHash)
        cReqHashes = bimap hash hash cReqSchemas
        hash = ConnReqUriHash . C.sha256Hash . strEncode
+    updateCIGroupInvitationStatus user GroupInfo {groupId} newStatus = do
+      AChatItem _ _ cInfo ChatItem {content, meta = CIMeta {itemId}} <- withStore $ \db -> getChatItemByGroupId db vr user groupId
+      case (cInfo, content) of
+        (DirectChat ct, CIRcvGroupInvitation ciGroupInv@CIGroupInvitation {status} memRole)
+          | status == CIGISPending -> do
+              let aciContent = ACIContent SMDRcv $ CIRcvGroupInvitation ciGroupInv {status = newStatus} memRole
+              updateDirectChatItemView user ct itemId aciContent False Nothing
+        _ -> pure () -- prohibited

 toggleNtf :: ChatMonad m => User -> GroupMember -> Bool -> m ()
 toggleNtf user m ntfOn =
@@ -20,6 +20,7 @@ import qualified Data.ByteArray as BA
 import qualified Data.ByteString.Base64.URL as U
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
+import qualified Data.ByteString.Lazy.Char8 as LB
 import Data.Functor (($>))
 import Data.List (find)
 import qualified Data.List.NonEmpty as L
@@ -94,6 +95,8 @@ foreign export ccall "chat_password_hash" cChatPasswordHash :: CString -> CStrin

 foreign export ccall "chat_valid_name" cChatValidName :: CString -> IO CString

+foreign export ccall "chat_json_length" cChatJsonLength :: CString -> IO CInt
+
 foreign export ccall "chat_encrypt_media" cChatEncryptMedia :: StablePtr ChatController -> CString -> Ptr Word8 -> CInt -> IO CString

 foreign export ccall "chat_decrypt_media" cChatDecryptMedia :: CString -> Ptr Word8 -> CInt -> IO CString
@@ -176,6 +179,10 @@ cChatPasswordHash cPwd cSalt = do
 cChatValidName :: CString -> IO CString
 cChatValidName cName = newCString . mkValidName =<< peekCString cName

+-- | returns length of JSON encoded string
+cChatJsonLength :: CString -> IO CInt
+cChatJsonLength s = fromIntegral . subtract 2 . LB.length . J.encode . safeDecodeUtf8 <$> B.packCString s
+
 mobileChatOpts :: String -> ChatOpts
 mobileChatOpts dbFilePrefix =
  ChatOpts
@@ -68,6 +68,8 @@ mobileTests = do
      it "no exception on missing file" testMissingFileEncryptionCApi
    describe "validate name" $ do
      it "should convert invalid name to a valid name" testValidNameCApi
+    describe "JSON length" $ do
+      it "should compute length of JSON encoded string" testChatJsonLengthCApi

 noActiveUser :: LB.ByteString
 noActiveUser =
@@ -356,6 +358,13 @@ testValidNameCApi _ = do
  cName2 <- cChatValidName =<< newCString " @'Джон'  Доу   👍 "
  peekCString cName2 `shouldReturn` goodName

+testChatJsonLengthCApi :: FilePath -> IO ()
+testChatJsonLengthCApi _ = do
+  cInt1 <- cChatJsonLength =<< newCString "Hello!"
+  cInt1 `shouldBe` 6
+  cInt2 <- cChatJsonLength =<< newCString "こんにちは！"
+  cInt2 `shouldBe` 18
+
 jDecode :: FromJSON a => String -> IO (Maybe a)
 jDecode = pure . J.decode . LB.pack
Author	SHA1	Message	Date
Avently	3cec97c84f	android, desktop: moved to Compose 1.6.0	2024-01-26 23:06:02 +07:00
Stanislav Dmitrenko	520d8868ef	android: refactor clipboard access to prevent Android error in logs (#3758 )	2024-01-26 14:00:53 +00:00
spaced4ndy	7192448303	core: fix invitation as rejected when deleting group (#3759 )	2024-01-26 17:56:17 +04:00
spaced4ndy	0f0f65533a	android: group welcome message byte limit (#3756 ) * android: group welcome message byte limit * text * change footer	2024-01-26 09:57:04 +00:00
spaced4ndy	78a38cb080	ios: group welcome message byte limit (#3751 ) * ios: group welcome message character limit * confirmation dialogue key * use chatJsonLength * text * change footer --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>	2024-01-26 09:37:49 +00:00
Stanislav Dmitrenko	f102f39147	android, desktop: protocol servers fix (#3755 ) Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com>	2024-01-25 20:59:02 +00:00
Stanislav Dmitrenko	cd349e80ce	desktop: propertly updating delivery tab of chat item info page (#3752 )	2024-01-25 17:51:20 +00:00
Stanislav Dmitrenko	430dc5bd2e	ui: don't show context menu on non-sent yet live message (#3754 ) * android, desktop: don't show context menu on non-sent yet live message * ios: don't show context menu on non-sent yet live message --------- Co-authored-by: Avently <avently@local>	2024-01-25 17:48:40 +00:00
spaced4ndy	3e0b863b64	core: add cChatJsonLength function (#3753 )	2024-01-25 18:57:38 +04:00
Stanislav Dmitrenko	d6afee11bc	desktop: prevent clicking enter on alert and text field at the same time (#3714 )	2024-01-25 14:50:53 +00:00
spaced4ndy	6ef3a9e668	ios: fix welcome view (#3743 ) * welcome view (still doesn't keep change on re-open) * fix * remove debug log * rename	2024-01-25 16:08:10 +04:00
spaced4ndy	fbe3353434	ui: fix link preview cancellation (#3750 )	2024-01-25 14:58:39 +04:00
Evgeny Poberezkin	d6d2e6e1eb	Merge branch 'stable'	2024-01-24 19:55:28 +00:00
Stanislav Dmitrenko	da1d20c17f	desktop: alignment for reactions (#3747 )	2024-01-24 16:25:44 +00:00
Stanislav Dmitrenko	afc324dc4f	android, desktop: marking chat as read if it was set unread (#3746 )	2024-01-24 16:24:49 +00:00
Stanislav Dmitrenko	f81e457e09	android: trying to start service again in case it was destroyed (#3745 )	2024-01-24 16:22:29 +00:00
Stanislav Dmitrenko	bd30b80e15	desktop: custom time picker (#3741 ) * desktop: custom time picker * text color * formatting * changes in UI * optimization * desktop: opening SimpleX links inside the app (#3738) * 5.5: ios 194, android 175, desktop 26 * docs: update downloads page * ui: fix chat preview showing incorrect timestamp when chat is empty (#3739) * ui: align call buttons with calls preference (#3740) * ui: deleted item preview (#3726) --------- Co-authored-by: Evgeny Poberezkin <evgeny@poberezkin.com> Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>	2024-01-24 16:15:27 +00:00
spaced4ndy	da9a7f4642	ui: exclude not ready and active contacts from list of contacts to add to group (e.g. simplex team contact) (#3737 )	2024-01-24 13:56:38 +04:00
spaced4ndy	838a759a76	ui: deleted item preview (#3726 )	2024-01-24 13:44:29 +04:00
spaced4ndy	f1ff27218c	ui: align call buttons with calls preference (#3740 )	2024-01-24 13:43:18 +04:00
spaced4ndy	8738cf332f	ui: fix chat preview showing incorrect timestamp when chat is empty (#3739 )	2024-01-24 13:37:29 +04:00