Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:09:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix voice note draft not being generated on audio focus loss.

Browse Source
This commit is contained in:
Clark
2023-01-23 17:36:50 -05:00
committed by Greyson Parrelli
parent 150bbf181d
commit 4dcbbfdd63
5 changed files with 93 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,6 @@ import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.graphics.drawable.IconCompat;
import androidx.core.view.MenuItemCompat;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.RecyclerView;
@@ -326,6 +325,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
import io.reactivex.rxjava3.core.Flowable;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.core.SingleObserver;
import io.reactivex.rxjava3.disposables.Disposable;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
@@ -416,6 +417,7 @@ public class ConversationParentFragment extends Fragment
private AttachmentManager attachmentManager;
private AudioRecorder audioRecorder;
private RecordingSession recordingSession;
private BroadcastReceiver securityUpdateReceiver;
private Stub<MediaKeyboard> emojiDrawerStub;
private Stub<AttachmentKeyboard> attachmentKeyboardStub;
@@ -3286,7 +3288,7 @@ public class ConversationParentFragment extends Fragment
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
voiceNoteMediaController.pausePlayback();
audioRecorder.startRecording();
recordingSession = new RecordingSession(audioRecorder.startRecording());
}
@Override
@@ -3306,22 +3308,11 @@ public class ConversationParentFragment extends Fragment
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
ListenableFuture<VoiceNoteDraft> future = audioRecorder.stopRecording();
future.addListener(new ListenableFuture.Listener<VoiceNoteDraft>() {
@Override
public void onSuccess(final @NonNull VoiceNoteDraft result) {
sendVoiceNote(result.getUri(), result.getSize());
}
@Override
public void onFailure(ExecutionException e) {
Toast.makeText(requireContext(), R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_LONG).show();
}
});
recordingSession.completeRecording();
}
@Override
public void onRecorderCanceled() {
public void onRecorderCanceled(boolean byUser) {
voiceRecorderWakeLock.release();
updateToggleButtonState();
Vibrator vibrator = ServiceUtil.getVibrator(requireContext());
@@ -3330,11 +3321,12 @@ public class ConversationParentFragment extends Fragment
requireActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
ListenableFuture<VoiceNoteDraft> future = audioRecorder.stopRecording();
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)) {
future.addListener(new DeleteCanceledVoiceNoteListener());
} else {
draftViewModel.saveEphemeralVoiceNoteDraft(future);
if (recordingSession != null) {
if (byUser) {
recordingSession.discardRecording();
} else {
recordingSession.saveDraft();
}
}
}
@@ -3590,14 +3582,55 @@ public class ConversationParentFragment extends Fragment
// Listeners
private final class DeleteCanceledVoiceNoteListener implements ListenableFuture.Listener<VoiceNoteDraft> {
@Override
public void onSuccess(final VoiceNoteDraft result) {
draftViewModel.cancelEphemeralVoiceNoteDraft(result.asDraft());
private class RecordingSession implements SingleObserver<VoiceNoteDraft> {
private boolean saveDraft = true;
private boolean shouldSend = false;
RecordingSession(Single<VoiceNoteDraft> observable) {
observable.observeOn(AndroidSchedulers.mainThread()).subscribe(this);
}
@Override
public void onFailure(ExecutionException e) {}
public void onSubscribe(@io.reactivex.rxjava3.annotations.NonNull Disposable d) {
}
@Override
public void onSuccess(@NonNull VoiceNoteDraft draft) {
if (shouldSend) {
sendVoiceNote(draft.getUri(), draft.getSize());
} else {
if (!saveDraft) {
draftViewModel.cancelEphemeralVoiceNoteDraft(draft.asDraft());
} else {
draftViewModel.saveEphemeralVoiceNoteDraft(draft.asDraft());
}
}
recordingSession = null;
}
@Override
public void onError(Throwable t) {
Toast.makeText(requireContext(), R.string.ConversationActivity_unable_to_record_audio, Toast.LENGTH_LONG).show();
recordingSession = null;
}
public void saveDraft() {
this.saveDraft = true;
this.shouldSend = false;
audioRecorder.stopRecording();
}
public void discardRecording() {
this.saveDraft = false;
this.shouldSend = false;
audioRecorder.stopRecording();
}
public void completeRecording() {
this.shouldSend = true;
audioRecorder.stopRecording();
}
}
private class QuickCameraToggleListener implements OnClickListener {

19
app/src/main/java/org/thoughtcrime/securesms/conversation/drafts/DraftViewModel.kt
View File

@@ -5,7 +5,6 @@ import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Flowable
import io.reactivex.rxjava3.core.Single
import org.thoughtcrime.securesms.components.location.SignalPlace
import org.thoughtcrime.securesms.components.voice.VoiceNoteDraft
import org.thoughtcrime.securesms.database.DraftTable.Draft
import org.thoughtcrime.securesms.database.MentionUtil
import org.thoughtcrime.securesms.database.model.Mention
@@ -14,9 +13,7 @@ import org.thoughtcrime.securesms.mms.QuoteId
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.recipients.RecipientId
import org.thoughtcrime.securesms.util.Base64
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture
import org.thoughtcrime.securesms.util.rx.RxStore
import java.util.concurrent.ExecutionException
/**
* ViewModel responsible for holding Voice Note draft state. The intention is to allow
@@ -46,21 +43,9 @@ class DraftViewModel @JvmOverloads constructor(
store.update { it.copy(distributionType = distributionType) }
}
fun saveEphemeralVoiceNoteDraft(voiceNoteDraftFuture: ListenableFuture<VoiceNoteDraft>) {
fun saveEphemeralVoiceNoteDraft(draft: Draft) {
store.update { draftState ->
val draft: VoiceNoteDraft? = try {
voiceNoteDraftFuture.get()
} catch (e: ExecutionException) {
null
} catch (e: InterruptedException) {
null
}
if (draft != null) {
saveDrafts(draftState.copy(voiceNoteDraft = draft.asDraft()))
} else {
draftState
}
saveDrafts(draftState.copy(voiceNoteDraft = draft))
}
}