oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,044 Commits 5 Branches 133 Tags 227 MiB
Commit Graph

1044 Commits

Author SHA1 Message Date
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
Matthew Chen 5232899b14 Update Carthage to reflect WebRTC release build. 
// FREEBIE
 2017-01-31 11:28:56 -05:00
Matthew Chen 47c2b03802 Merge branch 'charlesmchen/webrtc/textShadows' into feature/webrtc 2017-01-30 18:28:38 -05:00
Matthew Chen b5aab60985 Respond to CR. 
// FREEBIE
 2017-01-30 18:27:52 -05:00
Matthew Chen e947276f73 Add drop shadows to text in call view. 
// FREEBIE
 2017-01-30 18:27:20 -05:00
Matthew Chen 8aca1b87dc Merge branch 'charlesmchen/webrtc/disableLocalVideoInBackground' into feature/webrtc 2017-01-30 18:25:15 -05:00
Matthew Chen 40b3d038db Disable local video in background. 
// FREEBIE
 2017-01-30 18:25:04 -05:00
Michael Kirk ae1a97196e Merge pull request #1658 from WhisperSystems/mkirk/webrtc/call-mux 
Better concurrent call handling
 2017-01-30 18:05:21 -05:00
Michael Kirk 141a1bd176 Disable half-working call-holding feature all together 
consolidated feature-disable logic for incoming/outgoing calls to make
it easier to document, and less likely to break when we *do* implement
CallHolding

// FREEBIE
 2017-01-30 16:13:59 -05:00
Michael Kirk 969b73cad8 Implement call holding (call swapping still broken). 
- Alice calls Bob on Signal and they start talking
- Charlie calls Alice on Not-Signal.
- Alice chooses to "Hold & Accept" putting Bob on Hold while the call with
  Charlie connects.
- If Alice ends the call with Charlie, we're back in Signal-iOS and
  talking to Bob, no problem.
- However, if, before ending the call with Charlie, Alice tries to swap
  *back* to bob, bob won't hear any audio in the callkit screen. Alice
  has to switch back to the Signal screen before the audio is transmitted.

// FREEBIE
 2017-01-30 16:13:58 -05:00
Michael Kirk e425d351c7 WIP: incoming non-signal call while in outgoing signal call 
Marking Signal-Call as started, changes the incoming call screen for
subsequent calls to show "Accept & End", "Send to VoiceMail" and "Accept
& Hold" instead of just "Accept" & "Decline"

Though - we don't support Holding. What we really want to see is just
"Accept & End" and "Decline | Send to Voicemail"

// FREEBIE
 2017-01-30 16:13:55 -05:00
Matthew Chen 08a0853bd2 Merge branch 'charlesmchen/webrtc/videoRefinements_' into feature/webrtc 2017-01-30 15:54:53 -05:00