Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 20:48:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent NPE when finishing voice memo recording.

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-05-23 09:26:42 -04:00
committed by Nicholas
parent 0cfd3265ba
commit 5362b1c21c
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
View File

@@ -3334,11 +3334,16 @@ public class ConversationParentFragment extends Fragment
bluetoothVoiceNoteUtil.disconnectBluetoothScoConnection(); bluetoothVoiceNoteUtil.disconnectBluetoothScoConnection();
voiceRecorderWakeLock.release(); voiceRecorderWakeLock.release();
updateToggleButtonState(); updateToggleButtonState();
Vibrator vibrator = ServiceUtil.getVibrator(requireContext());
vibrator.vibrate(20);
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); Activity activity = getActivity();
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); if (activity != null) {
Vibrator vibrator = ServiceUtil.getVibrator(activity);
vibrator.vibrate(20);
activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
if (recordingSession != null) { if (recordingSession != null) {
recordingSession.completeRecording(); recordingSession.completeRecording();
} }
@@ -3348,11 +3353,15 @@ public class ConversationParentFragment extends Fragment
public void onRecorderCanceled(boolean byUser) { public void onRecorderCanceled(boolean byUser) {
voiceRecorderWakeLock.release(); voiceRecorderWakeLock.release();
updateToggleButtonState(); updateToggleButtonState();
Vibrator vibrator = ServiceUtil.getVibrator(requireContext());
vibrator.vibrate(50);
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); Activity activity = getActivity();
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); if (activity != null) {
Vibrator vibrator = ServiceUtil.getVibrator(activity);
vibrator.vibrate(50);
activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
}
if (recordingSession != null) { if (recordingSession != null) {
if (byUser) { if (byUser) {