Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not send if unregistered.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-05-25 12:21:13 -04:00
parent b9b2924939
commit 54f92ae466
35 changed files with 196 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/recipients/LiveRecipient.java
View File

@@ -212,10 +212,10 @@ public final class LiveRecipient {
avatarId = Optional.of(groupRecord.get().getAvatarId());
}
return new RecipientDetails(title, null, avatarId, false, false, settings, members);
return new RecipientDetails(title, null, avatarId, false, false, settings.getRegistered(), settings, members);
}
return new RecipientDetails(null, null, Optional.absent(), false, false, settings, null);
return new RecipientDetails(null, null, Optional.absent(), false, false, settings.getRegistered(), settings, null);
}
synchronized void set(@NonNull Recipient recipient) {

15
app/src/main/java/org/thoughtcrime/securesms/recipients/RecipientDetails.java
View File

@@ -78,6 +78,7 @@ public class RecipientDetails {
@NonNull Optional<Long> groupAvatarId,
boolean systemContact,
boolean isSelf,
@NonNull RegisteredState registeredState,
@NonNull RecipientSettings settings,
@Nullable List<Recipient> participants)
{
@@ -101,7 +102,7 @@ public class RecipientDetails {
this.participants = participants == null ? new LinkedList<>() : participants;
this.profileName = settings.getProfileName();
this.defaultSubscriptionId = settings.getDefaultSubscriptionId();
this.registered = settings.getRegistered();
this.registered = registeredState;
this.profileKey = settings.getProfileKey();
this.profileKeyCredential = settings.getProfileKeyCredential();
this.profileAvatar = settings.getProfileAvatar();
@@ -184,6 +185,16 @@ public class RecipientDetails {
boolean isSelf = (settings.getE164() != null && settings.getE164().equals(TextSecurePreferences.getLocalNumber(context))) ||
(settings.getUuid() != null && settings.getUuid().equals(TextSecurePreferences.getLocalUuid(context)));
return new RecipientDetails(null, settings.getSystemDisplayName(), Optional.absent(), systemContact, isSelf, settings, null);
RegisteredState registeredState = settings.getRegistered();
if (isSelf) {
if (TextSecurePreferences.isPushRegistered(context) && !TextSecurePreferences.isUnauthorizedRecieved(context)) {
registeredState = RegisteredState.REGISTERED;
} else {
registeredState = RegisteredState.NOT_REGISTERED;
}
}
return new RecipientDetails(null, settings.getSystemDisplayName(), Optional.absent(), systemContact, isSelf, registeredState, settings, null);
}
}