Michael Kirk
4db2dec47a
mark profiles missing avatar files for redownload
2019-08-19 12:52:42 -06:00
Michael Kirk
c0c81b5e53
fix errant deletion of non-orphaned profile avatars
2019-08-19 12:52:42 -06:00
Michael Kirk
fcc7034038
Merge branch 'mkirk/message-request-inactive-user' into release/2.42.0
2019-08-19 12:46:20 -06:00
Michael Kirk
dff1f40af6
Don't show "message request" for de-registered system contacts
...
Fixes:
Alice installs Signal
Bob sees "Alice is on Signal" notification
(everything is as expected until this point)
Alice uninstalls Signal
Bob sees message request in Alice's conversation
2019-08-19 12:46:14 -06:00
Nora Trapp
67fa45ef96
Merge branch 'nt/photo-library-performance' into release/2.42.0
2019-08-19 10:34:15 -07:00
Lieven Dekeyser
fd2771cf67
#4236 : Synchronize collectionView selection state in willDisplay
2019-08-19 10:33:50 -07:00
Lieven Dekeyser
716a47ffe5
#4236 : trust the collection view dataSource to update cell selection state
2019-08-19 10:33:50 -07:00
Nora Trapp
a5fb710700
Don't fetch all collections when just looking up the default.
2019-08-19 10:33:50 -07:00
Nora Trapp
f2290a30e6
Merge branch 'nt/attachment-keyboard-add-more' into release/2.42.0
2019-08-19 10:32:58 -07:00
Nora Trapp
fd396aec1d
Allow canceling when picking a photo from recents.
2019-08-16 13:51:19 -07:00
Michael Kirk
d19e48da5c
"Add More" from recents selection
2019-08-16 13:51:19 -07:00
Michael Kirk
ef650e579f
Merge branch 'mkirk/fix-mark-as-unregistered' into release/2.42.0
2019-08-16 12:40:07 -06:00
Michael Kirk
550c76769d
fix mark as unregistered
...
because the update block gets called twice, it's not safe to pass in
a mutating reference to the method receiver.
2019-08-16 12:39:52 -06:00
Matthew Chen
37afbfadc0
Merge branch 'charlesmchen/removeAllException' into release/2.42.0
2019-08-16 11:28:58 -03:00
Matthew Chen
895cbe8c96
Fix exception in "remove all" logic.
2019-08-16 11:19:39 -03:00
Nora Trapp
0c1de9c103
Merge remote-tracking branch 'origin/release/2.41.1' into release/2.42.0
2019-08-15 19:23:21 -07:00
Nora Trapp
9c2696098b
Merge branch 'nt/thread-details' into release/2.42.0
2019-08-15 18:46:49 -07:00
Nora Trapp
86c3211609
Don't show thread details in note to self
2019-08-15 14:09:01 -07:00
Matthew Chen
c76ad6578d
"Bump build to 2.42.0.7."
2019-08-15 17:26:47 -03:00
Matthew Chen
e5fee5e12a
"Bump build to 2.42.0.6."
2019-08-15 17:26:16 -03:00
Matthew Chen
85614a800f
Merge branch 'charlesmchen/profileDeadlocks3' into release/2.42.0
2019-08-15 17:25:14 -03:00
Matthew Chen
eb5db2fd79
Respond to CR.
2019-08-15 17:24:15 -03:00
Matthew Chen
b19902d54e
Respond to CR.
2019-08-15 16:28:18 -03:00
Matthew Chen
f5fd583e75
Reduce usage of OWSUserProfile header.
2019-08-15 16:10:14 -03:00
Matthew Chen
60d07dd4d7
Clean up ahead of PR.
2019-08-15 16:10:14 -03:00
Matthew Chen
aa3eecb329
Address deadlocks in profile manager.
2019-08-15 16:10:14 -03:00
Matthew Chen
d308c566af
Address deadlocks in profile manager.
2019-08-15 16:10:14 -03:00
Matthew Chen
5ee8e755f3
Merge branch 'charlesmchen/orphanDataCleanerAssert' into release/2.42.0
2019-08-15 14:27:09 -03:00
Matthew Chen
c4c054b4ca
Fix spurious assert in orphan data cleaner.
2019-08-15 14:26:57 -03:00
Michael Kirk
5b80515619
Merge branch 'mkirk/faster-animations' into release/2.42.0
2019-08-15 09:35:02 -06:00
Michael Kirk
b31abfa0fc
speed up media presentation animations
2019-08-15 09:34:45 -06:00
Matthew Chen
4b03354276
Merge branch 'charlesmchen/stickerPackViewLoadingAndFailure' into release/2.42.0
2019-08-15 10:13:07 -03:00
Matthew Chen
73cbf76b2e
Handle "loading" and "load failed" cases in sticker pack view.
2019-08-15 10:12:54 -03:00
Matthew Chen
436c46a2ef
"Bump build to 2.41.1.2."
2019-08-14 20:03:33 -03:00
Matthew Chen
0270c20c43
Merge branch 'charlesmchen/simplify2FAPinVerification' into release/2.41.1
2019-08-14 20:03:25 -03:00
Matthew Chen
57fc2abd4c
Simplify 2FA PIN verification.
2019-08-14 20:02:57 -03:00
Matthew Chen
71fa178575
Merge branch 'charlesmchen/removeAsyncUIRead' into release/2.42.0
2019-08-14 19:33:36 -03:00
Matthew Chen
e10ffb2506
Remove asyncUIRead().
2019-08-14 19:29:35 -03:00
Matthew Chen
d27674a3f9
"Bump build to 2.41.1.1."
2019-08-14 18:09:08 -03:00
Matthew Chen
d0de5cee01
Update Cocoapods.
2019-08-14 18:08:32 -03:00
Matthew Chen
65ab5bfbbb
Revert "Enable 'nt/ios-13-ssl'."
...
This reverts commit e68b9dec10
2019-08-14 18:07:20 -03:00
Matthew Chen
34d8e9f4a6
Revert "Set feature flags for beta build."
...
This reverts commit 0ad0fbcf60
2019-08-14 18:07:15 -03:00
Matthew Chen
66fd34dbc8
Merge branch 'nt/registration-lock-fix_' into release/2.41.1
2019-08-14 18:06:11 -03:00
Nora Trapp
97b26a44fa
Fix an issue where registration lock PINs were truncated to 16 characters.
2019-08-14 18:03:36 -03:00
Matthew Chen
ff887ce0ce
Update Cocoapods.
2019-08-14 15:36:44 -03:00
Matthew Chen
1761f96bb5
Disable 'nt/ios-13-ssl'.
...
This reverts commit 2a9402d7d7
2019-08-14 15:35:34 -03:00
Matthew Chen
cb7ab1f67c
"Bump build to 2.42.0.5."
2019-08-13 16:58:43 -03:00
Matthew Chen
56a5317ea0
Merge branch 'mkirk/fixup-compiler-warnings' into release/2.42.0
2019-08-13 16:58:20 -03:00
Michael Kirk
bee54d1aea
fixup compiler warnings
2019-08-13 16:58:06 -03:00
Matthew Chen
ae80b200d2
Merge branch 'charlesmchen/removeYdbFix' into release/2.42.0
2019-08-13 16:36:13 -03:00
