blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reduce Recipient refreshes.

master
Greyson Parrelli 2019-10-01 14:53:13 -04:00
parent 82b5d58d04
commit acea24c19c
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
View File

@ -71,8 +71,10 @@ public class RetrieveProfileJob extends BaseJob {
@Override
public void onRun() throws IOException {
if (recipient.isGroup()) handleGroupRecipient(recipient);
else handleIndividualRecipient(recipient);
Recipient resolved = recipient.resolve();
if (resolved.isGroup()) handleGroupRecipient(resolved);
else handleIndividualRecipient(resolved);
}
@Override
@ -166,11 +168,15 @@ public class RetrieveProfileJob extends BaseJob {
byte[] profileKey = recipient.getProfileKey();
if (unrestrictedUnidentifiedAccess && unidentifiedAccessVerifier != null) {
Log.i(TAG, "Marking recipient UD status as unrestricted.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.UNRESTRICTED);
if (recipient.getUnidentifiedAccessMode() != UnidentifiedAccessMode.UNRESTRICTED) {
Log.i(TAG, "Marking recipient UD status as unrestricted.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.UNRESTRICTED);
}
} else if (profileKey == null || unidentifiedAccessVerifier == null) {
Log.i(TAG, "Marking recipient UD status as disabled.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.DISABLED);
if (recipient.getUnidentifiedAccessMode() != UnidentifiedAccessMode.DISABLED) {
Log.i(TAG, "Marking recipient UD status as disabled.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), UnidentifiedAccessMode.DISABLED);
}
} else {
ProfileCipher profileCipher = new ProfileCipher(profileKey);
boolean verifiedUnidentifiedAccess;
@ -183,8 +189,11 @@ public class RetrieveProfileJob extends BaseJob {
}
UnidentifiedAccessMode mode = verifiedUnidentifiedAccess ? UnidentifiedAccessMode.ENABLED : UnidentifiedAccessMode.DISABLED;
Log.i(TAG, "Marking recipient UD status as " + mode.name() + " after verification.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), mode);
if (recipient.getUnidentifiedAccessMode() != mode) {
Log.i(TAG, "Marking recipient UD status as " + mode.name() + " after verification.");
recipientDatabase.setUnidentifiedAccessMode(recipient.getId(), mode);
}
}
}

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

@ -116,7 +116,7 @@ public final class LiveRecipient {
* @return A fully-resolved version of the recipient. May require reading from disk.
*/
@WorkerThread
public synchronized @NonNull Recipient resolve() {
public @NonNull Recipient resolve() {
Recipient current = recipient.get();
if (!current.isResolving()) {