Add in-call info sheet for call links.

app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt

@@ -3,9 +3,10 @@ package org.thoughtcrime.securesms.components.settings.conversation
 import android.database.Cursor
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.map
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.disposables.CompositeDisposable
@@ -62,7 +63,7 @@ sealed class ConversationSettingsViewModel(
   protected val disposable = CompositeDisposable()
 
   init {
-    val threadId: LiveData<Long> = Transformations.distinctUntilChanged(Transformations.map(state) { it.threadId })
+    val threadId: LiveData<Long> = state.map { it.threadId }.distinctUntilChanged()
     val updater: LiveData<Long> = LiveDataUtil.combineLatest(threadId, sharedMediaUpdateTrigger) { tId, _ -> tId }
 
     val sharedMedia: LiveData<Optional<Cursor>> = LiveDataUtil.mapAsync(SignalExecutors.BOUNDED, updater) { tId ->

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallLinkInfoSheet.kt

@@ -0,0 +1,332 @@
+/*
+ * Copyright 2023 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.components.webrtc
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.Toast
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.app.ShareCompat
+import androidx.core.os.BundleCompat
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
+import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
+import io.reactivex.rxjava3.kotlin.subscribeBy
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import org.signal.core.ui.BottomSheets
+import org.signal.core.ui.Dividers
+import org.signal.core.ui.Rows
+import org.signal.core.ui.theme.SignalTheme
+import org.signal.core.util.concurrent.LifecycleDisposable
+import org.signal.core.util.concurrent.addTo
+import org.signal.core.util.logging.Log
+import org.signal.ringrtc.CallLinkState.Restrictions
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.calls.links.CallLinks
+import org.thoughtcrime.securesms.calls.links.EditCallLinkNameDialogFragment
+import org.thoughtcrime.securesms.calls.links.EditCallLinkNameDialogFragmentArgs
+import org.thoughtcrime.securesms.calls.links.SignalCallRow
+import org.thoughtcrime.securesms.calls.links.details.CallLinkDetailsViewModel
+import org.thoughtcrime.securesms.components.AvatarImageView
+import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
+import org.thoughtcrime.securesms.conversation.colors.AvatarColor
+import org.thoughtcrime.securesms.database.CallLinkTable
+import org.thoughtcrime.securesms.events.WebRtcViewModel
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.recipients.RecipientId
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkCredentials
+import org.thoughtcrime.securesms.service.webrtc.links.CallLinkRoomId
+import org.thoughtcrime.securesms.service.webrtc.links.SignalCallLinkState
+import org.thoughtcrime.securesms.service.webrtc.links.UpdateCallLinkResult
+import org.thoughtcrime.securesms.util.BottomSheetUtil
+
+/**
+ * Displays information about the in-progress CallLink call from
+ * within WebRtcActivity. If the user is able to modify call link
+ * state, provides options to do so.
+ */
+class CallLinkInfoSheet : ComposeBottomSheetDialogFragment() {
+
+  companion object {
+
+    private val TAG = Log.tag(CallLinkInfoSheet::class.java)
+    private const val CALL_LINK_ROOM_ID = "call_link_room_id"
+
+    @JvmStatic
+    fun show(fragmentManager: FragmentManager, callLinkRoomId: CallLinkRoomId) {
+      CallLinkInfoSheet().apply {
+        arguments = bundleOf(CALL_LINK_ROOM_ID to callLinkRoomId)
+      }.show(fragmentManager, BottomSheetUtil.STANDARD_BOTTOM_SHEET_FRAGMENT_TAG)
+    }
+  }
+
+  private val webRtcCallViewModel: WebRtcCallViewModel by activityViewModels()
+  private val callLinkDetailsViewModel: CallLinkDetailsViewModel by viewModels(factoryProducer = {
+    CallLinkDetailsViewModel.Factory(BundleCompat.getParcelable(requireArguments(), CALL_LINK_ROOM_ID, CallLinkRoomId::class.java)!!)
+  })
+
+  private val lifecycleDisposable = LifecycleDisposable()
+
+  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+    lifecycleDisposable.bindTo(viewLifecycleOwner)
+    parentFragmentManager.setFragmentResultListener(EditCallLinkNameDialogFragment.RESULT_KEY, viewLifecycleOwner) { resultKey, bundle ->
+      if (bundle.containsKey(resultKey)) {
+        setName(bundle.getString(resultKey)!!)
+      }
+    }
+  }
+
+  @Composable
+  override fun SheetContent() {
+    val callLinkDetailsState by callLinkDetailsViewModel.state
+    val callParticipantsState by webRtcCallViewModel.callParticipantsState.observeAsState()
+    val participants = if (callParticipantsState?.callState == WebRtcViewModel.State.CALL_CONNECTED) {
+      listOf(Recipient.self()) + (callParticipantsState?.allRemoteParticipants?.map { it.recipient } ?: emptyList())
+    } else {
+      emptyList()
+    }.toImmutableList()
+
+    val onEditNameClicked: () -> Unit = remember(callLinkDetailsState) {
+      {
+        EditCallLinkNameDialogFragment().apply {
+          arguments = EditCallLinkNameDialogFragmentArgs.Builder(callLinkDetailsState.callLink?.state?.name ?: "").build().toBundle()
+        }.show(parentFragmentManager, null)
+      }
+    }
+
+    val callLink = callLinkDetailsState.callLink
+    if (callLink != null) {
+      Sheet(
+        callLink = callLink,
+        participants = participants,
+        onShareLinkClicked = this::shareLink,
+        onEditNameClicked = onEditNameClicked,
+        onToggleAdminApprovalClicked = this::onApproveAllMembersChanged,
+        onBlock = {} // TODO [alex] -- Blocking
+      )
+    }
+  }
+
+  private fun onApproveAllMembersChanged(checked: Boolean) {
+    callLinkDetailsViewModel.setApproveAllMembers(checked)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy(onSuccess = {
+        if (it !is UpdateCallLinkResult.Success) {
+          Log.w(TAG, "Failed to change restrictions. $it")
+          toastFailure()
+        }
+      }, onError = handleError("onApproveAllMembersChanged"))
+      .addTo(lifecycleDisposable)
+  }
+
+  private fun shareLink() {
+    val mimeType = Intent.normalizeMimeType("text/plain")
+    val shareIntent = ShareCompat.IntentBuilder(requireContext())
+      .setText(CallLinks.url(callLinkDetailsViewModel.rootKeySnapshot))
+      .setType(mimeType)
+      .createChooserIntent()
+
+    try {
+      startActivity(shareIntent)
+    } catch (e: ActivityNotFoundException) {
+      Toast.makeText(requireContext(), R.string.CreateCallLinkBottomSheetDialogFragment__failed_to_open_share_sheet, Toast.LENGTH_LONG).show()
+    }
+  }
+
+  private fun setName(name: String) {
+    callLinkDetailsViewModel.setName(name)
+      .observeOn(AndroidSchedulers.mainThread())
+      .subscribeBy(
+        onSuccess = {
+          if (it !is UpdateCallLinkResult.Success) {
+            Log.w(TAG, "Failed to set name. $it")
+            toastFailure()
+          }
+        },
+        onError = handleError("setName")
+      )
+      .addTo(lifecycleDisposable)
+  }
+
+  private fun handleError(method: String): (throwable: Throwable) -> Unit {
+    return {
+      Log.w(TAG, "Failure during $method", it)
+      toastFailure()
+    }
+  }
+
+  private fun toastFailure() {
+    Toast.makeText(requireContext(), R.string.CallLinkDetailsFragment__couldnt_save_changes, Toast.LENGTH_LONG).show()
+  }
+}
+
+@Preview
+@Composable
+private fun SheetPreview() {
+  SignalTheme(isDarkMode = true) {
+    Surface {
+      Sheet(
+        callLink = CallLinkTable.CallLink(
+          recipientId = RecipientId.UNKNOWN,
+          roomId = CallLinkRoomId.fromBytes(byteArrayOf(1, 2, 3, 4, 5)),
+          credentials = CallLinkCredentials(
+            linkKeyBytes = byteArrayOf(1, 2, 3, 4, 5),
+            adminPassBytes = byteArrayOf(1, 2, 3, 4, 5)
+          ),
+          state = SignalCallLinkState(),
+          avatarColor = AvatarColor.random()
+        ),
+        participants = listOf(Recipient.UNKNOWN).toImmutableList(),
+        onShareLinkClicked = {},
+        onEditNameClicked = {},
+        onToggleAdminApprovalClicked = {},
+        onBlock = {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun Sheet(
+  callLink: CallLinkTable.CallLink,
+  participants: ImmutableList<Recipient>,
+  onShareLinkClicked: () -> Unit,
+  onEditNameClicked: () -> Unit,
+  onToggleAdminApprovalClicked: (Boolean) -> Unit,
+  onBlock: (Recipient) -> Unit
+) {
+  LazyColumn(
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    item {
+      BottomSheets.Handle()
+      SignalCallRow(callLink = callLink, onJoinClicked = null)
+      Rows.TextRow(
+        text = stringResource(id = R.string.CallLinkDetailsFragment__share_link),
+        icon = ImageVector.vectorResource(id = R.drawable.symbol_link_24),
+        iconModifier = Modifier
+          .background(
+            color = MaterialTheme.colorScheme.surfaceVariant,
+            shape = CircleShape
+          )
+          .size(42.dp)
+          .padding(9.dp),
+        modifier = Modifier
+          .defaultMinSize(minHeight = 64.dp)
+          .clickable(onClick = onShareLinkClicked)
+      )
+    }
+
+    items(participants, { it.id }, { null }) {
+      CallLinkMemberRow(
+        recipient = it,
+        isSelfAdmin = callLink.credentials?.adminPassBytes != null,
+        onBlockClicked = onBlock
+      )
+    }
+
+    if (callLink.credentials?.adminPassBytes != null) {
+      item {
+        Dividers.Default()
+        Rows.TextRow(
+          text = stringResource(id = R.string.CallLinkDetailsFragment__add_call_name),
+          modifier = Modifier.clickable(onClick = onEditNameClicked)
+        )
+        Rows.ToggleRow(
+          checked = callLink.state.restrictions == Restrictions.ADMIN_APPROVAL,
+          text = stringResource(id = R.string.CallLinkDetailsFragment__approve_all_members),
+          onCheckChanged = onToggleAdminApprovalClicked
+        )
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+private fun CallLinkMemberRowPreview() {
+  SignalTheme(isDarkMode = true) {
+    Surface {
+      CallLinkMemberRow(
+        Recipient.UNKNOWN,
+        isSelfAdmin = true,
+        {}
+      )
+    }
+  }
+}
+
+@Composable
+private fun CallLinkMemberRow(
+  recipient: Recipient,
+  isSelfAdmin: Boolean,
+  onBlockClicked: (Recipient) -> Unit
+) {
+  Row(
+    modifier = Modifier
+      .fillMaxWidth()
+      .padding(Rows.defaultPadding())
+  ) {
+    AndroidView(
+      factory = ::AvatarImageView,
+      modifier = Modifier.size(40.dp)
+    ) {
+      it.setAvatarUsingProfile(recipient)
+    }
+
+    Spacer(modifier = Modifier.width(24.dp))
+
+    Text(
+      text = recipient.getShortDisplayName(LocalContext.current),
+      modifier = Modifier
+        .weight(1f)
+        .align(Alignment.CenterVertically)
+    )
+
+    if (isSelfAdmin) {
+      Icon(
+        imageVector = ImageVector.vectorResource(id = R.drawable.symbol_minus_circle_24),
+        contentDescription = null,
+        modifier = Modifier
+          .clickable(onClick = { onBlockClicked(recipient) })
+          .align(Alignment.CenterVertically)
+      )
+    }
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcAudioOutputBottomSheet.kt

@@ -30,6 +30,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.ViewModel
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
+import org.signal.core.ui.BottomSheets
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.compose.ComposeBottomSheetDialogFragment
 import org.thoughtcrime.securesms.util.BottomSheetUtil
@@ -49,7 +50,7 @@ class WebRtcAudioOutputBottomSheet : ComposeBottomSheetDialogFragment(), DialogI
         .padding(16.dp)
         .wrapContentSize()
     ) {
-      Handle()
+      BottomSheets.Handle()
       DeviceList(audioOutputOptions = viewModel.audioRoutes.toImmutableList(), initialDeviceId = viewModel.defaultDeviceId, modifier = Modifier.fillMaxWidth(), onDeviceSelected = viewModel.onClick)
     }
   }