Commit Graph

4912 Commits

Author SHA1 Message Date
Matthew Chen
ce9e2fb197 Merge branch 'charlesmchen/contactsSyncDeadlock' 2017-11-21 11:23:03 -05:00
Matthew Chen
d9fcfdeeb7 Fix deadlock when responding to contacts sync messages. 2017-11-21 11:21:08 -05:00
Matthew Chen
9b197fad03 Fix deadlock when responding to contacts sync messages. 2017-11-21 11:21:08 -05:00
Matthew Chen
93927801ee Merge branch 'charlesmchen/swipeTransitionVsRTL' 2017-11-21 11:17:13 -05:00
Matthew Chen
92ef507810 Make swipe-for-details RTL-safe. 2017-11-21 11:17:05 -05:00
Michael Kirk
596206557f bump build
// FREEBIE
2017-11-20 17:44:27 -05:00
Michael Kirk
358612542e pull translations
// FREEBIE
2017-11-20 17:44:08 -05:00
Michael Kirk
74f98067f9 bump build
// FREEBIE
2017-11-20 17:39:56 -05:00
Michael Kirk
7c0d372aac Merge branch 'charlesmchen/autoDismissKeyboardVsPanSettle' 2017-11-20 17:17:54 -05:00
Matthew Chen
a07e1e0cf9 For most views, only try to dismiss keyboard when scroll drag starts. 2017-11-20 17:17:49 -05:00
Michael Kirk
4ca2e10ddc Merge branch 'charlesmchen/conversationScrollEdgeCase' 2017-11-20 17:17:14 -05:00
Matthew Chen
aea2bf3e00 Fix scroll state insets in conversation view. 2017-11-20 17:17:10 -05:00
Matthew Chen
28fe073c5e Merge branch 'mkirk/update-outgoing-call' 2017-11-20 17:08:17 -05:00
Matthew Chen
5cfa7e35f4 Respond to CR. 2017-11-20 17:08:10 -05:00
Michael Kirk
34811a635b Fixes: "connected call" showing as "unconnected outgoing" call.
Expire viewItem cache when resetting mappings

// FREEBIE
2017-11-20 17:04:54 -05:00
Matthew Chen
3ab9337bf1 Merge branch 'charlesmchen/logTags' 2017-11-20 16:52:06 -05:00
Matthew Chen
b76d9a4e68 Remove redundant logTag methods. 2017-11-20 16:51:58 -05:00
Matthew Chen
a4879f6bb5 Remove redundant logTag methods. 2017-11-20 16:51:58 -05:00
Matthew Chen
1fa9deca62 Merge branch 'charlemschen/noCentroidNoPeace' 2017-11-20 16:51:33 -05:00
Matthew Chen
8eb4e682d9 Revert "Show menu controller from centroid of message cells."
This reverts commit 08bb1c909d.
2017-11-20 15:21:48 -05:00
Matthew Chen
86d839d870 Merge branch 'charlesmchen/tweakJumbomoji' 2017-11-20 15:02:54 -05:00
Matthew Chen
cebeea9189 Reduce extremes of Jumbomoji behavior. 2017-11-20 15:02:45 -05:00
Matthew Chen
72fba87746 Merge branch 'charlesmchen/conversationUpdateEdgeCases_' 2017-11-20 14:51:07 -05:00
Matthew Chen
d8ae5841d6 Respond to CR.
// FREEBIE
2017-11-20 14:50:43 -05:00
Matthew Chen
b3d17ea192 Improving handling of edge cases in conversation view. 2017-11-20 14:44:10 -05:00
Matthew Chen
45c7d80d97 Improving handling of edge cases in conversation view. 2017-11-20 14:44:10 -05:00
Matthew Chen
6d4a05bbea Improving handling of edge cases in conversation view. 2017-11-20 14:44:10 -05:00
Matthew Chen
658746093d Use finalIndex in row changes. 2017-11-20 14:44:10 -05:00
Michael Kirk
bb22adbeba Merge branch 'mkirk/calling-edgecases' 2017-11-20 14:41:24 -05:00
Michael Kirk
86c1a3d08a CR: use weak capture
// FREEBIE
2017-11-20 14:41:00 -05:00
Michael Kirk
30b50e1489 Activate audio at the proper time
// FREEBIE
2017-11-20 14:35:16 -05:00
Michael Kirk
81f097c1f5 Don't drop critical data messages
Assigning dataChannel sometimes happens after iceConnect.

Fixes symptom where Alice calls Bob.
Bob answers and sees the call UI as normal
but Alice sees call as continuing to ring

// FREEBIE
2017-11-20 14:35:16 -05:00
Michael Kirk
2e75e9df55 Don't ignore critical errors
// FREEBIE
2017-11-20 14:35:16 -05:00
Michael Kirk
91f25bec3c Remove overzealous assert
// FREEBIE
2017-11-20 14:35:16 -05:00
Michael Kirk
2ed80249c6 Merge branch 'mkirk/pop-keyboard-on-compose' 2017-11-20 14:35:01 -05:00
Michael Kirk
8ee030bea1 Don't dismiss keyboard when view appears
// FREEBIE
2017-11-20 14:30:55 -05:00
Matthew Chen
df8204ac12 Merge branch 'charlesmchen/pushTokensAbout' 2017-11-20 14:11:58 -05:00
Matthew Chen
ceac36f910 Respond to CR.
// FREEBIE
2017-11-20 14:11:49 -05:00
Matthew Chen
6e60d99ecf Show push tokens in about view.
// FREEBIE
2017-11-20 14:10:37 -05:00
Matthew Chen
9b14c77775 Merge branch 'charlesmchen/contentInset2' 2017-11-20 14:06:08 -05:00
Matthew Chen
e9bace34ba Fix "sliding tables" issue in linked devices view. 2017-11-20 14:05:57 -05:00
Michael Kirk
115fefdbe4 Merge branch 'mkirk/replace-missing-call-icon' 2017-11-20 14:04:10 -05:00
Michael Kirk
abb57f2a15 App icon for system call screen
On iOS10 there was a default "..." button, but now we need our own.

// FREEBIE
2017-11-20 14:04:04 -05:00
Michael Kirk
af1fb5444a Merge branch 'mkirk/contact-perms' 2017-11-20 14:00:37 -05:00
Michael Kirk
7fd3d665dc Request contacts as necessary when app is brought back to the foreground
// FREEBIE
2017-11-20 14:00:25 -05:00
Michael Kirk
01e1d10c30 Only show contact nag if we've denied contact access
// FREEBIE
2017-11-20 14:00:25 -05:00
Matthew Chen
bae0e294de Merge branch 'charlesmchen/endEditingLeaveConversation' 2017-11-20 13:13:18 -05:00
Matthew Chen
7b1a846f79 Dismiss keyboard when leaving conversation view. 2017-11-20 13:12:57 -05:00
Matthew Chen
46b3540d89 Merge branch 'charlesmchen/fixGroupCreation' 2017-11-17 16:06:36 -05:00
Matthew Chen
2642f6fcea Fix group creation. 2017-11-17 16:06:30 -05:00