android: create new group with incognito membership (#3285)

2023-10-27 09:33:59 +04:00 · 2023-10-27 09:33:59 +04:00 · a7b5dfb74c
commit a7b5dfb74c
parent 7102723c23
6 changed files with 138 additions and 71 deletions
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@ -1166,9 +1166,9 @@ object ChatController {
    }
  }

-  suspend fun apiNewGroup(p: GroupProfile): GroupInfo? {
+  suspend fun apiNewGroup(incognito: Boolean, groupProfile: GroupProfile): GroupInfo? {
    val userId = kotlin.runCatching { currentUserId("apiNewGroup") }.getOrElse { return null }
-    val r = sendCmd(CC.ApiNewGroup(userId, p))
+    val r = sendCmd(CC.ApiNewGroup(userId, incognito, groupProfile))
    if (r is CR.GroupCreated) return r.groupInfo
    Log.e(TAG, "apiNewGroup bad response: ${r.responseType} ${r.details}")
    return null
@ -1889,7 +1889,7 @@ sealed class CC {
  class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
  class ApiDeleteMemberChatItem(val groupId: Long, val groupMemberId: Long, val itemId: Long): CC()
  class ApiChatItemReaction(val type: ChatType, val id: Long, val itemId: Long, val add: Boolean, val reaction: MsgReaction): CC()
-  class ApiNewGroup(val userId: Long, val groupProfile: GroupProfile): CC()
+  class ApiNewGroup(val userId: Long, val incognito: Boolean, val groupProfile: GroupProfile): CC()
  class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
  class ApiJoinGroup(val groupId: Long): CC()
  class ApiMemberRole(val groupId: Long, val memberId: Long, val memberRole: GroupMemberRole): CC()
@ -1999,7 +1999,7 @@ sealed class CC {
    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
    is ApiDeleteMemberChatItem -> "/_delete member item #$groupId $groupMemberId $itemId"
    is ApiChatItemReaction -> "/_reaction ${chatRef(type, id)} $itemId ${onOff(add)} ${json.encodeToString(reaction)}"
-    is ApiNewGroup -> "/_group $userId ${json.encodeToString(groupProfile)}"
+    is ApiNewGroup -> "/_group $userId incognito=${onOff(incognito)} ${json.encodeToString(groupProfile)}"
    is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
    is ApiJoinGroup -> "/_join #$groupId"
    is ApiMemberRole -> "/_member role #$groupId $memberId ${memberRole.memberRole}"
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@ -389,6 +389,16 @@ fun ChatView(chatId: String, chatModel: ChatModel, onComposed: suspend (chatId:
          }
        }
      },
+      openGroupLink = { groupInfo ->
+        hideKeyboard(view)
+        withApi {
+          val link = chatModel.controller.apiGetGroupLink(groupInfo.groupId)
+          ModalManager.end.closeModals()
+          ModalManager.end.showModalCloseable(true) {
+            GroupLinkView(chatModel, groupInfo, link?.first, link?.second, onGroupLinkUpdated = null)
+          }
+        }
+      },
      markRead = { range, unreadCountAfter ->
        chatModel.markChatItemsRead(chat.chatInfo, range, unreadCountAfter)
        ntfManager.cancelNotificationsForChat(chat.id)
@ -449,6 +459,7 @@ fun ChatLayout(
  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  addMembers: (GroupInfo) -> Unit,
+  openGroupLink: (GroupInfo) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
  onSearchValueChanged: (String) -> Unit,
@ -495,7 +506,7 @@ fun ChatLayout(
        }

        Scaffold(
-          topBar = { ChatInfoToolbar(chat, back, info, startCall, endCall, addMembers, changeNtfsState, onSearchValueChanged) },
+          topBar = { ChatInfoToolbar(chat, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged) },
          bottomBar = composeView,
          modifier = Modifier.navigationBarsWithImePadding(),
          floatingActionButton = { floatingButton.value() },
@ -526,6 +537,7 @@ fun ChatInfoToolbar(
  startCall: (CallMediaType) -> Unit,
  endCall: () -> Unit,
  addMembers: (GroupInfo) -> Unit,
+  openGroupLink: (GroupInfo) -> Unit,
  changeNtfsState: (Boolean, currentValue: MutableState<Boolean>) -> Unit,
  onSearchValueChanged: (String) -> Unit,
 ) {
@ -607,13 +619,24 @@ fun ChatInfoToolbar(
        })
      }
    }
-  } else if (chat.chatInfo is ChatInfo.Group && chat.chatInfo.groupInfo.canAddMembers && !chat.chatInfo.incognito) {
-    barButtons.add {
-      IconButton({
-        showMenu.value = false
-        addMembers(chat.chatInfo.groupInfo)
-      }) {
-        Icon(painterResource(MR.images.ic_person_add_500), stringResource(MR.strings.icon_descr_add_members), tint = MaterialTheme.colors.primary)
+  } else if (chat.chatInfo is ChatInfo.Group && chat.chatInfo.groupInfo.canAddMembers) {
+    if (!chat.chatInfo.incognito) {
+      barButtons.add {
+        IconButton({
+          showMenu.value = false
+          addMembers(chat.chatInfo.groupInfo)
+        }) {
+          Icon(painterResource(MR.images.ic_person_add_500), stringResource(MR.strings.icon_descr_add_members), tint = MaterialTheme.colors.primary)
+        }
+      }
+    } else {
+      barButtons.add {
+        IconButton({
+          showMenu.value = false
+          openGroupLink(chat.chatInfo.groupInfo)
+        }) {
+          Icon(painterResource(MR.images.ic_add_link), stringResource(MR.strings.group_link), tint = MaterialTheme.colors.primary)
+        }
      }
    }
  }
@ -1341,6 +1364,7 @@ fun PreviewChatLayout() {
      setReaction = { _, _, _, _ -> },
      showItemDetails = { _, _ -> },
      addMembers = { _ -> },
+      openGroupLink = {},
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
      onSearchValueChanged = {},
@ -1411,6 +1435,7 @@ fun PreviewGroupChatLayout() {
      setReaction = { _, _, _, _ -> },
      showItemDetails = { _, _ -> },
      addMembers = { _ -> },
+      openGroupLink = {},
      markRead = { _, _ -> },
      changeNtfsState = { _, _ -> },
      onSearchValueChanged = {},
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupLinkView.kt
@ -23,7 +23,15 @@ import chat.simplex.common.views.newchat.*
 import chat.simplex.res.MR

@Composable
-fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: String?, memberRole: GroupMemberRole?, onGroupLinkUpdated: (Pair<String, GroupMemberRole>?) -> Unit) {
+fun GroupLinkView(
+  chatModel: ChatModel,
+  groupInfo: GroupInfo,
+  connReqContact: String?,
+  memberRole: GroupMemberRole?,
+  onGroupLinkUpdated: ((Pair<String, GroupMemberRole>?) -> Unit)?,
+  creatingGroup: Boolean = false,
+  close: (() -> Unit)? = null
+) {
  var groupLink by rememberSaveable { mutableStateOf(connReqContact) }
  val groupLinkMemberRole = rememberSaveable { mutableStateOf(memberRole) }
  var creatingLink by rememberSaveable { mutableStateOf(false) }
@ -34,7 +42,7 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
      if (link != null) {
        groupLink = link.first
        groupLinkMemberRole.value = link.second
-        onGroupLinkUpdated(link)
+        onGroupLinkUpdated?.invoke(link)
      }
      creatingLink = false
    }
@ -58,7 +66,7 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
          if (link != null) {
            groupLink = link.first
            groupLinkMemberRole.value = link.second
-            onGroupLinkUpdated(link)
+            onGroupLinkUpdated?.invoke(link)
          }
        }
      }
@ -73,13 +81,15 @@ fun GroupLinkView(chatModel: ChatModel, groupInfo: GroupInfo, connReqContact: St
            val r = chatModel.controller.apiDeleteGroupLink(groupInfo.groupId)
            if (r) {
              groupLink = null
-              onGroupLinkUpdated(null)
+              onGroupLinkUpdated?.invoke(null)
            }
          }
        },
        destructive = true,
      )
-    }
+    },
+    creatingGroup = creatingGroup,
+    close = close
  )
  if (creatingLink) {
    ProgressIndicator()
@ -94,8 +104,19 @@ fun GroupLinkLayout(
  creatingLink: Boolean,
  createLink: () -> Unit,
  updateLink: () -> Unit,
-  deleteLink: () -> Unit
+  deleteLink: () -> Unit,
+  creatingGroup: Boolean = false,
+  close: (() -> Unit)? = null
 ) {
+  @Composable
+  fun ContinueButton(close: () -> Unit) {
+    SimpleButton(
+      stringResource(MR.strings.continue_to_next_step),
+      icon = painterResource(MR.images.ic_check),
+      click = close
+    )
+  }
+
  Column(
    Modifier
      .verticalScroll(rememberScrollState()),
@ -112,7 +133,16 @@ fun GroupLinkLayout(
      verticalArrangement = Arrangement.SpaceEvenly
    ) {
      if (groupLink == null) {
-        SimpleButton(stringResource(MR.strings.button_create_group_link), icon = painterResource(MR.images.ic_add_link), disabled = creatingLink, click = createLink)
+        Row(
+          horizontalArrangement = Arrangement.spacedBy(10.dp),
+          verticalAlignment = Alignment.CenterVertically,
+          modifier = Modifier.padding(horizontal = DEFAULT_PADDING, vertical = 10.dp)
+        ) {
+          SimpleButton(stringResource(MR.strings.button_create_group_link), icon = painterResource(MR.images.ic_add_link), disabled = creatingLink, click = createLink)
+          if (creatingGroup && close != null) {
+            ContinueButton(close)
+          }
+        }
      } else {
        RoleSelectionRow(groupInfo, groupLinkMemberRole)
        var initialLaunch by remember { mutableStateOf(true) }
@ -134,12 +164,16 @@ fun GroupLinkLayout(
            icon = painterResource(MR.images.ic_share),
            click = { clipboard.shareText(simplexChatLink(groupLink)) }
          )
-          SimpleButton(
-            stringResource(MR.strings.delete_link),
-            icon = painterResource(MR.images.ic_delete),
-            color = Color.Red,
-            click = deleteLink
-          )
+          if (creatingGroup && close != null) {
+            ContinueButton(close)
+          } else {
+            SimpleButton(
+              stringResource(MR.strings.delete_link),
+              icon = painterResource(MR.images.ic_delete),
+              color = Color.Red,
+              click = deleteLink
+            )
+          }
        }
      }
    }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/AddGroupView.kt
@ -1,5 +1,6 @@
 package chat.simplex.common.views.newchat

+import SectionTextFooter
 import androidx.compose.desktop.ui.tooling.preview.Preview
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
@ -11,10 +12,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.buildAnnotatedString
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
@ -22,11 +22,10 @@ import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.group.AddGroupMembersView
 import chat.simplex.common.views.chatlist.setGroupMembers
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.onboarding.ReadableText
-import chat.simplex.common.views.usersettings.DeleteImageButton
-import chat.simplex.common.views.usersettings.EditImageButton
 import chat.simplex.common.platform.*
 import chat.simplex.common.views.*
+import chat.simplex.common.views.chat.group.GroupLinkView
+import chat.simplex.common.views.usersettings.*
 import chat.simplex.res.MR
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@ -35,9 +34,9 @@ import java.net.URI
@Composable
 fun AddGroupView(chatModel: ChatModel, close: () -> Unit) {
  AddGroupLayout(
-    createGroup = { groupProfile ->
+    createGroup = { incognito, groupProfile ->
      withApi {
-        val groupInfo = chatModel.controller.apiNewGroup(groupProfile)
+        val groupInfo = chatModel.controller.apiNewGroup(incognito, groupProfile)
        if (groupInfo != null) {
          chatModel.addChat(Chat(chatInfo = ChatInfo.Group(groupInfo), chatItems = listOf()))
          chatModel.chatItems.clear()
@ -45,24 +44,36 @@ fun AddGroupView(chatModel: ChatModel, close: () -> Unit) {
          chatModel.chatId.value = groupInfo.id
          setGroupMembers(groupInfo, chatModel)
          close.invoke()
-          ModalManager.end.showModalCloseable(true) { close ->
-            AddGroupMembersView(groupInfo, true, chatModel, close)
+          if (!groupInfo.incognito) {
+            ModalManager.end.showModalCloseable(true) { close ->
+              AddGroupMembersView(groupInfo, creatingGroup = true, chatModel, close)
+            }
+          } else {
+            ModalManager.end.showModalCloseable(true) { close ->
+              GroupLinkView(chatModel, groupInfo, connReqContact = null, memberRole = null, onGroupLinkUpdated = null, creatingGroup = true, close)
+            }
          }
        }
      }
    },
+    incognitoPref = chatModel.controller.appPrefs.incognito,
    close
  )
 }

@Composable
-fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
+fun AddGroupLayout(
+  createGroup: (Boolean, GroupProfile) -> Unit,
+  incognitoPref: SharedPreference<Boolean>,
+  close: () -> Unit
+) {
  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
  val scope = rememberCoroutineScope()
  val displayName = rememberSaveable { mutableStateOf("") }
  val chosenImage = rememberSaveable { mutableStateOf<URI?>(null) }
  val profileImage = rememberSaveable { mutableStateOf<String?>(null) }
  val focusRequester = remember { FocusRequester() }
+  val incognito = remember { mutableStateOf(incognitoPref.get()) }

  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
    ModalBottomSheetLayout(
@ -87,7 +98,6 @@ fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
            .padding(horizontal = DEFAULT_PADDING)
        ) {
          AppBarTitle(stringResource(MR.strings.create_secret_group_title))
-          ReadableText(MR.strings.group_is_decentralized, TextAlign.Center)
          Box(
            Modifier
              .fillMaxWidth()
@ -118,20 +128,32 @@ fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
          }
          ProfileNameField(displayName, "", { isValidDisplayName(it.trim()) }, focusRequester)
          Spacer(Modifier.height(8.dp))
-          val enabled = canCreateProfile(displayName.value)
-          if (enabled) {
-            CreateGroupButton(MaterialTheme.colors.primary, Modifier
-              .clickable {
-                createGroup(GroupProfile(
-                  displayName = displayName.value.trim(),
-                  fullName = "",
-                  image = profileImage.value
-                ))
-              }
-              .padding(8.dp))
-          } else {
-            CreateGroupButton(MaterialTheme.colors.secondary, Modifier.padding(8.dp))
-          }
+
+          SettingsActionItem(
+            painterResource(MR.images.ic_check),
+            stringResource(MR.strings.create_group_button),
+            click = {
+              createGroup(incognito.value, GroupProfile(
+                displayName = displayName.value.trim(),
+                fullName = "",
+                image = profileImage.value
+              ))
+            },
+            textColor = MaterialTheme.colors.primary,
+            iconColor = MaterialTheme.colors.primary,
+            disabled = !canCreateProfile(displayName.value)
+          )
+
+          IncognitoToggle(incognitoPref, incognito) { ModalManager.start.showModal { IncognitoView() } }
+
+          SectionTextFooter(
+            buildAnnotatedString {
+              append(sharedProfileInfo(chatModel, incognito.value))
+              append("\n")
+              append(annotatedStringResource(MR.strings.group_is_decentralized))
+            }
+          )
+
          LaunchedEffect(Unit) {
            delay(300)
            focusRequester.requestFocus()
@ -142,21 +164,6 @@ fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
  }
 }

-@Composable
-fun CreateGroupButton(color: Color, modifier: Modifier) {
-  Row(
-    Modifier.fillMaxWidth(),
-    horizontalArrangement = Arrangement.End
-  ) {
-    Surface(shape = RoundedCornerShape(20.dp), color = Color.Transparent) {
-      Row(modifier, verticalAlignment = Alignment.CenterVertically) {
-        Text(stringResource(MR.strings.create_profile_button), style = MaterialTheme.typography.caption, color = color, fontWeight = FontWeight.Bold)
-        Icon(painterResource(MR.images.ic_arrow_forward_ios), stringResource(MR.strings.create_profile_button), tint = color)
-      }
-    }
-  }
-}
-
 fun canCreateProfile(displayName: String): Boolean = displayName.trim().isNotEmpty() && isValidDisplayName(displayName.trim())

@Preview
@ -164,7 +171,8 @@ fun canCreateProfile(displayName: String): Boolean = displayName.trim().isNotEmp
 fun PreviewAddGroupLayout() {
  SimpleXTheme {
    AddGroupLayout(
-      createGroup = {},
+      createGroup = { _, _ -> },
+      incognitoPref = SharedPreference({ false }, {}),
      close = {}
    )
  }
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/PasteToConnect.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/PasteToConnect.kt
@ -3,10 +3,10 @@ package chat.simplex.common.views.newchat
 import SectionBottomSpacer
 import SectionTextFooter
 import androidx.compose.desktop.ui.tooling.preview.Preview
-import chat.simplex.common.platform.Log
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import dev.icerock.moko.resources.compose.painterResource
@ -14,7 +14,6 @@ import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.platform.TAG
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.model.SharedPreference
 import chat.simplex.common.ui.theme.*
@ -23,7 +22,6 @@ import chat.simplex.common.views.usersettings.IncognitoView
 import chat.simplex.common.views.usersettings.SettingsActionItem
 import chat.simplex.res.MR
 import java.net.URI
-import java.net.URISyntaxException

@Composable
 fun PasteToConnectView(chatModel: ChatModel, close: () -> Unit) {
@ -97,6 +95,8 @@ fun PasteToConnectLayout(
      painterResource(MR.images.ic_link),
      stringResource(MR.strings.connect_button),
      click = { connectViaLink(connectionLink.value) },
+      textColor = MaterialTheme.colors.primary,
+      iconColor = MaterialTheme.colors.primary,
      disabled = connectionLink.value.isEmpty() || connectionLink.value.trim().contains(" ")
    )

--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@ -1294,11 +1294,11 @@

  <!-- AddGroupView.kt -->
  <string name="create_secret_group_title">Create secret group</string>
-  <string name="group_is_decentralized">The group is fully decentralized – it is visible only to the members.</string>
+  <string name="group_is_decentralized">Fully decentralized – visible only to members.</string>
  <string name="group_display_name_field">Enter group name:</string>
  <string name="group_full_name_field">Group full name:</string>
  <string name="group_main_profile_sent">Your chat profile will be sent to group members</string>
-
+  <string name="create_group_button">Create group</string>

  <!-- GroupProfileView.kt -->
  <string name="group_profile_is_stored_on_members_devices">Group profile is stored on members\' devices, not on the servers.</string>