empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Remove redundant call link callback.

Browse source 
Resolves #13886
This commit is contained in:
Sagar 2025-01-08 11:07:23 +05:30 • committed by Greyson Parrelli
parent 7fafa7f9fd
commit e8cf64bca8
2 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkBottomSheetDialogFragment.kt
View file

@ -10,7 +10,6 @@ import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.view.View import android.view.View
import android.widget.Toast import android.widget.Toast
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
@ -97,7 +96,6 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
onJoinClicked = this@CreateCallLinkBottomSheetDialogFragment::onJoinClicked, onJoinClicked = this@CreateCallLinkBottomSheetDialogFragment::onJoinClicked,
onAddACallNameClicked = this@CreateCallLinkBottomSheetDialogFragment::onAddACallNameClicked, onAddACallNameClicked = this@CreateCallLinkBottomSheetDialogFragment::onAddACallNameClicked,
onApproveAllMembersChanged = this@CreateCallLinkBottomSheetDialogFragment::setApproveAllMembers, onApproveAllMembersChanged = this@CreateCallLinkBottomSheetDialogFragment::setApproveAllMembers,
onToggleApproveAllMembersClicked = this@CreateCallLinkBottomSheetDialogFragment::toggleApproveAllMembers,
onShareViaSignalClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareViaSignalClicked, onShareViaSignalClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareViaSignalClicked,
onCopyLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onCopyLinkClicked, onCopyLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onCopyLinkClicked,
onShareLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareLinkClicked, onShareLinkClicked = this@CreateCallLinkBottomSheetDialogFragment::onShareLinkClicked,
@ -125,15 +123,6 @@ class CreateCallLinkBottomSheetDialogFragment : ComposeBottomSheetDialogFragment
}, onError = this::handleError) }, 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() { private fun onAddACallNameClicked() {
val snapshot = viewModel.callLink.value val snapshot = viewModel.callLink.value
findNavController().navigate( findNavController().navigate(
@ -243,7 +232,6 @@ private fun CreateCallLinkBottomSheetContent(
onJoinClicked: () -> Unit = {}, onJoinClicked: () -> Unit = {},
onAddACallNameClicked: () -> Unit = {}, onAddACallNameClicked: () -> Unit = {},
onApproveAllMembersChanged: (Boolean) -> Unit = {}, onApproveAllMembersChanged: (Boolean) -> Unit = {},
onToggleApproveAllMembersClicked: () -> Unit = {},
onShareViaSignalClicked: () -> Unit = {}, onShareViaSignalClicked: () -> Unit = {},
onCopyLinkClicked: () -> Unit = {}, onCopyLinkClicked: () -> Unit = {},
onShareLinkClicked: () -> Unit = {}, onShareLinkClicked: () -> Unit = {},
@ -292,7 +280,6 @@ private fun CreateCallLinkBottomSheetContent(
checked = callLink.state.restrictions == CallLinkState.Restrictions.ADMIN_APPROVAL, checked = callLink.state.restrictions == CallLinkState.Restrictions.ADMIN_APPROVAL,
text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__require_admin_approval), text = stringResource(id = R.string.CreateCallLinkBottomSheetDialogFragment__require_admin_approval),
onCheckChanged = onApproveAllMembersChanged, onCheckChanged = onApproveAllMembersChanged,
modifier = Modifier.clickable(onClick = onToggleApproveAllMembersClicked),
isLoading = isLoadingAdminApprovalChange isLoading = isLoadingAdminApprovalChange
) )

5
app/src/main/java/org/thoughtcrime/securesms/calls/links/create/CreateCallLinkViewModel.kt
View file

@ -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> { fun setCallName(callName: String): Single<UpdateCallLinkResult> {
return commitCallLink() return commitCallLink()
.flatMap { .flatMap {