Commit Graph

22799 Commits

Author SHA1 Message Date
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
Matthew Chen
f61233763c Merge branch 'charlesmchen/fixTableViewLayout' 2017-11-17 16:05:14 -05:00
Matthew Chen
e79613184a Respond to CR.
// FREEBIE
2017-11-17 16:04:54 -05:00
Matthew Chen
089e4a4a02 Fix layout of table views vs. nav bar. 2017-11-17 09:51:37 -05:00
Matthew Chen
334cecf5a0 Merge branch 'charlesmchen/dynamicJumbomoji' 2017-11-16 18:26:12 -05:00
Matthew Chen
572de11763 Apply dynamic type sizing to Jumbomoji. 2017-11-16 18:25:59 -05:00
Matthew Chen
cc32e52de1 Bump build to 2.19.0.16.
// FREEBIE
2017-11-16 18:02:26 -05:00
Matthew Chen
0ffa79df6c Bump build to 2.19.0.15.
// FREEBIE
2017-11-16 18:01:18 -05:00
Matthew Chen
a5c98ca271 Merge branch 'charlesmchen/skipAnimationsInConversations' 2017-11-16 17:59:41 -05:00
Matthew Chen
937ac5830d Skip animations in conversation view. 2017-11-16 17:59:32 -05:00
Matthew Chen
b67179b45d Skip animations in conversation view. 2017-11-16 17:53:05 -05:00
Matthew Chen
7862345ec4 Merge branch 'charlesmchen/backButtonRevisited_' 2017-11-16 17:32:45 -05:00
Matthew Chen
0ccddb696a Add workaround for bug in iOS 11.1 beta around hit area of custom back buttons.
// FREEBIE
2017-11-16 17:32:39 -05:00
Matthew Chen
12aa31192c Merge branch 'charlesmchen/loadMoreFontSize' 2017-11-16 17:31:15 -05:00