Michael Kirk
8fde4a3a6f
Merge branch 'mkirk/call-inaudible'
2018-02-16 14:00:24 -08:00
Michael Kirk
707ab5f5a8
Minimize changes around call audio activity
...
// FREEBIE
2018-02-16 14:00:15 -08:00
Michael Kirk
4dd1c7813a
Instrument calls to ensure audio session is maintained
...
// FREEBIE
2018-02-16 14:00:15 -08:00
Michael Kirk
abb51b565a
Don't de-activate audio sesion when other audio activities are happening
...
// FREEBIE
2018-02-16 14:00:15 -08:00
Matthew Chen
22d078f3c8
Merge branch 'charlesmchen/indicVsSAE'
2018-02-16 16:50:57 -05:00
Matthew Chen
283fe17649
Apply Indic script fixes to SAE and master.
2018-02-16 16:50:14 -05:00
Matthew Chen
9341935700
Merge branch 'charlesmchen/notMigratedWarning'
2018-02-16 15:19:35 -05:00
Matthew Chen
c937aaaf84
Improve handling of the not migrated case.
2018-02-16 15:19:24 -05:00
Matthew Chen
6935298f6f
Improve handling of the not migrated case.
2018-02-16 15:19:24 -05:00
Matthew Chen
5bc96d4374
Merge branch 'charlesmchen/profileConsistency'
2018-02-16 15:16:45 -05:00
Matthew Chen
03f6d473a3
Fix issues around profile updates.
2018-02-16 15:16:38 -05:00
Matthew Chen
3a2ec950cc
Merge branch 'charlesmchen/scrollVsAttachmentApproval'
2018-02-16 15:14:19 -05:00
Matthew Chen
ceaf028445
Always scroll to bottom after sending attachments.
2018-02-16 14:06:46 -05:00
Matthew Chen
90b8ee4849
Merge remote-tracking branch 'origin/hotfix/2.19.7'
2018-02-16 11:37:29 -05:00
Matthew Chen
3300e788eb
Bump build to 2.19.7.6.
...
// FREEBIE
2018-02-16 11:34:13 -05:00
Matthew Chen
77bf0b66f5
Fix attachment MIME types.
2018-02-16 11:34:08 -05:00
Matthew Chen
d648a258d1
Merge branch 'hotfix/2.19.7'
2018-02-16 10:49:52 -05:00
matthew chen
9c23e2baaf
Bump build to 2.19.7.5.
...
// FREEBIE
2018-02-16 10:41:37 -05:00
Matthew Chen
4c8c40ca21
Bump build to 2.19.7.4.
...
// FREEBIE
2018-02-16 10:19:53 -05:00
Matthew Chen
abfd333a17
Address Indic script crash.
2018-02-16 10:19:47 -05:00
Matthew Chen
a4906b2788
Update l10n strings.
2018-02-15 15:45:39 -05:00
Matthew Chen
950526f310
Merge branch 'charlesmchen/saeNotifications'
2018-02-15 14:23:17 -05:00
Matthew Chen
3ab33b997e
Respond to CR.
2018-02-15 14:08:22 -05:00
Matthew Chen
33cb8b7e4c
Revert "Surface error messages in SAE as alerts."
...
This reverts commit bd51ae1646
.
2018-02-15 13:55:49 -05:00
Matthew Chen
bd51ae1646
Surface error messages in SAE as alerts.
2018-02-15 13:55:39 -05:00
Matthew Chen
87233490d3
"Bump build to 2.20.0.25."
2018-02-15 13:49:35 -05:00
Matthew Chen
569728118e
Merge branch 'charlesmchen/saeFilenames'
2018-02-15 13:49:13 -05:00
Matthew Chen
2e1b8a7b8a
Respond to CR.
2018-02-15 13:49:02 -05:00
Matthew Chen
7ea1f3d926
Fix handling of file types in SAE.
2018-02-15 13:47:05 -05:00
Matthew Chen
c2787341ae
Fix handling of URLs in SAE.
2018-02-15 13:47:05 -05:00
Matthew Chen
efbcdb98fb
Merge branch 'charlesmchen/failedStatusMessage'
2018-02-15 13:44:38 -05:00
Matthew Chen
8fdc61c726
Fix failed status messages in message detail view.
2018-02-15 13:44:20 -05:00
Matthew Chen
b511d60b3b
Merge branch 'charlemschen/signalAppearanceVsSAE'
2018-02-15 13:37:12 -05:00
Matthew Chen
fdf9b023b6
Don't apply signal appearance in SAE.
2018-02-15 13:06:32 -05:00
Matthew Chen
53eb9d07e8
"Bump build to 2.20.0.24."
2018-02-15 10:37:24 -05:00
Matthew Chen
394cd5c94e
Merge branch 'charlesmchen/refineSAELifecycle'
2018-02-15 10:37:08 -05:00
Matthew Chen
c29898f435
Refine the SAE lifecycle.
2018-02-15 10:33:46 -05:00
matthew chen
1259851f72
"Bump build to 2.20.0.23."
2018-02-15 09:38:03 -05:00
matthew chen
47aa29db25
Fix build breakage.
2018-02-15 09:38:00 -05:00
Matthew Chen
da8da29215
"Bump build to 2.20.0.22."
2018-02-15 09:26:02 -05:00
Michael Kirk
1c69cd3dc5
Merge branch 'mkirk/missing-messages'
2018-02-15 06:24:09 -08:00
Michael Kirk
da15f245cf
CR: fix early return, assert on error
...
inline functions which were only used once
// FREEBIE
2018-02-15 06:23:47 -08:00
Michael Kirk
b4359b33dd
Fix "lose messages received while in background"
...
A moved legacy DB has the NSFileProtectionClassComplete, meaning it's
never accessible while the device is locked.
// FREEBIE
2018-02-15 06:23:47 -08:00
Matthew Chen
4262a83e00
"Bump build to 2.20.0.21."
2018-02-14 18:46:45 -05:00
Matthew Chen
c1a78d1f1e
Merge branch 'charlesmchen/saeShutdown'
2018-02-14 18:46:35 -05:00
Matthew Chen
d13511ca7d
Exit SAE when complete.
2018-02-14 18:46:22 -05:00
Matthew Chen
d374e6ab86
"Bump build to 2.20.0.20."
2018-02-14 18:07:56 -05:00
Michael Kirk
7ff99fe76c
Merge branch 'mkirk/fixup-readiness-dispatch'
2018-02-14 14:17:00 -08:00
Michael Kirk
5c432a2bc1
Fix crash on launch in debug.
...
OWSReadReceiptManager is not `init` on the main thread; however, because
it "schedules" it's own processing during init.
I considered dispatching to main, but since AppReadiness already *can*
resolve async if the app isn't yet ready, it should be no less safe to
also dispatch async when it's off the main thread.
// FREEBIE
2018-02-14 13:47:45 -08:00
Matthew Chen
0522f33a86
"Bump build to 2.20.0.19."
2018-02-14 16:07:46 -05:00