Show pending contacts (#547)

* capture contact connecting event

* disable navigation to not ready chat

* update "pending contact" alert, Russian translations

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>

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

@@ -357,7 +357,7 @@ class Contact(
   override val chatType get() = ChatType.Direct
   override val id get() = "@$contactId"
   override val apiId get() = contactId
-  override val ready get() = activeConn.connStatus == "ready" || activeConn.connStatus == "snd-ready"
+  override val ready get() = activeConn.connStatus == "ready"
   override val displayName get() = profile.displayName
   override val fullName get() = profile.fullName
   override val image get() = profile.image

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

@@ -11,7 +11,6 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Bolt
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.*
@@ -339,6 +338,9 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
         chatModel.updateNetworkStatus(r.contact, Chat.NetworkStatus.Connected())
 //        NtfManager.shared.notifyContactConnected(contact)
       }
+      is CR.ContactConnecting -> {
+        chatModel.updateContact(r.contact)
+      }
       is CR.ReceivedContactRequest -> {
         val contactRequest = r.contactRequest
         val cInfo = ChatInfo.ContactRequest(contactRequest)
@@ -642,6 +644,7 @@ sealed class CR {
   @Serializable @SerialName("userContactLinkCreated") class UserContactLinkCreated(val connReqContact: String): CR()
   @Serializable @SerialName("userContactLinkDeleted") class UserContactLinkDeleted: CR()
   @Serializable @SerialName("contactConnected") class ContactConnected(val contact: Contact): CR()
+  @Serializable @SerialName("contactConnecting") class ContactConnecting(val contact: Contact): CR()
   @Serializable @SerialName("receivedContactRequest") class ReceivedContactRequest(val contactRequest: UserContactRequest): CR()
   @Serializable @SerialName("acceptingContactRequest") class AcceptingContactRequest(val contact: Contact): CR()
   @Serializable @SerialName("contactRequestRejected") class ContactRequestRejected: CR()
@@ -685,6 +688,7 @@ sealed class CR {
     is UserContactLinkCreated -> "userContactLinkCreated"
     is UserContactLinkDeleted -> "userContactLinkDeleted"
     is ContactConnected -> "contactConnected"
+    is ContactConnecting -> "contactConnecting"
     is ReceivedContactRequest -> "receivedContactRequest"
     is AcceptingContactRequest -> "acceptingContactRequest"
     is ContactRequestRejected -> "contactRequestRejected"
@@ -729,6 +733,7 @@ sealed class CR {
     is UserContactLinkCreated -> connReqContact
     is UserContactLinkDeleted -> noDetails()
     is ContactConnected -> json.encodeToString(contact)
+    is ContactConnecting -> json.encodeToString(contact)
     is ReceivedContactRequest -> json.encodeToString(contactRequest)
     is AcceptingContactRequest -> json.encodeToString(contact)
     is ContactRequestRejected -> noDetails()

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt

@@ -25,7 +25,11 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
       if (chat.chatInfo is ChatInfo.ContactRequest) {
         contactRequestAlertDialog(chat.chatInfo, chatModel)
       } else {
-        withApi { openChat(chatModel, chat.chatInfo) }
+        if (chat.chatInfo.ready) {
+          withApi { openChat(chatModel, chat.chatInfo) }
+        } else {
+          pendingConnectionAlertDialog(chat.chatInfo, chatModel)
+        }
       }
     }
   )
@@ -63,6 +67,24 @@ fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel
   )
 }
 
+fun pendingConnectionAlertDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.alert_title_contact_connection_pending),
+    text = generalGetString(R.string.alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry),
+    confirmText = generalGetString(R.string.button_delete_contact),
+    onConfirm = {
+      withApi {
+        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
+        if (r) {
+          chatModel.removeChat(chatInfo.id)
+          chatModel.chatId.value = null
+        }
+      }
+    },
+    dismissText = generalGetString(R.string.cancel_verb),
+  )
+}
+
 @Composable
 fun ChatListNavLinkLayout(chat: Chat, click: () -> Unit) {
   Surface(

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt

@@ -9,6 +9,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
@@ -17,8 +18,7 @@ import androidx.compose.ui.unit.sp
 import chat.simplex.app.R
 import chat.simplex.app.model.Chat
 import chat.simplex.app.model.getTimestampText
-import chat.simplex.app.ui.theme.HighOrLowlight
-import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.chat.item.MarkdownText
 import chat.simplex.app.views.helpers.*
 
@@ -36,17 +36,21 @@ fun ChatPreviewView(chat: Chat) {
         maxLines = 1,
         overflow = TextOverflow.Ellipsis,
         style = MaterialTheme.typography.h3,
-        fontWeight = FontWeight.Bold
+        fontWeight = FontWeight.Bold,
+        color = if (chat.chatInfo.ready) Color.Unspecified else HighOrLowlight
       )
-
-      val ci = chat.chatItems.lastOrNull()
-      if (ci != null) {
-        MarkdownText(
-          ci.text,  ci.formattedText, ci.memberDisplayName,
-          metaText = ci.timestampText,
-          maxLines = 2,
-          overflow = TextOverflow.Ellipsis
-        )
+      if (chat.chatInfo.ready) {
+        val ci = chat.chatItems.lastOrNull()
+        if (ci != null) {
+          MarkdownText(
+            ci.text, ci.formattedText, ci.memberDisplayName,
+            metaText = ci.timestampText,
+            maxLines = 2,
+            overflow = TextOverflow.Ellipsis
+          )
+        }
+      } else {
+        Text(generalGetString(R.string.contact_connection_pending), color = HighOrLowlight)
       }
     }
     val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.createdAt)

apps/android/app/src/main/res/values-ru/strings.xml

@@ -71,6 +71,7 @@
     <string name="welcome">Здравствуйте!</string>
     <string name="this_text_is_available_in_settings">Этот текст можно найти в Настройках</string>
     <string name="your_chats">Ваши чаты</string>
+    <string name="contact_connection_pending">соединяется…</string>
 
     <!-- ComposeView.kt -->
     <string name="attach">Прикрепить</string>
@@ -129,6 +130,10 @@
     <string name="accept_contact_button">Принять</string>
     <string name="reject_contact_button">Отклонить</string>
 
+    <!-- Connection Pending Alert Dialogue - ChatListNavLinkView.kt -->
+    <string name="alert_title_contact_connection_pending">Соединение еще не установлено!</string>
+    <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Ваш контакт должен быть в сети чтобы установить соединение.\nВы можете отменить соединение и удалить контакт (и попробовать позже с другой ссылкой).</string>
+
     <!-- Contact Request Information - ContactRequestView.kt -->
     <string name="contact_wants_to_connect_with_you">хочет соединиться с вами!</string>
 

apps/android/app/src/main/res/values/strings.xml

@@ -71,6 +71,7 @@
   <string name="welcome">Welcome!</string>
   <string name="this_text_is_available_in_settings">This text is available in settings</string>
   <string name="your_chats">Your chats</string>
+  <string name="contact_connection_pending">connecting…</string>
 
   <!-- ComposeView.kt -->
   <string name="attach">Attach</string>
@@ -123,12 +124,16 @@
   <string name="desktop_scan_QR_code_from_app_via_scan_QR_code">💻 desktop: scan displayed QR code from the app, via <b>Scan QR code</b>.</string>
   <string name="mobile_tap_open_in_mobile_app_then_tap_connect_in_app">📱 mobile: tap <b>Open in mobile app</b>, then tap <b>Connect</b> in the app.</string>
 
-  <!-- Contact Request Alert Dialogue - CharListNavLinkView.kt -->
+  <!-- Contact Request Alert Dialogue - ChatListNavLinkView.kt -->
   <string name="accept_connection_request__question">Accept connection request?</string>
   <string name="if_you_choose_to_reject_the_sender_will_not_be_notified">If you choose to reject sender will NOT be notified.</string>
   <string name="accept_contact_button">Accept</string>
   <string name="reject_contact_button">Reject</string>
 
+  <!-- Connection Pending Alert Dialogue - ChatListNavLinkView.kt -->
+  <string name="alert_title_contact_connection_pending">Contact is not connected yet!</string>
+  <string name="alert_text_connection_pending_they_need_to_be_online_can_delete_and_retry">Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link).</string>
+
   <!-- Contact Request Information - ContactRequestView.kt -->
   <string name="contact_wants_to_connect_with_you">wants to connect to you!</string>