Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Centralize attachment loading in AttachmentReader

Browse Source 
This is needed so Glide can load attachments from the DB by using the same AttachmentHeader class.
This commit is contained in:
Torsten Grote
2020-11-24 10:30:53 -03:00
parent cf8f5c989f
commit d0d2e0ed82
5 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcher.java
View File

@@ -4,12 +4,13 @@ import com.bumptech.glide.Priority;
import com.bumptech.glide.load.DataSource;
import com.bumptech.glide.load.data.DataFetcher;
import org.briarproject.bramble.api.client.ClientHelper;
import org.briarproject.bramble.api.db.DatabaseExecutor;
import org.briarproject.bramble.api.db.DbException;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.android.attachment.AttachmentItem;
import org.briarproject.briar.api.media.Attachment;
import org.briarproject.briar.api.messaging.MessagingManager;
import org.briarproject.briar.media.AttachmentReader;
import java.io.InputStream;
import java.util.concurrent.Executor;
@@ -30,7 +31,7 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
private final static Logger LOG =
getLogger(BriarDataFetcher.class.getName());
private final MessagingManager messagingManager;
private final ClientHelper clientHelper;
@DatabaseExecutor
private final Executor dbExecutor;
private final AttachmentItem attachment;
@@ -40,9 +41,9 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
private volatile boolean cancel = false;
@Inject
BriarDataFetcher(MessagingManager messagingManager,
BriarDataFetcher(ClientHelper clientHelper,
@DatabaseExecutor Executor dbExecutor, AttachmentItem attachment) {
this.messagingManager = messagingManager;
this.clientHelper = clientHelper;
this.dbExecutor = dbExecutor;
this.attachment = attachment;
}
@@ -53,8 +54,8 @@ class BriarDataFetcher implements DataFetcher<InputStream> {
dbExecutor.execute(() -> {
if (cancel) return;
try {
Attachment a =
messagingManager.getAttachment(attachment.getHeader());
Attachment a = AttachmentReader
.getAttachment(clientHelper, attachment.getHeader());
inputStream = a.getStream();
callback.onDataReady(inputStream);
} catch (DbException e) {

10
briar-android/src/main/java/org/briarproject/briar/android/conversation/glide/BriarDataFetcherFactory.java
View File

@@ -1,9 +1,9 @@
package org.briarproject.briar.android.conversation.glide;
import org.briarproject.bramble.api.client.ClientHelper;
import org.briarproject.bramble.api.db.DatabaseExecutor;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import org.briarproject.briar.android.attachment.AttachmentItem;
import org.briarproject.briar.api.messaging.MessagingManager;
import java.util.concurrent.Executor;
@@ -12,19 +12,19 @@ import javax.inject.Inject;
@NotNullByDefault
public class BriarDataFetcherFactory {
private final MessagingManager messagingManager;
private final ClientHelper clientHelper;
@DatabaseExecutor
private final Executor dbExecutor;
@Inject
public BriarDataFetcherFactory(MessagingManager messagingManager,
public BriarDataFetcherFactory(ClientHelper clientHelper,
@DatabaseExecutor Executor dbExecutor) {
this.messagingManager = messagingManager;
this.clientHelper = clientHelper;
this.dbExecutor = dbExecutor;
}
BriarDataFetcher createBriarDataFetcher(AttachmentItem model) {
return new BriarDataFetcher(messagingManager, dbExecutor, model);
return new BriarDataFetcher(clientHelper, dbExecutor, model);
}
}