Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-24 10:51:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor LiveRecipient fetch to be more clear.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-02-20 23:39:42 -05:00
parent 19dc90b68b
commit 97f8b5988d
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
View File

@@ -150,16 +150,20 @@ public final class LiveRecipientCache {
ACI localAci = SignalStore.account().getAci();
String localE164 = SignalStore.account().getE164();
if (localAci != null) {
selfId = recipientDatabase.getByServiceId(localAci).or(recipientDatabase.getByE164(localE164)).orNull();
} else if (localE164 != null) {
selfId = recipientDatabase.getByE164(localE164).orNull();
} else {
if (localAci == null && localE164 == null) {
throw new IllegalStateException("Tried to call getSelf() before local data was set!");
}
if (localAci != null) {
selfId = recipientDatabase.getByServiceId(localAci).orNull();
}
if (selfId == null && localE164 != null) {
selfId = recipientDatabase.getByE164(localE164).orNull();
}
if (selfId == null) {
selfId = recipientDatabase.getAndPossiblyMerge(localAci, localE164, false);
selfId = recipientDatabase.getAndPossiblyMerge(localAci, localE164, true);
}
synchronized (localRecipientId) {