TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-11 18:54:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #72 from RyanRory/sealed-sender-modification

Browse Source 
fix friend request with sealed sender
This commit is contained in:
gmbnt 2020-02-04 14:26:16 +11:00 committed by GitHub
commit 58b0d002f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
View File

@ -107,20 +107,9 @@ public class UnidentifiedAccessUtil {
private static @Nullable byte[] getTargetUnidentifiedAccessKey(@NonNull Recipient recipient) { private static @Nullable byte[] getTargetUnidentifiedAccessKey(@NonNull Recipient recipient) {
byte[] theirProfileKey = recipient.resolve().getProfileKey(); byte[] theirProfileKey = recipient.resolve().getProfileKey();
switch (recipient.resolve().getUnidentifiedAccessMode()) { if (theirProfileKey == null) return Util.getSecretBytes(16);
case UNKNOWN: else return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
if (theirProfileKey == null) return Util.getSecretBytes(16);
else return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
case DISABLED:
return null;
case ENABLED:
if (theirProfileKey == null) return null;
else return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
case UNRESTRICTED:
return Util.getSecretBytes(16);
default:
throw new AssertionError("Unknown mode: " + recipient.getUnidentifiedAccessMode().getMode());
}
} }
private static @Nullable byte[] getUnidentifiedAccessCertificate(Context context) { private static @Nullable byte[] getUnidentifiedAccessCertificate(Context context) {