Commit graph

1055 commits

Author SHA1 Message Date
Michael Kirk
0a95dac616 pull latest translations
Most of these haven't actually been translated yet.

// FREEBIE
2017-02-02 20:32:17 -05:00
Michael Kirk
158fe78ae2 bump build
// FREEBIE
2017-02-02 20:26:05 -05:00
Michael Kirk
a6b5555910 fixup, return nil, not 0
// FREEBIE
2017-02-02 19:12:07 -05:00
Michael Kirk
2a9aa4c852 users can opt out of CallKit
// FREEBIE
2017-02-02 19:09:37 -05:00
Michael Kirk
d8df4b9e35 Can receive calls while in settings
The existing presented settings (or fingerprint verification) modals
were preventing the display of the incoming call modal.

// FREEBIE
2017-02-02 18:35:38 -05:00
Matthew Chen
f864207d48 Merge branch 'feature/simultaneousCalls' 2017-02-02 18:22:52 -05:00
Matthew Chen
5687925513 Prevent simultaneous incoming and outgoing calls from leaving CallService in a bad state.
// FREEBIE
2017-02-02 18:22:32 -05:00
Matthew Chen
19aa4b5b8c Merge branch 'charlesmchen/webrtc/busySignal' 2017-02-02 18:19:56 -05:00
Matthew Chen
0893930485 Handle “busy signal” appropriately.
// FREEBIE
2017-02-02 18:19:38 -05:00
Michael Kirk
90c5d4d237 Merge pull request #1686 from WhisperSystems/release/2.7.0
WebRTC and CallKit changes
2017-02-02 18:18:09 -05:00
Michael Kirk
08425853cf re-use shared call strings
// FREEBIE
2017-02-02 17:42:23 -05:00
Michael Kirk
a339f52564 Only touch mutable dict only main thread
* and make nonatomic since we're only assigning it in init

// FREEBIE
2017-02-02 17:29:49 -05:00
Michael Kirk
5d0d1b725b Already on the main thread
* simplify code
* fix typo

// FREEBIE
2017-02-02 17:22:36 -05:00
Michael Kirk
947d345837 SSK update to include latest master (which now includes CallKit)
// FREEBIE
2017-02-02 17:13:53 -05:00
Michael Kirk
6b4dedfefe revert WebRTC related changes to AppAudioManager
Initially we were using AppAudioManager in our WebRTC calling
implementation to manage call related audio, but our differences from
how redphone uses the AppAudioManager diverged too much, so instead
we're instead using CallAudioManager.

reverting these changes lest we inadvertently break something re:
RedPhone.

