Commit Graph

6612 Commits

Author SHA1 Message Date
Michael Kirk
c88ce07f66 CR: Clean up comments, use property setter instead of ivar
// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
eb140a6839 Timer info messages *before* the message which changed the timer
// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
a9e7c5e879 Cleanup: simplify migration, remove unused code
// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
b039fdd276 UI Fix: start with full hourglass on short timer durations
We were positioning relative to "blink" time (2s), rather than delete
time, which means that for 10s timers we were starting as though only 8s
remained.

// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
754549adf1 Start timer for expiring message based on when read receipt was sent
// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
dfb2a034af Use explicit transactions.
- Start expiration within scope of existing transaction when we're
  already in a transaction

// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
b7625689cb Simplify reasoning around disappearing messages
1. Max duration between runs is now a separate timer we set up once and
   don't touch, so we can separate any potential bugs in scheduling logic.
2. When we want to "run now" we just run now, rather than going through
   the scheduler.
3. Detect if messages aren't being deleted in a timely way.

// FREEBIE
2018-04-18 15:32:01 -04:00
Michael Kirk
57ae2b173f Clarify existing functionality, but no change in behavior
rename vars
use clearer date comparison method

// FREEBIE
2018-04-18 15:32:01 -04:00
Matthew Chen
ef95e0538a "Bump build to 2.24.0.8." 2018-04-17 15:16:31 -04:00
Matthew Chen
499d068424 "Bump build to 2.24.0.7." 2018-04-17 13:39:14 -04:00
Matthew Chen
e2fa797e01 Merge remote-tracking branch 'origin/charlesmchen/fixMessageTaps' 2018-04-17 13:38:59 -04:00
Matthew Chen
a1386eca81 Fix taps in message cells. 2018-04-17 13:28:06 -04:00
Matthew Chen
d3f106e3b7 "Bump build to 2.24.0.6." 2018-04-17 13:04:44 -04:00
Matthew Chen
87c335e07e Merge branch 'charlesmchen/fixDateComparators' 2018-04-17 11:50:50 -04:00
Matthew Chen
e7855c16a9 Fix date comparators. 2018-04-17 10:32:11 -04:00
Matthew Chen
3b5ee662d6 Fix date comparators. 2018-04-17 10:31:47 -04:00
Matthew Chen
5067dcba5a Fix date comparators. 2018-04-17 10:15:22 -04:00
Matthew Chen
5a6220a843 "Bump build to 2.24.0.5." 2018-04-16 19:18:37 -04:00
Matthew Chen
26f8050da0 Merge tag '2.23.4.2' 2018-04-16 19:18:31 -04:00
Matthew Chen
e96ad2f973 "Bump build to 2.23.4.2." 2018-04-16 19:13:37 -04:00
Matthew Chen
c3b72ac6b2 Merge branch 'charlesmchen/callViewVsKeyboard_' into hotfix/2.23.4 2018-04-16 19:13:26 -04:00
Matthew Chen
ae61b44a99 Resolve conflict between keyboard and call view. 2018-04-16 19:01:48 -04:00
Matthew Chen
7090a59a35 "Bump build to 2.24.0.4." 2018-04-16 18:15:39 -04:00
Matthew Chen
34e99cc42f Update l10n strings. 2018-04-16 18:15:29 -04:00
Matthew Chen
b8b131a1fb "Bump build to 2.24.0.3." 2018-04-16 17:57:02 -04:00
Matthew Chen
eb51ea42e3 Merge remote-tracking branch 'origin/hotfix/2.23.4' 2018-04-16 17:46:24 -04:00
Matthew Chen
bc35a38592 "Bump build to 2.23.4.1." 2018-04-16 17:41:08 -04:00
Matthew Chen
5cf6e65323 Fix screen lock alerts. 2018-04-16 17:40:06 -04:00
Michael Kirk
66f028a3b3 Update nullability
If object is nil, which it can be, Swift freaks out, since we'd promised
it would never be nil.

// FREEBIE
2018-04-16 17:31:23 -04:00
Matthew Chen
7d7981e823 Merge branch 'charlesmchen/mainWindow' into hotfix/2.23.4 2018-04-16 17:31:11 -04:00
Matthew Chen
85cb78ddfe Add mainWindow property to app context. 2018-04-16 17:31:00 -04:00
Matthew Chen
4e9c653c8a "Bump build to 2.23.4.0." 2018-04-16 17:30:41 -04:00
Matthew Chen
27935361c7 Merge branch 'charlesmchen/malformedProtos' 2018-04-16 16:39:40 -04:00
Matthew Chen
5ce39337ed Handle malformed protos. 2018-04-16 16:15:46 -04:00
Matthew Chen
b925f913bd Merge branch 'charlesmchen/attachmentTypeAssets' 2018-04-16 16:13:47 -04:00
Matthew Chen
284cc8c265 Apply attachment type assets. 2018-04-16 16:12:16 -04:00
Matthew Chen
146db1984b Apply attachment type assets. 2018-04-16 16:12:16 -04:00
Michael Kirk
f2d5bd48f3 Merge branch 'mkirk/nullability-fix' 2018-04-16 16:08:35 -04:00
Michael Kirk
c926ca10a5 Update nullability
If object is nil, which it can be, Swift freaks out, since we'd promised
it would never be nil.

// FREEBIE
2018-04-16 16:08:31 -04:00
Michael Kirk
4d539ba1c4 Merge branch 'mkirk/retry-failed-thumbnail-download' 2018-04-16 16:06:25 -04:00
Michael Kirk
64ff4cd660 tap-to-retry failed thumbnail downloads
// FREEBIE
2018-04-16 16:06:18 -04:00
Matthew Chen
8716d6b7a6 Merge branch 'charlesmchen/homeAndConversationViewDesignTweaks' 2018-04-16 12:39:32 -04:00
Matthew Chen
f6d5b9197c Respond to CR. 2018-04-16 12:39:11 -04:00
Matthew Chen
94e9c72e67 Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
bb9c1fb23d Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
6a69070ce9 Apply design changes from Myles. 2018-04-16 12:36:30 -04:00
Matthew Chen
aedeca03dd Merge branch 'charlesmchen/shapeLayerAnimations' 2018-04-16 12:14:38 -04:00
Matthew Chen
6831412e44 Respond to CR. 2018-04-16 12:14:09 -04:00
Matthew Chen
a5c7bdb987 Don't animate changes to shape layer properties. 2018-04-16 12:08:57 -04:00
Matthew Chen
e02bbaeec9 Merge branch 'charlesmchen/fixBlockScreenAnimation' 2018-04-16 12:06:43 -04:00