From 712deebb420f18436ddf8e4c753eae39a58c2174 Mon Sep 17 00:00:00 2001 From: Harris Date: Tue, 22 Mar 2022 11:13:44 +1100 Subject: [PATCH 1/2] fix: Cached recipient values not updating approved flags, remove unused static recipient settings map in RecipientProvider (#860) --- .../utilities/recipients/Recipient.java | 4 ++++ .../utilities/recipients/RecipientProvider.java | 15 +++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java index c97f4b595..823554910 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/Recipient.java @@ -209,6 +209,8 @@ public class Recipient implements RecipientModifiedListener { Recipient.this.callRingtone = result.callRingtone; Recipient.this.mutedUntil = result.mutedUntil; Recipient.this.blocked = result.blocked; + Recipient.this.approved = result.approved; + Recipient.this.approvedMe = result.approvedMe; Recipient.this.messageVibrate = result.messageVibrateState; Recipient.this.callVibrate = result.callVibrateState; Recipient.this.expireMessages = result.expireMessages; @@ -259,6 +261,8 @@ public class Recipient implements RecipientModifiedListener { this.mutedUntil = details.mutedUntil; this.notifyType = details.notifyType; this.blocked = details.blocked; + this.approved = details.approved; + this.approvedMe = details.approvedMe; this.messageVibrate = details.messageVibrateState; this.callVibrate = details.callVibrateState; this.expireMessages = details.expireMessages; diff --git a/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java index 2e675acf6..1cad1c18b 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java +++ b/libsession/src/main/java/org/session/libsession/utilities/recipients/RecipientProvider.java @@ -37,7 +37,6 @@ import org.session.libsession.utilities.recipients.Recipient.UnidentifiedAccessM import org.session.libsession.utilities.recipients.Recipient.VibrateState; import org.session.libsignal.utilities.guava.Optional; -import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -53,10 +52,6 @@ class RecipientProvider { private static final RecipientCache recipientCache = new RecipientCache(); private static final ExecutorService asyncRecipientResolver = Util.newSingleThreadedLifoExecutor(); - private static final Map STATIC_DETAILS = new HashMap() {{ - put("262966", new RecipientDetails("Amazon", null, false, false, null, null)); - }}; - @NonNull Recipient getRecipient(@NonNull Context context, @NonNull Address address, @NonNull Optional settings, @NonNull Optional groupRecord, boolean asynchronous) { Recipient cachedRecipient = recipientCache.get(address); @@ -117,13 +112,9 @@ class RecipientProvider { settings = Optional.fromNullable(MessagingModuleConfiguration.shared.getStorage().getRecipientSettings(address)); } - if (!settings.isPresent() && STATIC_DETAILS.containsKey(address.serialize())) { - return STATIC_DETAILS.get(address.serialize()); - } else { - 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); - } + 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, Optional settings, boolean asynchronous) { From 04dfe9951774b2d549b2ba336b2e4df5fa90c3fb Mon Sep 17 00:00:00 2001 From: jubb Date: Tue, 22 Mar 2022 11:14:51 +1100 Subject: [PATCH 2/2] build: update version code and name --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4c6d0a3f8..bdfac64e7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,8 +157,8 @@ dependencies { testImplementation 'org.robolectric:shadows-multidex:4.4' } -def canonicalVersionCode = 259 -def canonicalVersionName = "1.11.19" +def canonicalVersionCode = 261 +def canonicalVersionName = "1.11.20" def postFixSize = 10 def abiPostFix = ['armeabi-v7a' : 1,