Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +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

76
app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java
View File

@@ -40,8 +40,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
/**
@@ -329,32 +329,22 @@ public class BlobProvider {
{
waitUntilInitialized();
CountDownLatch latch = new CountDownLatch(1);
AtomicReference<IOException> exception = new AtomicReference<>(null);
Uri uri = writeBlobSpecToDiskAsync(context, blobSpec, latch::countDown, e -> {
exception.set(e);
latch.countDown();
});
Future<Uri> uriFuture = writeBlobSpecToDiskAsync(context, blobSpec);
try {
latch.await();
} catch (InterruptedException e) {
throw new IOException(e);
return uriFuture.get();
} catch (ExecutionException | InterruptedException e) {
Log.e(TAG, "Error writing blob spec to disk", e);
if (e.getCause() instanceof IOException) {
throw (IOException) e.getCause();
} else {
throw new IOException(e);
}
}
if (exception.get() != null) {
throw exception.get();
}
return uri;
}
@WorkerThread
private synchronized @NonNull Uri writeBlobSpecToDiskAsync(@NonNull Context context,
@NonNull BlobSpec blobSpec,
@Nullable SuccessListener successListener,
@Nullable ErrorListener errorListener)
private synchronized @NonNull Future<Uri> writeBlobSpecToDiskAsync(@NonNull Context context, @NonNull BlobSpec blobSpec)
throws IOException
{
AttachmentSecret attachmentSecret = AttachmentSecretProvider.getInstance(context).getOrCreateAttachmentSecret();
@@ -362,22 +352,18 @@ public class BlobProvider {
File outputFile = new File(getOrCreateDirectory(context, directory), buildFileName(blobSpec.id));
OutputStream outputStream = ModernEncryptingPartOutputStream.createFor(attachmentSecret, outputFile, true).second;
SignalExecutors.UNBOUNDED.execute(() -> {
final Uri uri = buildUri(blobSpec);
return SignalExecutors.BOUNDED.submit(() -> {
try {
StreamUtil.copy(blobSpec.getData(), outputStream);
if (successListener != null) {
successListener.onSuccess();
}
return uri;
} catch (IOException e) {
delete(context, uri);
Log.w(TAG, "Error during write!", e);
if (errorListener != null) {
errorListener.onError(e);
}
throw e;
}
});
return buildUri(blobSpec);
}
private synchronized @NonNull Uri writeBlobSpecToMemory(@NonNull BlobSpec blobSpec, @NonNull byte[] data) {
@@ -470,18 +456,14 @@ public class BlobProvider {
}
/**
* Create a blob that will exist for a single app session. An app session is defined as the
* Create an async blob that will exist for a single app session. An app session is defined as the
* period from one {@link Application#onCreate()} to the next. The file will be created on disk
* synchronously, but the data will copied asynchronously. This is helpful when the copy is
* long-running, such as in the case of recording a voice note.
*/
@WorkerThread
public Uri createForSingleSessionOnDiskAsync(@NonNull Context context,
@Nullable SuccessListener successListener,
@Nullable ErrorListener errorListener)
throws IOException
{
return writeBlobSpecToDiskAsync(context, buildBlobSpec(StorageType.SINGLE_SESSION_DISK), successListener, errorListener);
public Future<Uri> createForSingleSessionOnDiskAsync(@NonNull Context context) throws IOException {
return writeBlobSpecToDiskAsync(context, buildBlobSpec(StorageType.SINGLE_SESSION_DISK));
}
/**
@@ -502,12 +484,10 @@ public class BlobProvider {
* when the blob is no longer in use.
*/
@WorkerThread
public Uri createForDraftAttachmentAsync(@NonNull Context context,
@Nullable SuccessListener successListener,
@Nullable ErrorListener errorListener)
public Future<Uri> createForDraftAttachmentAsync(@NonNull Context context)
throws IOException
{
return writeBlobSpecToDiskAsync(context, buildBlobSpec(StorageType.ATTACHMENT_DRAFT), successListener, errorListener);
return writeBlobSpecToDiskAsync(context, buildBlobSpec(StorageType.ATTACHMENT_DRAFT));
}
}
@@ -562,16 +542,6 @@ public class BlobProvider {
}
}
public interface SuccessListener {
@WorkerThread
void onSuccess();
}
public interface ErrorListener {
@WorkerThread
void onError(IOException e);
}
private static class BlobSpec {
private final InputStream data;