Commit graph

221 commits

Author SHA1 Message Date
Michael Kirk
b21c628d56 Merge branch 'mkirk/attachment-digest'
// FREEBIE
2017-03-13 12:33:22 -04:00
Michael Kirk
8f1412d502 comment constant time compare per code review
// FREEBIE
2017-03-13 12:32:35 -04:00
Michael Kirk
452110b687 Include digest in attachments
- constant time compare
- free buffer passed to NSData

// FREEBIE
2017-03-13 12:32:35 -04:00
Matthew Chen
32ac0fb7c9 Merge branch 'charlesmchen/paste' 2017-03-12 09:09:59 -03:00
Matthew Chen
e05b687438 Respond to CR.
// FREEBIE
2017-03-12 09:08:50 -03:00
Matthew Chen
270a10a62a Add UTIType methods to MIMETypeUtil.
// FREEBIE
2017-03-11 20:36:21 -03:00
Michael Kirk
1e6925ebc1 Fix crash-on-launch for older installs
populating the de-duping index assumes authorId is always set for
incoming messages, but this was not always the case.

// FREEBIE
2017-03-03 15:32:18 -05:00
Michael Kirk
0393e4f0b4 fix tests
// FREEBIE
2017-02-24 19:20:35 -08:00
Michael Kirk
168639597f Merge branch 'mkirk/dedupe-incoming-messages' 2017-02-24 19:18:15 -08:00
Michael Kirk
a92158ef16 CR: fix register async where specified
* fix thread test
* add IncomingMessageFinder test
* use constants
* clearer comments

// FREEBIE
2017-02-24 19:15:35 -08:00
Michael Kirk
b389bb3bb8 Code cleanup.
No need to use contactThread method to get recipient ID since we still
have the envelope.

And with that, it's pretty easy to justify getting rid of one of our now
barely used IncomingMessage initializers.

// FREEBIE
2017-02-24 19:15:35 -08:00
Michael Kirk
975726e022 Dedupe incoming messags
// FREEBIE
2017-02-24 19:15:35 -08:00
Matthew Chen
d6e1e81a8a Merge branch 'charlesmchen/callkitPrivacy' 2017-02-23 07:01:49 -08:00
Matthew Chen
52bb939fc1 Respond to CR.
// FREEBIE
2017-02-23 07:01:24 -08:00
Matthew Chen
71b804ba52 Add and honor the “CallKit Privacy” setting.
// FREEBIE
2017-02-22 09:52:38 -05:00
Matthew Chen
286f72d273 Merge branch 'charlesmchen/webrtcByDefault' 2017-02-22 09:52:00 -05:00
Matthew Chen
2741fd4bdc Enable WebRTC-based audio and video calls by default.
// FREEBIE
2017-02-22 09:51:45 -05:00
Matthew Chen
254a247ba0 Revert "Add WebRTC setting."
This reverts commit 0f45f292a1.

