Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-28 12:44:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure ProfileKeyCredentials match ProfileKey.

Browse Source 
Fixes #10344
This commit is contained in:
Alan Evans
2021-01-05 17:42:27 -04:00
parent 6dd3fdaa55
commit 6080e1f338
9 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/recipients/Recipient.java
View File

@@ -14,6 +14,7 @@ import com.annimon.stream.Stream;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
@@ -84,7 +85,7 @@ public class Recipient {
private final int expireMessages;
private final RegisteredState registered;
private final byte[] profileKey;
private final byte[] profileKeyCredential;
private final ProfileKeyCredential profileKeyCredential;
private final String name;
private final Uri systemContactPhoto;
private final String customLabel;
@@ -813,7 +814,7 @@ public class Recipient {
return profileKey;
}
public @Nullable byte[] getProfileKeyCredential() {
public @Nullable ProfileKeyCredential getProfileKeyCredential() {
return profileKeyCredential;
}

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

@@ -7,6 +7,7 @@ import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.zkgroup.profiles.ProfileKeyCredential;
import org.thoughtcrime.securesms.color.MaterialColor;
import org.thoughtcrime.securesms.database.RecipientDatabase.InsightsBannerTier;
import org.thoughtcrime.securesms.database.RecipientDatabase.MentionSetting;
@@ -49,7 +50,7 @@ public class RecipientDetails {
final Optional<Integer> defaultSubscriptionId;
final RegisteredState registered;
final byte[] profileKey;
final byte[] profileKeyCredential;
final ProfileKeyCredential profileKeyCredential;
final String profileAvatar;
final boolean hasProfileImage;
final boolean profileSharing;