From e8cf64bca8b72308ac6e8e0ca676989c6e9be0cf Mon Sep 17 00:00:00 2001 From: Sagar Date: Wed, 8 Jan 2025 11:07:23 +0530 Subject: [PATCH] Remove redundant call link callback. Resolves #13886 --- .../CreateCallLinkBottomSheetDialogFragment.kt | 13 ------------- .../calls/links/create/CreateCallLinkViewModel.kt | 5 ----- 2 files changed, 18 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt index 438e179bda..ac3c8a242d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt @@ -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 ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkViewModel.kt index b7e98f9698..87f382e833 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkViewModel.kt @@ -99,11 +99,6 @@ class CreateCallLinkViewModel( } } - fun toggleApproveAllMembers(): Single { - return setApproveAllMembers(_callLink.value.state.restrictions != Restrictions.ADMIN_APPROVAL) - .observeOn(AndroidSchedulers.mainThread()) - } - fun setCallName(callName: String): Single { return commitCallLink() .flatMap {