keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mkirk/attachment-digest'

Browse Source
pull/1/head
Michael Kirk 9 years ago
parent afbbe769a5 d8c4558c80
commit ad4ffae164
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

4
Podfile.lock
Unescape Escape View File

@ -140,7 +140,7 @@ CHECKOUT OPTIONS:
:commit: a3c843cc8a423c5924c663490978f81dba34d04e :commit: a3c843cc8a423c5924c663490978f81dba34d04e
:git: https://github.com/WhisperSystems/SignalProtocolKit.git :git: https://github.com/WhisperSystems/SignalProtocolKit.git
SignalServiceKit: SignalServiceKit:
:commit: 1e6925ebc194a71dae2bfc126c7e47be6f4f639c :commit: b21c628d569bee2d72c18a8286d17701f58f0df6
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf :commit: 877ac7438be3ad0b45ef5ca3969574e4b97112bf
@ -174,4 +174,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: 48dbf2fb380d626bb799a782dd41b6bf1e466506 PODFILE CHECKSUM: 48dbf2fb380d626bb799a782dd41b6bf1e466506
COCOAPODS: 1.1.1 COCOAPODS: 1.2.0

2
Signal/src/UIColor+OWS.m
Unescape Escape View File

@ -102,7 +102,7 @@
NSUInteger hashingLength = 8; NSUInteger hashingLength = 8;
unsigned long long choose; unsigned long long choose;
NSData *hashData = [Cryptography computeSHA256:contactData truncatedToBytes:hashingLength]; NSData *hashData = [Cryptography computeSHA256Digest:contactData truncatedToBytes:hashingLength];
[hashData getBytes:&choose length:hashingLength]; [hashData getBytes:&choose length:hashingLength];
return [colors objectAtIndex:(choose % [colors count])]; return [colors objectAtIndex:(choose % [colors count])];
} }

Write Preview
Loading…
Cancel
Save