// FREEBIE
2017-02-22 09:51:45 -05:00
Michael Kirk
14a104b1b2 fix tests, and off by one in keeping old, accepted keys
// FREEBIE
2017-02-17 14:34:30 -05:00
Matthew Chen
c72e8f8e2f Merge remote-tracking branch 'origin/release/2.7.1'
// FREEBIE
2017-02-17 12:34:03 -05:00
Matthew Chen
427f225df9 Merge branch 'feature/messageSortingRevisited' 2017-02-16 20:33:20 -05:00
Matthew Chen
686fe679bd Respond to CR.
// FREEBIE
2017-02-16 20:32:19 -05:00
Matthew Chen
7bd4d26532 Add “received at” timestamp to all TSMessages so that they may be sorted properly.
// FREEBIE
2017-02-15 18:04:37 -05:00
Matthew Chen
f974706396 Clean up the prekeys.
// FREEBIE
2017-02-14 18:30:34 -05:00
Matthew Chen
8acc496a39 Clean up the prekeys.
// FREEBIE
2017-02-14 17:40:44 -05:00
Matthew Chen
54736426f9 Avoid crashes when signed prekey lookup fails.
// FREEBIE
2017-02-14 15:48:49 -05:00
Matthew Chen
5ed95c4782 Merge branch 'charlesmchen/prekey2' 2017-02-14 13:40:19 -05:00
Matthew Chen
351a010fe0 Clean up prekey usage.
// FREEBIE
2017-02-14 13:39:52 -05:00
Matthew Chen
7c55d559d3 Merge branch 'charlesmchen/markUnsentMessages' 2017-02-13 17:18:46 -05:00
Matthew Chen
821c96cc6b Mark "attempting out" messages as "unsent" on app launch.
// FREEBIE
2017-02-13 17:16:18 -05:00
Matthew Chen
12027152f4 Merge branch 'charlesmchen/rateLimitingErrorMessage' 2017-02-13 16:03:33 -05:00
Matthew Chen
df4b0616e8 Improve rate-limiting error message in registration and code verification views.
// FREEBIE
2017-02-11 16:25:07 -05:00
Matthew Chen
93219e4d23 Merge branch 'charlesmchen/prekey_' 2017-02-10 16:13:20 -05:00
Michael Kirk
e0688e16a7 Clean up prekey logic.
// FREEBIE
2017-02-10 16:12:28 -05:00
Michael Kirk
e1949893f2 Avoid deadlock when marking self-sent messages as read.
Fetching the localNumber invokes another transaction, which can
result in deadlock if called during an existing transaction.

// FREEBIE
2017-02-08 18:34:31 -05:00
Matthew Chen
4d055757de Fix the .pch used by this pod to reflect the changes from the last PR.
// FREEBIE
2017-02-08 16:43:50 -05:00
Matthew Chen
0252797734 Merge branch 'charlesmchen/callStatusMessages' 2017-02-08 16:25:50 -05:00
Matthew Chen
284212b3fe Move OWSDispatch.h to the PCH.
// FREEBIE
2017-02-08 16:25:28 -05:00
Matthew Chen
90b85c0605 Improve the call status messages in conversation view.
// FREEBIE
2017-02-08 15:51:53 -05:00
Michael Kirk
bc1af80733 Log when we mark a message as read locally
This is in pursuit of some now (for me) un-reproducible behavior where
messages on some clients were being immediately marked as read.

// FREEBIE
2017-02-08 10:29:51 -05:00
Michael Kirk
311d80fb2e Missed calls increment unread counter/badge
This affects:
- per-thread badge in the inbox view
- app badge when viewed from springboard.

// FREEBIE
2017-02-07 17:00:55 -05:00
Matthew Chen
653727ae9f Merge branch 'charlesmchen/messagesFromMeAreAlreadyAutoRead' 2017-02-06 11:26:12 -05:00
Matthew Chen
df1b3418d2 Respond to CR.
// FREEBIE
2017-02-06 11:25:56 -05:00
Matthew Chen
6d356e4b67 Automatically mark as read any messages sent by current user from another device.
// FREEBIE
2017-02-04 13:15:15 -05:00
Michael Kirk
4e8ab21c41 Merge pull request #105 from WhisperSystems/mkirk/webrtc
Support for WebRTC calling
2017-02-02 15:18:37 -05:00
Michael Kirk
92a69e8e65 Repsond to CR w/ @cmchen.
* Added docs
* added asserts to TSEnv accessors

// FREEBIE
2017-02-02 15:15:38 -05:00
Michael Kirk
80fb58231e Merge remote-tracking branch 'origin/master' into mkirk/webrtc
// FREEBIE
2017-02-01 20:01:22 -05:00
Michael Kirk
c68073fdb1 proper error code for NOTFOUND
// FREEBIE
2017-02-01 19:18:28 -05:00
Michael Kirk
7b1b706e2a Include reusable localized text in recipient-not-found error
This way we can use it for calls as well.

// FREEBIE
2017-02-01 19:16:07 -05:00
Matthew Chen
7ca1d5e8a6 Merge branch 'charlesmchen/webrtc/threadSafety' into mkirk/webrtc 2017-02-01 10:40:59 -05:00