Commit graph

4977 commits

Author SHA1 Message Date
Matthew Chen 61666351cc Update l10n strings. 2017-11-21 18:22:07 -05:00
Matthew Chen 5f9f63d897 Merge branch 'charlesmchen/unreadEdgeCases' 2017-11-21 18:18:21 -05:00
Matthew Chen 2d241623b7 Improve handling of edge cases around unread indicator delimiting deleted message(s). 2017-11-21 18:17:19 -05:00
Matthew Chen 368ad922d6 Merge branch 'charlesmchen/unreadVsConversationUI' 2017-11-21 17:53:59 -05:00
Matthew Chen 5ef9d53c91 Update conversation view UI to reflect unread state. 2017-11-21 17:53:52 -05:00
Matthew Chen b3d9363961 Merge branch 'charlesmchen/forceConversationCellLayout' 2017-11-21 17:52:20 -05:00
Matthew Chen ef820a3719 Force conversation view cells to update layout immediately.
// FREEBIE
2017-11-21 17:52:14 -05:00
Matthew Chen 0cda3661f1 Merge branch 'charlesmchen/unknownCountry' 2017-11-21 17:50:00 -05:00
Matthew Chen 9b4ac4073f Improve robustness around unknown country codes. 2017-11-21 17:48:00 -05:00
Michael Kirk 73655de3d9 bump build
// FREEBIE
2017-11-21 12:26:02 -05:00
Michael Kirk 7d6f37b0e1 Sync translations
// FREEBIE
2017-11-21 12:21:52 -05:00
Michael Kirk e1c50103b6 Merge branch 'mkirk/insert-unread-indicator' 2017-11-21 11:52:54 -05:00
Michael Kirk 370364c936 Scroll down button scrolls to unread
// FREEBIE
2017-11-21 11:42:33 -05:00
Matthew Chen ed0e0fadcd Merge branch 'charlesmchen/scrollDownButtonVsRTL' 2017-11-21 11:28:14 -05:00
Matthew Chen b0c9add29c Update layout of "scroll down button" to reflect RTL. 2017-11-21 11:27:01 -05:00
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