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

Fix multidevice contact sync update job reporting wrong content length.

Browse Source
This commit is contained in:
Clark
2023-04-14 09:14:35 -04:00
committed by Cody Henthorne
parent 09cf8074aa
commit e7f8d36199
6 changed files with 106 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java
View File

@@ -17,7 +17,9 @@ import org.thoughtcrime.securesms.providers.BlobProvider;
import org.thoughtcrime.securesms.util.MediaUtil;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import io.reactivex.rxjava3.core.Single;
import io.reactivex.rxjava3.subjects.SingleSubject;
@@ -32,8 +34,8 @@ public class AudioRecorder {
private final AudioRecordingHandler uiHandler;
private final AudioRecorderFocusManager audioFocusManager;
private Recorder recorder;
private Uri captureUri;
private Recorder recorder;
private Future<Uri> recordingUriFuture;
private SingleSubject<VoiceNoteDraft> recordingSubject;
@@ -75,11 +77,12 @@ public class AudioRecorder {
ParcelFileDescriptor fds[] = ParcelFileDescriptor.createPipe();
captureUri = BlobProvider.getInstance()
.forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
.withMimeType(MediaUtil.AUDIO_AAC)
.createForDraftAttachmentAsync(context, () -> Log.i(TAG, "Write successful."), e -> Log.w(TAG, "Error during recording", e));
recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
recordingUriFuture = BlobProvider.getInstance()
.forData(new ParcelFileDescriptor.AutoCloseInputStream(fds[0]), 0)
.withMimeType(MediaUtil.AUDIO_AAC)
.createForDraftAttachmentAsync(context);
recorder = Build.VERSION.SDK_INT >= 26 ? new MediaRecorderWrapper() : new AudioCodec();
int focusResult = audioFocusManager.requestAudioFocus();
if (focusResult != AudioManager.AUDIOFOCUS_REQUEST_GRANTED) {
Log.w(TAG, "Could not gain audio focus. Received result code " + focusResult);
@@ -109,16 +112,17 @@ public class AudioRecorder {
recorder.stop();
try {
long size = MediaUtil.getMediaSize(context, captureUri);
recordingSubject.onSuccess(new VoiceNoteDraft(captureUri, size));
} catch (IOException ioe) {
Uri uri = recordingUriFuture.get();
long size = MediaUtil.getMediaSize(context, uri);
recordingSubject.onSuccess(new VoiceNoteDraft(uri, size));
} catch (IOException | ExecutionException | InterruptedException ioe) {
Log.w(TAG, ioe);
recordingSubject.onError(ioe);
}
recordingSubject = null;
recorder = null;
captureUri = null;
recordingSubject = null;
recorder = null;
recordingUriFuture = null;
});
}
}

9
app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java
View File

@@ -4,6 +4,7 @@ import android.media.MediaRecorder;
import android.os.Build;
import android.os.ParcelFileDescriptor;
import org.signal.core.util.StreamUtil;
import org.signal.core.util.logging.Log;
import java.io.IOException;
@@ -20,10 +21,14 @@ public class MediaRecorderWrapper implements Recorder {
private static final int BIT_RATE = 32000;
private MediaRecorder recorder = null;
private ParcelFileDescriptor outputFileDescriptor;
@Override
public void start(ParcelFileDescriptor fileDescriptor) throws IOException {
Log.i(TAG, "Recording voice note using MediaRecorderWrapper.");
this.outputFileDescriptor = fileDescriptor;
recorder = new MediaRecorder();
try {
@@ -40,6 +45,8 @@ public class MediaRecorderWrapper implements Recorder {
Log.w(TAG, "Unable to start recording", e);
recorder.release();
recorder = null;
StreamUtil.close(outputFileDescriptor);
outputFileDescriptor = null;
throw new IOException(e);
}
}
@@ -61,6 +68,8 @@ public class MediaRecorderWrapper implements Recorder {
} finally {
recorder.release();
recorder = null;
StreamUtil.close(outputFileDescriptor);
outputFileDescriptor = null;
}
}