Commit graph

7135 commits

Author SHA1 Message Date
Matthew Chen 1a3737d5c6 Respond to CR. 2018-05-16 16:32:10 -04:00
Matthew Chen 530983c161 Build & enqueue network requests async. 2018-05-16 16:30:40 -04:00
Matthew Chen 7a37b3d0b6 Merge branch 'charlesmchen/readVsVisible' 2018-05-16 16:30:16 -04:00
Matthew Chen f6106512db Only mark messages read in conversation view if visible. 2018-05-16 16:30:01 -04:00
Matthew Chen e908413c13 Merge branch 'charlesmchen/peerConnectionClientDelegateCleanup' 2018-05-16 16:29:18 -04:00
Matthew Chen 157f7617ca Respond to CR. 2018-05-16 16:28:48 -04:00
Matthew Chen 3d5cbb73fb Rework cleanup of peer connection client delegates. 2018-05-16 16:28:48 -04:00
Michael Kirk 547605885e Merge branch 'mkirk/localize-all-phone-types' 2018-05-16 13:23:30 -04:00
Michael Kirk f652ecef99 localize _Main_ and other CN label types
// FREEBIE
2018-05-15 17:40:41 -04:00
Matthew Chen a62e86c7ab Revert "Disable contact sharing."
This reverts commit e27af7a66d.
2018-05-15 17:07:18 -04:00
Matthew Chen 3f5d8aa9ba "Bump build to 2.25.0.22." 2018-05-15 17:06:57 -04:00
Matthew Chen e27af7a66d Disable contact sharing. 2018-05-15 17:06:54 -04:00
Michael Kirk 5d4b34504d Merge branch 'mkirk/return-navigation-bars' 2018-05-15 17:06:12 -04:00
Michael Kirk c3274f4e7b Fix navbar after using message button in contact card
I removed this earlier - but turns out we still need this strong
reference, even though we're now using willDissapear instead of
didDissappear.

// FREEBIE
2018-05-15 17:03:38 -04:00
Matthew Chen 986e3e0925 Revert "Disable contact sharing."
This reverts commit e138c73bdc.
2018-05-15 17:01:29 -04:00
Matthew Chen 3988654469 "Bump build to 2.25.0.21." 2018-05-15 17:01:14 -04:00
Matthew Chen e138c73bdc Disable contact sharing. 2018-05-15 17:00:41 -04:00
Matthew Chen 443b3c2886 Merge branch 'charlesmchen/profileKeyProtos' 2018-05-15 16:21:03 -04:00
Matthew Chen b74f545a64 Fix profile key protos. 2018-05-15 16:20:56 -04:00
Michael Kirk 4ba0fde3e9 Merge branch 'mkirk/mark-as-read-fix' 2018-05-15 16:17:10 -04:00
Michael Kirk 54f7373037 Clean up logging, start messages timer regardless of current
configuration

// FREEBIE
2018-05-15 15:13:58 -04:00
Matthew Chen 68d70da194 "Bump build to 2.25.0.20." 2018-05-15 14:13:33 -04:00
Matthew Chen c14a021ae3 Update l10n strings. 2018-05-15 14:13:24 -04:00
Michael Kirk 127224ad23 Merge branch 'mkirk/resume-read-timer-on-activation' 2018-05-15 13:23:29 -04:00
Michael Kirk 30cef1f084 start readtimer whenever we become active
// FREEBIE
2018-05-15 12:56:47 -04:00
Michael Kirk 90289bbf72 Merge branch 'mkirk/nav-bar-style' 2018-05-15 10:04:19 -04:00
Michael Kirk 117d7319d2 Add contact modally and restore navbar style when dismssing contacts
// FREEBIE
2018-05-14 18:40:56 -04:00
Matthew Chen 4949ade274 Revert "Disable contact sharing."
This reverts commit e8b41789d7.
2018-05-14 16:58:33 -04:00
Matthew Chen a376de01ef "Bump build to 2.25.0.19." 2018-05-14 16:58:16 -04:00
Matthew Chen bf205c9df7 Merge branch 'charlesmchen/unregisteredUsers' 2018-05-14 16:57:04 -04:00
Matthew Chen e6dceffdbd Respond to CR. 2018-05-14 16:56:49 -04:00
Matthew Chen 5c7b98e5c4 Improve handling of unregistered users. 2018-05-14 16:45:06 -04:00
Matthew Chen d81e400693 Update l10n strings. 2018-05-14 16:33:59 -04:00
Matthew Chen e8b41789d7 Disable contact sharing. 2018-05-14 16:24:12 -04:00
Matthew Chen 51da7ebdf7 "Bump build to 2.25.0.18." 2018-05-14 15:33:01 -04:00
Matthew Chen 115e6b4c4b Merge branch 'charlesmchen/sendToSentMarkAsSent' 2018-05-14 14:53:31 -04:00
Matthew Chen 8489c55fde Mark send-to-self as sent. 2018-05-14 14:41:45 -04:00
Michael Kirk 9fbcd790f0 Merge branch 'mkirk/fix-cancel-add-crash' 2018-05-14 14:03:39 -04:00
Michael Kirk 704a6f55a0 Fix crash after canceling "Add New Contact"
Text of the exception is:
  "Impossible to set up layout with view hierarchy unprepared for constraint"

Since their container view is pinned to the top layout guide, this
should not change the layout.

// FREEBIE
2018-05-14 14:03:25 -04:00
Matthew Chen ba95034ce7 Merge branch 'charlesmchen/avatarSeed' 2018-05-14 14:00:30 -04:00
Matthew Chen 152e1d7983 Respond to CR. 2018-05-14 14:00:22 -04:00
Matthew Chen ca09d00e2e Use signal id as avatar color seed if possible. 2018-05-14 12:48:07 -04:00
Matthew Chen 6ccce6754c Merge branch 'charlesmchen/loadViewVsScreenLock' 2018-05-14 12:05:27 -04:00
Matthew Chen edabe50678 Respond to CR. 2018-05-14 12:05:14 -04:00
Matthew Chen a26cba3de1 Don't show screen block until app is ready. 2018-05-14 12:05:14 -04:00
Matthew Chen 726da0ca97 Merge branch 'charlesmchen/homeViewFixes' 2018-05-14 12:03:58 -04:00
Matthew Chen aa4345f9c1 Fix edge cases in home view. 2018-05-14 12:03:52 -04:00
Matthew Chen 53fb8787fa Merge branch 'charlesmchen/caseInsensitiveContactSort' 2018-05-14 11:55:37 -04:00
Matthew Chen 0b488f1a65 Use case-insensitive comparison when sorting contacts. 2018-05-14 11:55:30 -04:00
Matthew Chen ed872beda7 Merge branch 'charlesmchen/noEcho' 2018-05-14 11:52:25 -04:00