Commit Graph

22799 Commits

Author SHA1 Message Date
Matthew Chen
1824fd0b75 Merge branch 'charlesmchen/buildInstructions' 2017-02-13 09:46:43 -05:00
Matthew Chen
9e7ca5d87c Refine Carthage instructions.
// FREEBIE
2017-02-13 09:37:02 -05:00
Matthew Chen
f02d325952 Update the Carthage submodule.
// FREEBIE
2017-02-13 09:36:57 -05:00
Matthew Chen
12dabd004d Refine Carthage instructions.
// FREEBIE
2017-02-13 09:36:51 -05:00
Matthew Chen
602fbcfb80 Slightly revise Carthage build instructions.
// FREEBIE
2017-02-13 09:36:41 -05:00
Matthew Chen
98a57d69c7 Revert "Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md."
This reverts commit 13647bab39.
2017-02-13 09:35:54 -05:00
EDSGH
13647bab39 Corrected BUILDING.md and MAINTAINING.md instructions so new developers will have a successful build in XCode. Current instructions from BUILDING.md were not current and incomplete nor referenced MAINTAINING.md. 2017-02-13 09:35:46 -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
Michael Kirk
2791b9551e bump build
// FREEBIE
2017-02-10 17:42:21 -05:00
Michael Kirk
4a8cfde6b3 Sync translations
// FREEBIE
2017-02-10 17:41:08 -05:00
Matthew Chen
2789edbdbd Merge branch 'feature/prekeys_' 2017-02-10 16:35:42 -05:00
Matthew Chen
97001018ae Clean up prekey logic.
// FREEBIE
2017-02-10 16:35:16 -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
Matthew Chen
35728b2835 Merge commit '8b3b2836128a7244822fe4204a0e26139f8b140a' 2017-02-10 14:19:03 -05:00
Matthew Chen
8b3b283612 Update Carthage submodule.
* Merge feature/webrtc into master.
* Move submodule reference from https:// to git://

// FREEBIE
2017-02-10 14:14:32 -05:00
Michael Kirk
2675a724ce [SSK] avoid intermittent YAP deadlock when receiving message
// FREEBIE
2017-02-08 18:36:31 -05:00
Michael Kirk
da2cb228ab bump build
// FREEBIE
2017-02-08 18:36:06 -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
Michael Kirk
b3ce705541 sync translations
// FREEBIE
2017-02-08 17:23:12 -05:00
Michael Kirk
447590ac06 bump build
// FREEBIE
2017-02-08 17:23:12 -05:00
Matthew Chen
e798964308 Update SignalServiceKit pod.
// FREEBIE
2017-02-08 17:22:49 -05:00
Matthew Chen
84d988a013 Merge branch 'charlesmchen/callStatusMessages' 2017-02-08 16:48:33 -05:00
Matthew Chen
dea37b422b Respond to CR.
// FREEBIE
2017-02-08 16:47:09 -05:00
Matthew Chen
06a775b41a Improve the call status messages in conversation view.
// FREEBIE
2017-02-08 16:47:09 -05:00
Matthew Chen
8e2ac368a0 Update SignalServiceKit pod.
// FREEBIE
2017-02-08 16:45:37 -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
Michael Kirk
3ab65a2c88 Prevent CallKit timeout when placing outgoing call
More fallout from the outbound call timeout which was causing all
CallKit calls not promptly answered to show "Call Failed"

Inserting the timeout exacerbated an existing issue: We can't wait for
long before choosing to fulfill/fail an action without CallKit falling
over and assuming the call failed.

We don't actually need to consider the case where we "fail to initiate"
the outgoing call. Instead we say it started "successfully, and if there
is an error, the existing promise error handling will fail the call at
that time.

// FREEBIE
2017-02-08 16:25:27 -05:00
Matthew Chen
90b85c0605 Improve the call status messages in conversation view.
// FREEBIE
2017-02-08 15:51:53 -05:00
Michael Kirk
6cdf13ea5f Only time out the intended call
previously a followup call could get clobbered by the previous calls
timeout

// FREEBIE
2017-02-08 14:59:18 -05:00
Matthew Chen
6d757d3a50 Merge branch 'charlesmchen/contactsViewsVsContactsUpdates' 2017-02-08 14:26:40 -05:00
Matthew Chen
192264e45b Respond to CR.
// FREEBIE
2017-02-08 14:26:32 -05:00
Matthew Chen
adfbcc3e27 Update views that show contacts to reflect updates.
// FREEBIE
2017-02-08 14:26:32 -05:00
Michael Kirk
c087c56b0c Fix call timeout
- Previously only incoming calls had their timeout promise fulfilled
- Previously we'd stop the timeout once ringing started, but we
should continue the timeout clock until the users are speaking.

// FREEBIE
2017-02-08 14:25:05 -05:00
Michael Kirk
31378d4d9a sync translations
// FREEBIE
2017-02-08 10:49:14 -05:00
Michael Kirk
b82584f22c bump build
// FREEBIE
2017-02-08 10:48:21 -05:00
Michael Kirk
420d717580 [SSK] log when messages are marked as read locally
// FREEBIE
2017-02-08 10:39:41 -05:00
Michael Kirk
34e4650c46 Merge branch 'mkirk/timeout-outgoing-call' 2017-02-08 10:34:10 -05:00
Michael Kirk
2f6bf0e551 Code cleanup per CR
// FREEBIE
2017-02-08 10:33:43 -05:00
Michael Kirk
108720c2e7 End outgoing call with "No Answer" after 2 minutes
// FREEBIE
2017-02-08 10:33:43 -05:00
Michael Kirk
59059bc06c Remove unused code
A couple of weird things left after the CallInitiator refactor:

removed unused segue

confusingly, call direction was *always* incoming, even for outgoing
calls. But we weren't using it anyway.

// FREEBIE
2017-02-08 10:33:43 -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
bf1ed9a277 Don't show callkit description pre-iOS10 (#1722)
// FREEBIE
2017-02-08 10:11:39 -05:00
Michael Kirk
633e4a157e sync latest translations
// FREEBIE
2017-02-07 17:41:39 -05:00
Michael Kirk
c3971934fb bump build
// FREEBIE
2017-02-07 17:40:53 -05:00
Matthew Chen
4bc4fc4570 Merge branch 'charlesmchen/intersitialCallView' 2017-02-07 17:33:30 -05:00
Matthew Chen
734dec12e9 Respond to CR.
// FREEBIE
2017-02-07 17:33:13 -05:00
Matthew Chen
c43063e1d6 Add “interstitial call view” that is shown during lengthy “webrtc supported” check.
// FREEBIE
2017-02-07 17:17:06 -05:00