empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix illegal state exception during backup restore of unamed groups.

Browse source
This commit is contained in:
Cody Henthorne 2022-08-08 10:37:27 -04:00 • committed by Alex Hart
parent f7dce21246
commit 1547ec2067
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipientCache.java
View file

@ -6,6 +6,7 @@ import android.database.Cursor;
import androidx.annotation.AnyThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.ThreadUtil;
import org.signal.core.util.concurrent.SignalExecutors;
@ -176,6 +177,28 @@ public final class LiveRecipientCache {
return getLive(selfId).resolve();
}
/** Can safely get self id. If used during early registration (backup), will return null as we don't know self yet. */
@Nullable RecipientId getSelfId() {
RecipientId selfId;
synchronized (localRecipientId) {
selfId = localRecipientId.get();
}
if (selfId != null) {
return selfId;
}
ACI localAci = SignalStore.account().getAci();
String localE164 = SignalStore.account().getE164();
if (localAci == null && localE164 == null) {
return null;
} else {
return getSelf().getId();
}
}
@AnyThread
public void warmUp() {
if (warmedUp.getAndSet(true)) {

2
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View file

@ -489,7 +489,7 @@ public class Recipient {
public @Nullable String getGroupName(@NonNull Context context) {
if (groupId != null && Util.isEmpty(this.groupName)) {
RecipientId selfId = Recipient.self().getId();
RecipientId selfId = ApplicationDependencies.getRecipientCache().getSelfId();
List<Recipient> others = participantIds.stream()
.filter(id -> !id.equals(selfId))
.limit(MAX_MEMBER_NAMES)