TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-30 22:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug of video showing on next call after cancel pre-join.

Browse Source 
Fixes #10083
This commit is contained in:
Cody Henthorne 2020-10-13 14:53:12 -04:00 committed by Greyson Parrelli
parent babe1833bb
commit 322c139c26
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
View File

@ -506,7 +506,10 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
private void handleCancelPreJoinCall() { private void handleCancelPreJoinCall() {
cleanupVideo(); cleanupVideo();
enableVideoOnCreate = false;
preJoinPeer = null; preJoinPeer = null;
EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
} }
private void handleOutgoingCall(Intent intent) { private void handleOutgoingCall(Intent intent) {

11
app/src/main/res/layout/webrtc_call_view_toolbar.xml
View File

@ -3,10 +3,11 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
app:contentInsetStart="0dp">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"> android:layout_gravity="center_horizontal">
@ -19,8 +20,9 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/call_screen_recipient_name" android:id="@+id/call_screen_recipient_name"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.Signal.Body1.Bold" android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
android:textColor="@color/core_white" android:textColor="@color/core_white"
app:layout_constraintBottom_toTopOf="@id/action_bar_guideline" app:layout_constraintBottom_toTopOf="@id/action_bar_guideline"
@ -31,8 +33,9 @@
<TextView <TextView
android:id="@+id/call_screen_status" android:id="@+id/call_screen_status"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:textAppearance="@style/TextAppearance.Signal.Subtitle" android:textAppearance="@style/TextAppearance.Signal.Subtitle"
android:textColor="@color/core_white" android:textColor="@color/core_white"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"