TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 12:58:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync the profile photo to linked devices when appropriate.

Browse Source
This commit is contained in:
Greyson Parrelli 2020-04-22 10:34:43 -04:00
parent f466fef20a
commit 1b5a0ab9f3
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View File

@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.profiles.AvatarHelper;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.recipients.RecipientUtil;
@ -133,7 +134,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient), out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient),
Optional.of(recipient.getDisplayName(context)), Optional.of(recipient.getDisplayName(context)),
getSystemAvatar(recipient.getContactUri()), getAvatar(recipient.getId(), recipient.getContactUri()),
Optional.fromNullable(recipient.getColor().serialize()), Optional.fromNullable(recipient.getColor().serialize()),
verifiedMessage, verifiedMessage,
ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey()), ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey()),
@ -190,7 +191,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient), out.write(new DeviceContact(RecipientUtil.toSignalServiceAddress(context, recipient),
name, name,
getSystemAvatar(recipient.getContactUri()), getAvatar(recipient.getId(), recipient.getContactUri()),
color, color,
verified, verified,
profileKey, profileKey,
@ -257,6 +258,34 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
} }
} }
private Optional<SignalServiceAttachmentStream> getAvatar(@NonNull RecipientId recipientId, @Nullable Uri uri) {
Optional<SignalServiceAttachmentStream> stream = getProfileAvatar(recipientId);
if (!stream.isPresent()) {
return getSystemAvatar(uri);
}
return stream;
}
private Optional<SignalServiceAttachmentStream> getProfileAvatar(@NonNull RecipientId recipientId) {
if (AvatarHelper.hasAvatar(context, recipientId)) {
try {
long length = AvatarHelper.getAvatarLength(context, recipientId);
return Optional.of(SignalServiceAttachmentStream.newStreamBuilder()
.withStream(AvatarHelper.getAvatar(context, recipientId))
.withContentType("image/*")
.withLength(length)
.build());
} catch (IOException e) {
Log.w(TAG, "Failed to read profile avatar!", e);
return Optional.absent();
}
}
return Optional.absent();
}
private Optional<SignalServiceAttachmentStream> getSystemAvatar(@Nullable Uri uri) { private Optional<SignalServiceAttachmentStream> getSystemAvatar(@Nullable Uri uri) {
if (uri == null) { if (uri == null) {
return Optional.absent(); return Optional.absent();