Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-08 09:18:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Display proper error when call link deletion fails due to call link being in use.

Browse Source
This commit is contained in:
Alex Hart
2024-11-18 13:01:35 -04:00
committed by Greyson Parrelli
parent a9c37a9668
commit 5f67bd9725
4 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/calls/links/details/CallLinkDetailsFragment.kt
+9 -1
View File
@@ -148,8 +148,12 @@ class CallLinkDetailsFragment : ComposeFragment(), CallLinkDetailsCallback {
lifecycleDisposable += viewModel.delete().observeOn(AndroidSchedulers.mainThread()).subscribeBy(onSuccess = {
when (it) {
is UpdateCallLinkResult.Delete -> ActivityCompat.finishAfterTransition(requireActivity())
is UpdateCallLinkResult.CallLinkIsInUse -> {
Log.w(TAG, "Failed to delete in-use call link.")
toastCouldNotDeleteCallLink()
}
else -> {
Log.w(TAG, "Failed to revoke. $it")
Log.w(TAG, "Failed to delete call link. $it")
toastFailure()
}
}
@@ -188,6 +192,10 @@ class CallLinkDetailsFragment : ComposeFragment(), CallLinkDetailsCallback {
private fun toastFailure() {
Toast.makeText(requireContext(), R.string.CallLinkDetailsFragment__couldnt_save_changes, Toast.LENGTH_LONG).show()
}
private fun toastCouldNotDeleteCallLink() {
Toast.makeText(requireContext(), R.string.CallLinkDetailsFragment__couldnt_delete_call_link, Toast.LENGTH_LONG).show()
}
}
private interface CallLinkDetailsCallback {
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/SignalCallLinkManager.kt
+4 -1
View File
@@ -226,7 +226,10 @@ class SignalCallLinkManager(
if (result.isSuccess && result.value == true) {
emitter.onSuccess(UpdateCallLinkResult.Delete(credentials.roomId))
} else {
emitter.onSuccess(UpdateCallLinkResult.Failure(result.status))
when (result.status) {
409.toShort() -> emitter.onSuccess(UpdateCallLinkResult.CallLinkIsInUse)
else -> emitter.onSuccess(UpdateCallLinkResult.Failure(result.status))
}
}
}
}
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/links/UpdateCallLinkResult.kt
+7 -1
View File
@@ -21,5 +21,11 @@ sealed interface UpdateCallLinkResult {
val status: Short
) : UpdateCallLinkResult
object NotAuthorized : UpdateCallLinkResult
/**
* Occurs when a user tries to delete a call link that
* the call server believes is currently being utilized.
*/
data object CallLinkIsInUse : UpdateCallLinkResult
data object NotAuthorized : UpdateCallLinkResult
}
app/src/main/res/values/strings.xml
+2
View File
@@ -7209,6 +7209,8 @@
<string name="CallLinkDetailsFragment__delete_call_link">Delete call link</string>
<!-- Displayed whenever a name change, revocation, etc, fails. -->
<string name="CallLinkDetailsFragment__couldnt_save_changes">Couldn\'t save changes. Check your network connection and try again.</string>
<!-- Displayed when the call link is in use when the user tries to delete it -->
<string name="CallLinkDetailsFragment__couldnt_delete_call_link">Couldn\'t delete call link as it is currently in use.</string>
<!-- Displayed as title in dialog when user attempts to delete the link -->
<string name="CallLinkDetailsFragment__delete_link">Delete link?</string>
<!-- Displayed as body in dialog when user attempts to delete the link -->