Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 19:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disconnect groupCall object when network is unavailable.

Browse Source
This commit is contained in:
Alex Hart
2025-05-13 16:47:46 -03:00
committed by Michelle Tang
parent 7e00739240
commit 7c43462771
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationFragment.kt
View File

@@ -48,7 +48,6 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.view.ActionMode
import androidx.appcompat.widget.SearchView
import androidx.appcompat.widget.Toolbar
import androidx.core.app.ActivityCompat
import androidx.core.app.ActivityOptionsCompat
import androidx.core.content.ContextCompat
import androidx.core.content.pm.ShortcutManagerCompat
@@ -2875,7 +2874,7 @@ class ConversationFragment :
val activity = activity ?: return
ViewCompat.setTransitionName(avatarTransitionView, "avatar")
val bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, avatarTransitionView, "avatar").toBundle()
ActivityCompat.startActivity(activity, SharedContactDetailsActivity.getIntent(activity, contact), bundle)
activity.startActivity(SharedContactDetailsActivity.getIntent(activity, contact), bundle)
}
override fun onAddToContactsClicked(contact: Contact) {
@@ -3556,7 +3555,7 @@ class ConversationFragment :
binding.toolbar
)
ActivityCompat.startActivity(requireContext(), intent, bundle)
requireActivity().startActivity(intent, bundle)
}
override fun handleLeavePushGroup() {
@@ -3607,7 +3606,7 @@ class ConversationFragment :
binding.toolbar
)
ActivityCompat.startActivity(requireActivity(), intent, bundle)
requireActivity().startActivity(intent, bundle)
}
override fun handleSelectMessageExpiration() {

8
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupNetworkUnavailableActionProcessor.java
View File

@@ -7,6 +7,7 @@ import android.net.NetworkInfo;
import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log;
import org.signal.ringrtc.CallException;
import org.signal.ringrtc.GroupCall;
import org.thoughtcrime.securesms.components.webrtc.EglBaseWrapper;
import org.thoughtcrime.securesms.events.WebRtcViewModel;
@@ -71,6 +72,13 @@ public class GroupNetworkUnavailableActionProcessor extends WebRtcActionProcesso
protected @NonNull WebRtcServiceState handleCancelPreJoinCall(@NonNull WebRtcServiceState currentState) {
Log.i(TAG, "handleCancelPreJoinCall():");
GroupCall groupCall = currentState.getCallInfoState().requireGroupCall();
try {
groupCall.disconnect();
} catch (CallException e) {
return groupCallFailure(currentState, "Unable to disconnect from group call", e);
}
WebRtcVideoUtil.deinitializeVideo(currentState);
EglBaseWrapper.releaseEglBase(RemotePeer.GROUP_CALL_ID.longValue());