Matthew Chen
b648165dbc
Merge branch 'charlesmchen/skipProfileUpgradeNag'
2017-09-01 15:26:19 -04:00
Matthew Chen
3d0300242a
Use "skip" not "stop" in profile upgrade nag.
...
// FREEBIE
2017-09-01 15:26:11 -04:00
Matthew Chen
43db34c998
Merge branch 'charlesmchen/fixFakeContacts'
2017-09-01 15:24:36 -04:00
Matthew Chen
94daccc78e
Fix fake contacts.
...
// FREEBIE
2017-09-01 15:24:27 -04:00
Matthew Chen
a35a21d5cc
Batch the creation of fake contacts.
...
// FREEBIE
2017-09-01 15:24:27 -04:00
Michael Kirk
49147a4991
Merge branch 'mkirk/fix-view-load'
2017-09-01 14:53:25 -04:00
Michael Kirk
1cd51a8df2
Use existing isViewLoaded var
...
Defined in UIKit, this will actually already do what we need without
having to define a new var
// FREEBIE
2017-09-01 14:39:52 -04:00
Michael Kirk
7f5975f02c
Merge branch 'mkirk/prod-crashes'
2017-09-01 12:56:59 -04:00
Michael Kirk
3b85c5e495
crashfix: production crash when notification fired before view loaded
...
We're observing notifications in init that modify the view, which is
problematic if we receive a notification before the view has loaded.
// FREEBIE
2017-09-01 12:56:50 -04:00
Michael Kirk
2cd2596ddc
crashfix: thread.uniqueId is sometimes nil in production
...
fail early and print diagnostics
// FREEBIE
2017-09-01 12:56:50 -04:00
Michael Kirk
bb8f6c1b73
crashfix: crash while accessing image property
...
assert on blind cast
// FREEBIE
2017-09-01 12:56:50 -04:00
Michael Kirk
2eaaba9082
crashfix: on addObject, presumably it's nil.
...
I'm not sure how this is happening, but this will prevent the crash and
give us additional diagnostic data in the cases where it is happening.
// FREEBIE
2017-09-01 12:56:50 -04:00
Matthew Chen
274fa25e6d
Bump build from to 2.16.0.12.
...
// FREEBIE
2017-08-31 17:31:55 -04:00
Matthew Chen
b8802729be
Merge branch 'charlesmchen/layoutGlitches'
2017-08-31 16:36:56 -04:00
Matthew Chen
1be49e4858
Update JSQMessagesViewController pod.
...
// FREEBIE
2017-08-31 16:36:21 -04:00
Matthew Chen
95eaa2c3bb
Preserve scroll state across conversation view layout changes, if possible.
...
// FREEBIE
2017-08-31 15:21:29 -04:00
Matthew Chen
b2c8ad2d29
Restore scroll state after resetting the conversation view's mapping.
...
// FREEBIE
2017-08-31 15:21:29 -04:00
Matthew Chen
7d32491968
Preserve scroll state across conversation view layout changes, if possible.
...
// FREEBIE
2017-08-31 15:21:27 -04:00
Matthew Chen
eaa1f4f318
Bump build from to 2.16.0.11.
...
// FREEBIE
2017-08-30 13:38:46 -04:00
Matthew Chen
894ba28021
Merge branch 'charlesmchen/isScrolledToBottom'
2017-08-30 13:00:16 -04:00
Matthew Chen
fce2ad2793
Refine the "is scrolled to bottom" logic to better handle new conversations.
...
// FREEBIE
2017-08-30 13:00:02 -04:00
Matthew Chen
4884473ea2
Merge branch 'charlesmchen/gifOfDeath'
2017-08-30 12:56:06 -04:00
Matthew Chen
bb1681f965
Respond to CR.
...
// FREEBIE
2017-08-30 12:53:02 -04:00
Matthew Chen
cc048b3971
Respond to CR.
...
// FREEBIE
2017-08-30 12:46:21 -04:00
Matthew Chen
ef21c6d50c
Ignore "GIF of death."
...
// FREEBIE
2017-08-30 12:46:21 -04:00
Matthew Chen
7f15228aba
Ignore "GIF of death."
...
// FREEBIE
2017-08-30 12:46:21 -04:00
Matthew Chen
5fcf89dff1
Ignore "GIF of death."
...
// FREEBIE
2017-08-30 12:46:21 -04:00
Matthew Chen
6a76fed3c1
Merge branch 'charlesmchen/keyboardShowVsScrollState'
2017-08-30 12:44:49 -04:00
Matthew Chen
b9908997c9
Remain scrolled to bottom after presenting the keyboard in messages view.
...
// FREEBIE
2017-08-30 12:44:10 -04:00
Matthew Chen
045d7efb2b
Merge branch 'charlesmchen/debugVsProduction'
2017-08-30 12:42:40 -04:00
Matthew Chen
d032339472
Modify debug builds to use production service.
...
// FREEBIE
2017-08-30 10:49:49 -04:00
Michael Kirk
6156fcb247
Merge branch 'mkirk/fix-provisioning-cipher'
2017-08-30 09:47:41 -04:00
Michael Kirk
01d0117f9b
provisioning cipher: Fix memory leak, handle failure
...
Explicitly malloc'd buffer should either be explicitly free'd or
ownership given to NSData via `freeWhenDone:YES`
Instead I opted to avoid the explict malloc altogether, and avoided some
unnecessary allocations.
Also made sure encryption failures propogate to error handler
// FREEBIE
2017-08-30 09:47:29 -04:00
Michael Kirk
1f7b6f61c6
Regression test for provisioning cipher
...
// FREEBIE
2017-08-30 09:47:29 -04:00
Matthew Chen
59f2c4674c
Bump build from to 2.16.0.10.
...
// FREEBIE
2017-08-29 17:31:05 -04:00
Matthew Chen
d7b0b6a253
Fix build break in production builds.
...
// FREEBIE
2017-08-29 17:30:56 -04:00
Matthew Chen
43dddf9312
Bump build from to 2.16.0.9.
...
// FREEBIE
2017-08-29 17:16:59 -04:00
Michael Kirk
1e31eb6cdd
Merge branch 'mkirk/sync-whitelist'
2017-08-29 17:09:51 -04:00
Michael Kirk
bdb75fa596
infer when group has been whitelisted on linked device
...
// FREEBIE
2017-08-29 17:09:28 -04:00
Matthew Chen
e97de35992
Merge branch 'charlesmchen/dontIgnoreAttachments'
2017-08-29 16:36:00 -04:00
Matthew Chen
b00db33d12
Don't ignore attachments.
...
// FREEBIE
2017-08-29 16:35:52 -04:00
Matthew Chen
0cc169e603
Merge branch 'charlesmchen/syncLocalProfile'
2017-08-29 16:31:34 -04:00
Matthew Chen
3c90c3361a
Respond to CR.
...
// FREEBIE
2017-08-29 16:31:27 -04:00
Matthew Chen
71d7490e35
Re-sync local profile state with service if necessary.
...
// FREEBIE
2017-08-29 16:29:54 -04:00
Matthew Chen
cf7f9dabfe
Merge branch 'charlesmchen/rtlVsSystemMessages'
2017-08-29 16:27:00 -04:00
Matthew Chen
ac3743f810
Fix RTL layout of system message cells.
...
// FREEBIE
2017-08-29 16:26:23 -04:00
Matthew Chen
de98d3c152
Merge branch 'charlesmchen/messageViewScrollStateAgain'
2017-08-29 16:25:36 -04:00
Matthew Chen
92a0fbe01b
Fix yet another edge case around message view scroll state.
...
// FREEBIE
2017-08-29 13:30:56 -04:00
Matthew Chen
4a2ca15b70
Fix build break around parameter name.
...
// FREEBIE
2017-08-29 12:26:41 -04:00
Matthew Chen
70cbfb9ec0
Merge branch 'charlesmchen/messageViewScrollStateRevisited'
2017-08-29 12:21:05 -04:00