Skip to content

Commit 4c0a98d

Browse files
alex-signalcody-signal
authored andcommitted
Add nullability check to video capture callback.
Fixes signalapp#12666
1 parent 10f78d5 commit 4c0a98d

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.animation.Animator;
44
import android.annotation.SuppressLint;
5+
import android.app.Activity;
56
import android.content.Context;
67
import android.content.pm.ActivityInfo;
78
import android.content.res.Configuration;
@@ -448,13 +449,17 @@ private void showAndEnableControlsAfterVideoRecording(@NonNull View captureButto
448449
@NonNull View flipButton,
449450
@NonNull Animation inAnimation)
450451
{
451-
requireActivity().runOnUiThread(() -> {
452-
captureButton.setEnabled(true);
453-
flashButton.startAnimation(inAnimation);
454-
flashButton.setVisibility(View.VISIBLE);
455-
flipButton.startAnimation(inAnimation);
456-
flipButton.setVisibility(View.VISIBLE);
457-
});
452+
Activity activity = getActivity();
453+
454+
if (activity != null) {
455+
activity.runOnUiThread(() -> {
456+
captureButton.setEnabled(true);
457+
flashButton.startAnimation(inAnimation);
458+
flashButton.setVisibility(View.VISIBLE);
459+
flipButton.startAnimation(inAnimation);
460+
flipButton.setVisibility(View.VISIBLE);
461+
});
462+
}
458463
}
459464

460465
private void onCaptureClicked() {

0 commit comments

Comments
 (0)