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

Fix crash with reused destroyed context.

Browse Source
This commit is contained in:
Alex Hart
2024-07-19 14:11:22 -03:00
committed by Greyson Parrelli
parent e17cf37799
commit b70b058925
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
View File

@@ -491,6 +491,8 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
}
return state.getLocalParticipant().isHandRaised();
});
getLifecycle().addObserver(participantUpdateWindow);
}
private @NonNull Orientation resolveOrientationFromContext() {

19
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
View File

@@ -2,6 +2,8 @@ package org.thoughtcrime.securesms.components.webrtc;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -13,6 +15,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.PluralsRes;
import androidx.annotation.StringRes;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.badges.BadgeImageView;
@@ -24,14 +28,15 @@ import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.TimeUnit;
public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
public class CallParticipantsListUpdatePopupWindow extends PopupWindow implements DefaultLifecycleObserver {
private static final long DURATION = TimeUnit.SECONDS.toMillis(2);
private static final long DURATION = TimeUnit.SECONDS.toMillis(10);
private final ViewGroup parent;
private final AvatarImageView avatarImageView;
private final BadgeImageView badgeImageView;
private final TextView descriptionTextView;
private final Handler handler;
private final Set<CallParticipantListUpdate.Wrapper> pendingAdditions = new HashSet<>();
private final Set<CallParticipantListUpdate.Wrapper> pendingRemovals = new HashSet<>();
@@ -47,6 +52,7 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
this.avatarImageView = getContentView().findViewById(R.id.avatar);
this.badgeImageView = getContentView().findViewById(R.id.badge);
this.descriptionTextView = getContentView().findViewById(R.id.description);
this.handler = new Handler(Looper.getMainLooper());
setOnDismissListener(this::showPending);
setAnimationStyle(R.style.PopupAnimation);
@@ -72,6 +78,13 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
}
}
@Override
public void onDestroy(@NonNull LifecycleOwner owner) {
handler.removeCallbacksAndMessages(null);
setOnDismissListener(null);
dismiss();
}
private void showPending() {
if (!pendingAdditions.isEmpty()) {
showAdditions();
@@ -102,7 +115,7 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow {
showAtLocation(parent, Gravity.TOP | Gravity.START, 0, 0);
measureChild();
update();
getContentView().postDelayed(this::dismiss, DURATION);
handler.postDelayed(this::dismiss, DURATION);
}
private void measureChild() {