TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-25 03:09:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store system contacts display name in recipient preferences db

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-08-07 15:31:12 -07:00
parent f61c52aace
commit 159fdb317f
7 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.recipients;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
import org.thoughtcrime.securesms.color.MaterialColor;
@@ -26,11 +27,13 @@ import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.RecipientPreferenceDatabase.RecipientsPreferences;
import org.thoughtcrime.securesms.database.RecipientPreferenceDatabase.VibrateState;
import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails;
import org.thoughtcrime.securesms.util.FutureTaskListener;
import org.thoughtcrime.securesms.util.ListenableFutureTask;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
import java.util.Collections;
import java.util.HashSet;
@@ -66,6 +69,7 @@ public class Recipient implements RecipientModifiedListener {
Recipient(@NonNull Address address,
@Nullable Recipient stale,
@NonNull Optional<RecipientsPreferences> preferences,
@NonNull ListenableFutureTask<RecipientDetails> future)
{
this.address = address;
@@ -86,6 +90,19 @@ public class Recipient implements RecipientModifiedListener {
this.expireMessages = stale.expireMessages;
}
if (preferences.isPresent()) {
if (!TextUtils.isEmpty(preferences.get().getSystemDisplayName())) {
this.name = preferences.get().getSystemDisplayName();
}
this.color = preferences.get().getColor();
this.ringtone = preferences.get().getRingtone();
this.mutedUntil = preferences.get().getMuteUntil();
this.blocked = preferences.get().isBlocked();
this.vibrate = preferences.get().getVibrateState();
this.expireMessages = preferences.get().getExpireMessages();
}
future.addListener(new FutureTaskListener<RecipientDetails>() {
@Override
public void onSuccess(RecipientDetails result) {

2
src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
View File

@@ -75,7 +75,7 @@ class RecipientProvider {
}
if (asynchronous) {
cachedRecipient = new Recipient(address, cachedRecipient, getRecipientDetailsAsync(context, address, preferences));
cachedRecipient = new Recipient(address, cachedRecipient, preferences, getRecipientDetailsAsync(context, address, preferences));
} else {
cachedRecipient = new Recipient(address, getRecipientDetailsSync(context, address, preferences, false));
}