mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-23 04:28:35 +00:00
@@ -10,7 +10,6 @@ import android.content.Intent
|
||||
import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
@@ -97,7 +96,6 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
|
||||
onJoinClicked = this@CreateCallLinkBottomSheetDialogFragment::onJoinClicked,
|
||||
onAddACallNameClicked = this@CreateCallLinkBottomSheetDialogFragment::onAddACallNameClicked,
|
||||
onApproveAllMembersChanged = this@CreateCallLinkBottomSheetDialogFragment::setApproveAllMembers,
|
||||
onToggleApproveAllMembersClicked = this@CreateCallLinkBottomSheetDialogFragment::toggleApproveAllMembers,
|
||||
onShareViaSignalClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareViaSignalClicked,
|
||||
onCopyLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onCopyLinkClicked,
|
||||
onShareLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareLinkClicked,
|
||||
@@ -125,15 +123,6 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
|
||||
}, onError = this::handleError)
|
||||
}
|
||||
|
||||
private fun toggleApproveAllMembers() {
|
||||
lifecycleDisposable += viewModel.toggleApproveAllMembers().subscribeBy(onSuccess = {
|
||||
if (it !is UpdateCallLinkResult.Update) {
|
||||
Log.w(TAG, "Failed to update call link restrictions")
|
||||
toastFailure()
|
||||
}
|
||||
}, onError = this::handleError)
|
||||
}
|
||||
|
||||
private fun onAddACallNameClicked() {
|
||||
val snapshot = viewModel.callLink.value
|
||||
findNavController().navigate(
|
||||
@@ -243,7 +232,6 @@ private fun CreateCallLinkBottomSheetContent(
|
||||
onJoinClicked: () -> Unit = {},
|
||||
onAddACallNameClicked: () -> Unit = {},
|
||||
onApproveAllMembersChanged: (Boolean) -> Unit = {},
|
||||
onToggleApproveAllMembersClicked: () -> Unit = {},
|
||||
onShareViaSignalClicked: () -> Unit = {},
|
||||
onCopyLinkClicked: () -> Unit = {},
|
||||
onShareLinkClicked: () -> Unit = {},
|
||||
@@ -292,7 +280,6 @@ private fun CreateCallLinkBottomSheetContent(
|
||||
checked = callLink.state.restrictions == CallLinkState.Restrictions.ADMIN_APPROVAL,
|
||||
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__require_admin_approval),
|
||||
onCheckChanged = onApproveAllMembersChanged,
|
||||
modifier = Modifier.clickable(onClick = onToggleApproveAllMembersClicked),
|
||||
isLoading = isLoadingAdminApprovalChange
|
||||
)
|
||||
|
||||
|
||||
@@ -99,11 +99,6 @@ class CreateCallLinkViewModel(
|
||||
}
|
||||
}
|
||||
|
||||
fun toggleApproveAllMembers(): Single<UpdateCallLinkResult> {
|
||||
return setApproveAllMembers(_callLink.value.state.restrictions != Restrictions.ADMIN_APPROVAL)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
}
|
||||
|
||||
fun setCallName(callName: String): Single<UpdateCallLinkResult> {
|
||||
return commitCallLink()
|
||||
.flatMap {
|
||||
|
||||
Reference in New Issue
Block a user