Merge branch 'master' into calls
# Conflicts: # app/build.gradle
This commit is contained in:
commit
de2e241598
|
@ -158,8 +158,8 @@ dependencies {
|
||||||
testImplementation 'org.robolectric:shadows-multidex:4.4'
|
testImplementation 'org.robolectric:shadows-multidex:4.4'
|
||||||
}
|
}
|
||||||
|
|
||||||
def canonicalVersionCode = 259
|
def canonicalVersionCode = 262
|
||||||
def canonicalVersionName = "1.12.4"
|
def canonicalVersionName = "1.12.5"
|
||||||
|
|
||||||
def postFixSize = 10
|
def postFixSize = 10
|
||||||
def abiPostFix = ['armeabi-v7a' : 1,
|
def abiPostFix = ['armeabi-v7a' : 1,
|
||||||
|
|
|
@ -209,6 +209,8 @@ public class Recipient implements RecipientModifiedListener {
|
||||||
Recipient.this.callRingtone = result.callRingtone;
|
Recipient.this.callRingtone = result.callRingtone;
|
||||||
Recipient.this.mutedUntil = result.mutedUntil;
|
Recipient.this.mutedUntil = result.mutedUntil;
|
||||||
Recipient.this.blocked = result.blocked;
|
Recipient.this.blocked = result.blocked;
|
||||||
|
Recipient.this.approved = result.approved;
|
||||||
|
Recipient.this.approvedMe = result.approvedMe;
|
||||||
Recipient.this.messageVibrate = result.messageVibrateState;
|
Recipient.this.messageVibrate = result.messageVibrateState;
|
||||||
Recipient.this.callVibrate = result.callVibrateState;
|
Recipient.this.callVibrate = result.callVibrateState;
|
||||||
Recipient.this.expireMessages = result.expireMessages;
|
Recipient.this.expireMessages = result.expireMessages;
|
||||||
|
@ -259,6 +261,8 @@ public class Recipient implements RecipientModifiedListener {
|
||||||
this.mutedUntil = details.mutedUntil;
|
this.mutedUntil = details.mutedUntil;
|
||||||
this.notifyType = details.notifyType;
|
this.notifyType = details.notifyType;
|
||||||
this.blocked = details.blocked;
|
this.blocked = details.blocked;
|
||||||
|
this.approved = details.approved;
|
||||||
|
this.approvedMe = details.approvedMe;
|
||||||
this.messageVibrate = details.messageVibrateState;
|
this.messageVibrate = details.messageVibrateState;
|
||||||
this.callVibrate = details.callVibrateState;
|
this.callVibrate = details.callVibrateState;
|
||||||
this.expireMessages = details.expireMessages;
|
this.expireMessages = details.expireMessages;
|
||||||
|
|
|
@ -37,7 +37,6 @@ import org.session.libsession.utilities.recipients.Recipient.UnidentifiedAccessM
|
||||||
import org.session.libsession.utilities.recipients.Recipient.VibrateState;
|
import org.session.libsession.utilities.recipients.Recipient.VibrateState;
|
||||||
import org.session.libsignal.utilities.guava.Optional;
|
import org.session.libsignal.utilities.guava.Optional;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -53,10 +52,6 @@ class RecipientProvider {
|
||||||
private static final RecipientCache recipientCache = new RecipientCache();
|
private static final RecipientCache recipientCache = new RecipientCache();
|
||||||
private static final ExecutorService asyncRecipientResolver = Util.newSingleThreadedLifoExecutor();
|
private static final ExecutorService asyncRecipientResolver = Util.newSingleThreadedLifoExecutor();
|
||||||
|
|
||||||
private static final Map<String, RecipientDetails> STATIC_DETAILS = new HashMap<String, RecipientDetails>() {{
|
|
||||||
put("262966", new RecipientDetails("Amazon", null, false, false, null, null));
|
|
||||||
}};
|
|
||||||
|
|
||||||
@NonNull Recipient getRecipient(@NonNull Context context, @NonNull Address address, @NonNull Optional<RecipientSettings> settings, @NonNull Optional<GroupRecord> groupRecord, boolean asynchronous) {
|
@NonNull Recipient getRecipient(@NonNull Context context, @NonNull Address address, @NonNull Optional<RecipientSettings> settings, @NonNull Optional<GroupRecord> groupRecord, boolean asynchronous) {
|
||||||
Recipient cachedRecipient = recipientCache.get(address);
|
Recipient cachedRecipient = recipientCache.get(address);
|
||||||
|
|
||||||
|
@ -117,13 +112,9 @@ class RecipientProvider {
|
||||||
settings = Optional.fromNullable(MessagingModuleConfiguration.shared.getStorage().getRecipientSettings(address));
|
settings = Optional.fromNullable(MessagingModuleConfiguration.shared.getStorage().getRecipientSettings(address));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!settings.isPresent() && STATIC_DETAILS.containsKey(address.serialize())) {
|
boolean systemContact = settings.isPresent() && !TextUtils.isEmpty(settings.get().getSystemDisplayName());
|
||||||
return STATIC_DETAILS.get(address.serialize());
|
boolean isLocalNumber = address.serialize().equals(TextSecurePreferences.getLocalNumber(context));
|
||||||
} else {
|
return new RecipientDetails(null, null, systemContact, isLocalNumber, settings.orNull(), null);
|
||||||
boolean systemContact = settings.isPresent() && !TextUtils.isEmpty(settings.get().getSystemDisplayName());
|
|
||||||
boolean isLocalNumber = address.serialize().equals(TextSecurePreferences.getLocalNumber(context));
|
|
||||||
return new RecipientDetails(null, null, systemContact, isLocalNumber, settings.orNull(), null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private @NonNull RecipientDetails getGroupRecipientDetails(Context context, Address groupId, Optional<GroupRecord> groupRecord, Optional<RecipientSettings> settings, boolean asynchronous) {
|
private @NonNull RecipientDetails getGroupRecipientDetails(Context context, Address groupId, Optional<GroupRecord> groupRecord, Optional<RecipientSettings> settings, boolean asynchronous) {
|
||||||
|
|
Loading…
Reference in New Issue