Commit Graph

22799 Commits

Author SHA1 Message Date
Michael Kirk
afd530af1e Merge branch 'mkirk/fix-boot-crash' 2017-08-23 11:02:35 -04:00
Michael Kirk
0a57e7db09 Fix slow start crash after upgrade to 2.16
We were opening a write transaction before our sync extensions were
registered. This seems to have caused our views to rebuild themselves
once they did register, which in turn can cause device timeout.

Instead of opening transcations in `init`, we only build the
localProfile once it's needed.

A future PR will ensure transactions
aren't being created before syncViews are registered.

// FREEBIE
2017-08-23 11:02:24 -04:00
Matthew Chen
cda5157b9d Merge branch 'charlesmchen/writeTransactionsVsSyncDBRegistration' 2017-08-23 09:56:12 -04:00
Matthew Chen
703b348091 Respond to CR.
// FREEBIE
2017-08-23 09:55:53 -04:00
Matthew Chen
a9b55675cd Add assert to ensure that we don't use write transactions before sync database view registration is complete.
// FREEBIE
2017-08-23 09:46:26 -04:00
Matthew Chen
9a045054e2 Merge branch 'charlesmchen/stagingServiceVsProduction' 2017-08-23 09:45:07 -04:00
Matthew Chen
97f74ca5b4 Only use staging service in debug builds.
// FREEBIE
2017-08-22 17:19:44 -04:00
Matthew Chen
828cfb5fac Merge branch 'charlesmchen/groupOffers' 2017-08-21 17:51:23 -04:00
Matthew Chen
5e6f5804c1 Respond to CR.
// FREEBIE
2017-08-21 17:50:40 -04:00
Matthew Chen
584ddab0b9 Show "share profile with group" banner.
// FREEBIE
2017-08-21 17:49:54 -04:00
Matthew Chen
ae1908c40c Show "share profile with group" banner.
// FREEBIE
2017-08-21 17:49:54 -04:00
Matthew Chen
673c44e131 Merge branch 'charlesmchen/padEmptyProfileName' 2017-08-21 17:49:10 -04:00
Matthew Chen
68ee56174a Pad empty profile names instead of nil.
// FREEBIE
2017-08-21 17:49:04 -04:00
Matthew Chen
3d6bf273d5 Bump build from to 2.16.0.5.
// FREEBIE
2017-08-21 17:40:34 -04:00
Matthew Chen
7eeb326865 Fix minor build error.
// FREEBIE
2017-08-21 17:40:18 -04:00
Matthew Chen
ec3f099af1 Bump build from to 2.16.0.4.
// FREEBIE
2017-08-21 17:33:01 -04:00
Matthew Chen
42b5da2dbc Merge branch 'charlesmchen/reworkProfileView' 2017-08-21 17:32:08 -04:00
Matthew Chen
6dda535f24 Rework the profile view.
// FREEBIE
2017-08-21 17:32:01 -04:00
Matthew Chen
313d06b31d Rework the profile view.
// FREEBIE
2017-08-21 17:32:01 -04:00
Matthew Chen
020d2c567a Rework the profile view.
// FREEBIE
2017-08-21 17:32:01 -04:00
Matthew Chen
3181ee7882 Rework the profile view.
// FREEBIE
2017-08-21 17:32:01 -04:00
Matthew Chen
d27708497e Merge branch 'charlesmchen/observeProfileChanges' 2017-08-21 17:28:23 -04:00
Matthew Chen
9dfeb132cb Respond to CR.
// FREEBIE
2017-08-21 17:27:30 -04:00
Matthew Chen
1e43e93371 Observe profile changes in conversation view.
// FREEBIE
2017-08-21 17:25:07 -04:00
Matthew Chen
9a70aef99f Bump build from to 2.16.0.3.
// FREEBIE
2017-08-21 17:17:33 -04:00
Matthew Chen
72c983e4a0 Merge branch 'charlesmchen/contactOffers' 2017-08-21 17:14:00 -04:00
Matthew Chen
14d472781f Respond to CR.
// FREEBIE
2017-08-21 17:13:36 -04:00
Matthew Chen
a340c9ebdc Clean up ahead of CR.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
4578a72ab2 Reorder where contact offers appear.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
02c96b7b0e Rework the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
9e02524b0b Rework the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
c2f9d7dcb2 Rework the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
265bdce0ba Start reworking the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
a825fad47b Start reworking the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
98eb4693c5 Rework the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Matthew Chen
5f2f8ec6d8 Start reworking the contact offers.
// FREEBIE
2017-08-21 17:05:42 -04:00
Michael Kirk
7ede899a74 Merge branch 'mkirk/openssl' 2017-08-21 16:37:21 -04:00
Michael Kirk
0ab958f03a cleanup per codereview
- reference OWS OpenSSL
- clarify comments
- fix typo

// FREEBIE
2017-08-21 16:37:16 -04:00
Michael Kirk
0f9f26a577 handle remote user's profile key has changed
// FREEBIE
2017-08-21 16:37:16 -04:00
Michael Kirk
72fbb02028 aes-gcm via openssl
// FREEBIE
2017-08-21 16:37:16 -04:00
Michael Kirk
d6d403ce69 fix some tests
// FREEBIE
2017-08-21 16:37:16 -04:00
Matthew Chen
636790c991 Merge branch 'charlesmchen/profileForNewAndOldUsers' 2017-08-21 15:12:18 -04:00
Matthew Chen
27e496ad06 Respond to CR.
// FREEBIE
2017-08-21 10:10:22 -04:00
Matthew Chen
1b055c485d Rework "cancel navigate back" logic.
// FREEBIE
2017-08-21 10:10:22 -04:00
Matthew Chen
25b0f79615 Rework "cancel navigate back" logic.
// FREEBIE
2017-08-21 10:10:22 -04:00
Matthew Chen
08347478a2 Implement alternative approach to veto-able back buttons.
// FREEBIE
2017-08-21 10:10:22 -04:00
Matthew Chen
9d8c396848 Add profile view to upgrade/nag workflow.
// FREEBIE
2017-08-21 10:10:22 -04:00
Matthew Chen
ffb4b3f9d2 Add profile view to registration workflow.
// FREEBIE
2017-08-21 10:10:22 -04:00
Michael Kirk
26f9c7ad00 Merge branch 'mkirk/clarify-profile-name-use' 2017-08-17 12:24:38 -04:00
Michael Kirk
7c386b1d1e CR: RTL, trim profile names, ensure not empty
- RTL support with localizable format strings
- Trim decrypted profile names
- more rigorous empty check

// FREEBIE
2017-08-17 12:24:31 -04:00