TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement link previews for regular conversations

Browse Source
This commit is contained in:
Niels Andriesse 2019-09-09 13:53:23 +10:00
parent 387f99cd94
commit 1d5a31aae4
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
View File

@ -58,14 +58,15 @@ import org.thoughtcrime.securesms.database.StickerDatabase;
import org.thoughtcrime.securesms.database.ThreadDatabase;
import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.database.model.StickerRecord;
import org.thoughtcrime.securesms.dependencies.InjectableType;
import org.thoughtcrime.securesms.groups.GroupMessageProcessor;
import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.linkpreview.Link;
import org.thoughtcrime.securesms.linkpreview.LinkPreview;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.loki.LokiMessageDatabase;
@ -96,6 +97,7 @@ import org.thoughtcrime.securesms.util.Hex;
import org.thoughtcrime.securesms.util.IdentityUtil;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.state.PreKeyBundle;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.util.guava.Optional;
@ -121,6 +123,7 @@ import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOper
import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
import org.whispersystems.signalservice.api.messages.shared.SharedContact;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.internal.util.concurrent.SettableFuture;
import org.whispersystems.signalservice.loki.crypto.LokiServiceCipher;
import org.whispersystems.signalservice.loki.messaging.LokiMessageFriendRequestStatus;
import org.whispersystems.signalservice.loki.messaging.LokiServiceMessage;
@ -136,6 +139,7 @@ import java.util.List;
import javax.inject.Inject;
import kotlin.Unit;
import network.loki.messenger.R;
public class PushDecryptJob extends BaseJob implements InjectableType {
@ -760,6 +764,35 @@ public class PushDecryptJob extends BaseJob implements InjectableType {
linkPreviews,
sticker);
if (linkPreviews.isPresent()) {
int linkPreviewCount = linkPreviews.get().size();
if (linkPreviewCount != 0) {
final SettableFuture<?>[] future = { new SettableFuture<Unit>() };
LinkPreviewRepository lpr = new LinkPreviewRepository(context);
final int[] count = { 0 };
for (LinkPreview linkPreview : linkPreviews.get()) {
lpr.getLinkPreview(context, linkPreview.getUrl(), lp -> Util.runOnMain(() -> {
int c = count[0];
c = c + 1;
count[0] = c;
if (lp.isPresent() && lp.get().getThumbnail().isPresent()) {
Attachment thumbnail = lp.get().getThumbnail().get();
linkPreview.thumbnail = Optional.of(thumbnail);
}
if (c == linkPreviewCount) {
@SuppressWarnings("unchecked") SettableFuture<Unit> f = (SettableFuture<Unit>) future[0];
f.set(Unit.INSTANCE);
}
}));
}
@SuppressWarnings("unchecked") SettableFuture<Unit> f = (SettableFuture<Unit>) future[0];
try {
f.get();
} catch (Exception e) {
// Do nothing
}
}
}
insertResult = database.insertSecureDecryptedMessageInbox(mediaMessage, -1);

2
src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
View File

@ -77,7 +77,7 @@ public class PushMediaSendJob extends PushSendJob implements InjectableType {
List<Attachment> attachments = new LinkedList<>();
attachments.addAll(message.getAttachments());
attachments.addAll(Stream.of(message.getLinkPreviews()).filter(p -> p.getThumbnail().isPresent()).map(p -> p.getThumbnail().get()).toList());
// attachments.addAll(Stream.of(message.getLinkPreviews()).filter(p -> p.getThumbnail().isPresent()).map(p -> p.getThumbnail().get()).toList());
attachments.addAll(Stream.of(message.getSharedContacts()).filter(c -> c.getAvatar() != null).map(c -> c.getAvatar().getAttachment()).withoutNulls().toList());
List<AttachmentUploadJob> attachmentJobs = Stream.of(attachments).map(a -> new AttachmentUploadJob(((DatabaseAttachment) a).getAttachmentId())).toList();

2
src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
View File

@ -26,7 +26,7 @@ public class LinkPreview {
private final AttachmentId attachmentId;
@JsonIgnore
private final Optional<Attachment> thumbnail;
public Optional<Attachment> thumbnail;
public LinkPreview(@NonNull String url, @NonNull String title, @NonNull DatabaseAttachment thumbnail) {
this.url = url;

4
src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
View File

@ -71,7 +71,7 @@ public class LinkPreviewRepository implements InjectableType {
ApplicationContext.getInstance(context).injectDependencies(this);
}
RequestController getLinkPreview(@NonNull Context context, @NonNull String url, @NonNull Callback<Optional<LinkPreview>> callback) {
public RequestController getLinkPreview(@NonNull Context context, @NonNull String url, @NonNull Callback<Optional<LinkPreview>> callback) {
CompositeRequestController compositeController = new CompositeRequestController();
if (!LinkPreviewUtil.isWhitelistedLinkUrl(url)) {
@ -293,7 +293,7 @@ public class LinkPreviewRepository implements InjectableType {
}
}
interface Callback<T> {
public interface Callback<T> {
void onComplete(@NonNull T result);
}
}