// FREEBIE
2017-02-02 17:00:27 -05:00
Michael Kirk
b6f098bfa7 Log when receiving unknown call datachannel message
// FREEBIE
2017-02-02 15:51:07 -05:00
Matthew Chen
b868f07c33 Merge remote-tracking branch 'origin/feature/webrtc' into release/2.7.0 2017-02-02 10:15:53 -05:00
Matthew Chen
a4c1303665 Merge branch 'charlesmchen/webrtc/threadSafety2' into feature/webrtc 2017-02-01 22:04:37 -05:00
Matthew Chen
36356fbff6 Avoid crashes when closing peer connection client.
// FREEBIE
2017-02-01 21:55:10 -05:00
Matthew Chen
dacb2840f2 Avoid crashes when closing peer connection client.
// FREEBIE
2017-02-01 21:52:01 -05:00
Matthew Chen
f81feca2d6 Avoid crashes when closing peer connection client.
// FREEBIE
2017-02-01 21:52:01 -05:00
Michael Kirk
7361418274 Merge remote-tracking branch 'origin/master' into feature/webrtc 2017-02-01 20:10:13 -05:00
Michael Kirk
e272684ea0 Merge branch 'mkirk/webrtc/call-activity-2' into feature/webrtc 2017-02-01 19:51:55 -05:00
Michael Kirk
cd36123bf1 rename method to better reflect how its used
// FREEBIE
2017-02-01 19:50:21 -05:00
Michael Kirk
7e825648ef Show alert when trying to call a non-signal contact from Contacts.
// FREEBIE
2017-02-01 19:22:25 -05:00
Michael Kirk
b35c20a06b Don't handle intents pre iOS10.
// FREEBIE
2017-02-01 18:56:38 -05:00
Michael Kirk
17b89f44aa share global callUIAdapter, outboundCallInitiator
// FREEBIE
2017-02-01 18:56:38 -05:00
Michael Kirk
bbfd9ba74d Place Signal/Redphone calls from system contacts
// FREEBIE
2017-02-01 18:56:37 -05:00
Matthew Chen
535770a92e Avoid crashes when closing peer connection client.
// FREEBIE
2017-02-01 17:58:54 -05:00
Matthew Chen
4dec1e2ded Avoid crashes when closing peer connection client.
// FREEBIE
2017-02-01 17:38:17 -05:00
Matthew Chen
724a1c9b20 Merge branch 'charlesmchen/webrtc/threadSafety_' into feature/webrtc 2017-02-01 15:10:58 -05:00
Matthew Chen
d4ba4c446b Respond to CR.
// FREEBIE
2017-02-01 14:43:47 -05:00
Matthew Chen
b415b6142f Respond to CR, mainly by fixing broken tests.
// FREEBIE
2017-02-01 12:26:10 -05:00
Matthew Chen
49bb3d942d Clean up ahead of PR.
// FREEBIE
2017-02-01 10:44:29 -05:00
Matthew Chen
d294557bdd Rework concurrency in the signaling logic.
// FREEBIE
2017-02-01 10:24:23 -05:00
Matthew Chen
dd374afdaa Rework concurrency in the signaling logic.
// FREEBIE
2017-02-01 09:43:16 -05:00
Matthew Chen
d6c849eab3 Revert whitespace changes.
// FREEBIE
2017-02-01 09:43:16 -05:00
Matthew Chen
af289145b5 Rework concurrency in the signaling logic.
// FREEBIE
2017-02-01 09:43:16 -05:00
Matthew Chen
5929061291 Merge branch 'charlesmchen/webrtc/audioMode' into feature/webrtc 2017-02-01 09:19:28 -05:00
Matthew Chen
d0b2aaac27 Specify AVAudioSession modes for calls.
// FREEBIE
2017-02-01 09:19:18 -05:00
Michael Kirk
f1d8434868 More space for non-callkit incoming call buttons (#1660)
* More space for non-callkit incoming call buttons

The "decline" and "accept" were too close together. Added a spacer, the
same size as an extra button between the two.

* Tweak spacing in call view rows.

// FREEBIE
2017-02-01 09:13:57 -05:00
Matthew Chen
9e3f32a39b Merge branch 'charlesmchen/webrtc/logReconnect' into feature/webrtc 2017-01-31 17:10:42 -05:00
Matthew Chen
8454c7dc2f Log reconnect events as such.
// FREEBIE
2017-01-31 17:10:29 -05:00
Matthew Chen
60c67793a7 Merge branch 'charlesmchen/webrtc/connectedSpeakerphone' into feature/webrtc 2017-01-31 17:09:59 -05:00
Matthew Chen
5dd4655672 Ensure audio state when call connects.
// FREEBIE
2017-01-31 17:09:45 -05:00
Matthew Chen
10eb4beb08 Merge branch 'feature/hardResetGitScript' into feature/webrtc 2017-01-31 13:58:21 -05:00
Matthew Chen
a5cb9b11ee Hard reset git script. 2017-01-31 13:58:13 -05:00
Michael Kirk
feb5a9ed3a [SSK] fix crash when messaging newly unregistered
// FREEBIE
2017-01-31 12:46:22 -05:00
Michael Kirk
f9497240e2 bump release target
// FREEBIE
2017-01-31 12:44:25 -05:00
Matthew Chen
faf1946bab Merge branch 'charlesmchen/webrtc/webrtcVsCarthage' into feature/webrtc 2017-01-31 12:23:45 -05:00