TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:loki-project/loki-messenger-android into dev

Browse Source
This commit is contained in:
Niels Andriesse 2020-02-04 14:31:50 +11:00
commit b74506ea24
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
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()) {
case UNKNOWN:
if (theirProfileKey == null) return Util.getSecretBytes(16); if (theirProfileKey == null) return Util.getSecretBytes(16);
else return UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey); 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) {