Michael Kirk
ef25b9c191
Merge branch 'mkirk/fixup-test-build' into release/2.31.0
2018-10-29 13:37:45 -06:00
Michael Kirk
90500475f1
fixup searcher test
2018-10-29 12:20:27 -06:00
Michael Kirk
159c546d16
update test environment
2018-10-29 12:20:14 -06:00
Michael Kirk
af19405178
update carthage build path for tests
2018-10-29 12:19:57 -06:00
Matthew Chen
faa5561639
"Bump build to 2.31.0.17."
2018-10-26 17:33:48 -04:00
Michael Kirk
2e3a32e7dc
Merge branch 'mkirk/disable-proximity' into release/2.31.0
2018-10-26 15:32:24 -06:00
Michael Kirk
6968dbab17
Update UIDevice on main thread
2018-10-26 15:32:12 -06:00
Michael Kirk
b0a6d18576
leave proximity enabled as long as CallViewController exists
2018-10-26 15:32:12 -06:00
Michael Kirk
5632bd2d83
Use reference counting to disable proximity monitoring after audio message
...
Multiple overlapping activities require proximity monitoring (namely,
CallViewController and listening to audio messages).
These activities can overlap arbitrarily, so we use a reference counting
strategy to keep proximity monitoring on as long as one of these activities is
active.
2018-10-26 15:32:12 -06:00
Michael Kirk
7f37400f1d
Merge branch 'mkirk/fix-missing-own-avatar-after-key-rotation' into release/2.31.0
2018-10-26 15:31:30 -06:00
Michael Kirk
68353631d4
copy avatar file when rotating, since updating avatarURL entails removing the underlying file
2018-10-26 15:31:21 -06:00
Matthew Chen
9a65c8326c
Merge branch 'charlesmchen/smallUDTweaks' into release/2.31.0
2018-10-26 17:30:42 -04:00
Matthew Chen
33f0a32e59
Improve UD logging.
2018-10-26 17:21:49 -04:00
Matthew Chen
302da66017
Fix UD access logic.
2018-10-26 17:21:23 -04:00
Matthew Chen
514c7b603a
"Bump build to 2.31.0.16."
2018-10-26 16:12:42 -04:00
Matthew Chen
c556d0c722
Merge branch 'charlesmchen/unrestrictedRandomProfileGets' into release/2.31.0
2018-10-26 16:11:57 -04:00
Matthew Chen
15e6916bae
Update Cocoapods.
2018-10-26 16:11:24 -04:00
Matthew Chen
737f64b761
Improve UD logging.
2018-10-26 16:09:20 -04:00
Matthew Chen
ad59b2f6d2
Move "ud access for sends" logic into UD manager.
2018-10-26 16:09:20 -04:00
Matthew Chen
3f10ce7408
Tweak profile fetch auth behavior in unknown mode case.
2018-10-26 16:09:20 -04:00
Matthew Chen
36f39d9a30
Remove SSKUnidentifiedAccess.
2018-10-26 16:09:20 -04:00
Matthew Chen
7de289f6be
Remove SSKUnidentifiedAccess.
2018-10-26 16:09:20 -04:00
Matthew Chen
5d18497ade
Try random UD access keys in profile gets.
2018-10-26 16:09:20 -04:00
Matthew Chen
dbe635f721
Try random UD access keys in profile gets.
2018-10-26 16:09:20 -04:00
Matthew Chen
b65d515ac3
Update cocoapods.
2018-10-26 16:08:56 -04:00
Matthew Chen
0cf24e39a8
Merge branch 'charlesmchen/avatarIconQuality' into release/2.31.0
2018-10-26 15:18:55 -04:00
Matthew Chen
408008d3e7
Use different contact avatar assets depending on size of output.
2018-10-26 15:18:45 -04:00
Matthew Chen
4ea6d72008
Improve default avatar quality.
2018-10-26 15:18:45 -04:00
Matthew Chen
a602a807f6
Merge branch 'charlesmchen/moreStartupLogging' into release/2.31.0
2018-10-26 15:18:10 -04:00
Matthew Chen
bf1f9e706a
Exclude date/time and Xcode version info in debug builds to avoid churn.
2018-10-26 15:17:37 -04:00
Matthew Chen
ed4fa2e8cb
Respond to CR.
2018-10-26 14:44:53 -04:00
Matthew Chen
38f3321e9a
Improve startup logging.
2018-10-26 14:44:53 -04:00
Matthew Chen
c879878d68
Merge branch 'charlesmchen/contactManagerDeadlocks' into release/2.31.0
2018-10-26 14:44:08 -04:00
Matthew Chen
70f274598c
Avoid deadlocks in contact manager.
2018-10-26 14:19:04 -04:00
Matthew Chen
f26241ebd0
Avoid deadlocks in contact manager.
2018-10-26 14:10:58 -04:00
Matthew Chen
bf140971e2
Merge branch 'charlesmchen/consistentAvatarColors' into release/2.31.0
2018-10-25 15:39:32 -04:00
Matthew Chen
5b339a642b
Respond to CR.
2018-10-25 15:39:16 -04:00
Matthew Chen
25ed886e72
Update home and group cells' dependencies.
2018-10-25 09:48:58 -04:00
Matthew Chen
763acae158
Use thread to ensure consistent colors in contact cells.
2018-10-25 09:48:57 -04:00
Matthew Chen
28f37a7a34
Update contacts cells' dependencies.
2018-10-25 09:48:57 -04:00
Matthew Chen
08518c66bf
Merge branch 'charlesmchen/groupAvatarUpdateAsserts' into release/2.31.0
2018-10-24 17:12:04 -04:00
Matthew Chen
278c61fd16
Remove assert around group avatar updates.
2018-10-24 17:11:48 -04:00
Matthew Chen
cc97090ef2
Merge branch 'charlesmchen/logWebRTCVersion' into release/2.31.0
2018-10-24 16:59:12 -04:00
Matthew Chen
8e1103c28f
Log WebRTC version.
2018-10-24 16:58:45 -04:00
Matthew Chen
8cb62e7f8e
"Bump build to 2.31.0.15."
2018-10-24 11:43:38 -04:00
Matthew Chen
81d6b60ad5
Fix icon layout in privacy settings.
2018-10-24 11:43:28 -04:00
Matthew Chen
7868bed2a2
Merge branch 'charlesmchen/syncMessagesForSuccess' into release/2.31.0
2018-10-24 11:37:46 -04:00
Matthew Chen
9df94b8477
Rework sync transcript sending.
2018-10-24 10:53:23 -04:00
Matthew Chen
6f6612048d
"Bump build to 2.31.0.14."
2018-10-24 10:07:25 -04:00
Michael Kirk
0270423a17
Merge branch 'mkirk/voicenote-earpiece' into release/2.31.0
2018-10-24 07:49:27 -06:00
