Commit Graph

3691 Commits

Author SHA1 Message Date
Matthew Chen
6bc20ea971 Merge branch 'charlesmchen/showThreadsSync' 2017-08-04 09:35:20 -04:00
Matthew Chen
a70bd3307d Show threads if possible.
// FREEBIE
2017-08-04 09:35:10 -04:00
Michael Kirk
aa5c441aed Merge branch 'mkirk/cache-local-number' 2017-08-03 13:40:57 -04:00
Michael Kirk
935b51aa19 Fixup tests
// FREEBIE
2017-08-03 13:27:09 -04:00
Michael Kirk
01e808febe localNumber persistance from Category -> TSAccountManager
Following the pattern that singleton methods for effectively global
state should get/set on their own dedicated dbConnection for consistency
and to avoid being blocked by unrelated writes.
2017-08-03 13:27:09 -04:00
Michael Kirk
8a4712bf4c Only access localNumber on AccountManager and cache it
// FREEBIE
2017-08-03 13:27:09 -04:00
Michael Kirk
e0aae5058d Merge branch 'mkirk/random-avatar-builder' 2017-08-03 13:18:52 -04:00
Michael Kirk
357eb62502 [DEBUG-UI] Add avatar to (some) fake contacts
// FREEBIE
2017-08-03 13:18:36 -04:00
Matthew Chen
43b3abe321 Merge branch 'hotfix/2.15.2' 2017-08-03 13:10:01 -04:00
Matthew Chen
a1411ff81b Merge branch 'charlesmchen/profiles6' 2017-08-03 12:06:04 -04:00
Matthew Chen
539490ee19 Respond to CR.
// FREEBIE
2017-08-03 12:05:53 -04:00
Matthew Chen
96faa080c0 Merge branch 'charlesmchen/callViewDelay' into hotfix/2.15.2 2017-08-03 10:50:02 -04:00
Matthew Chen
d9bc3ac806 Respond to CR.
// FREEBIE
2017-08-03 10:49:37 -04:00
Matthew Chen
9c5934359e Don’t dismiss call view controller to present other view.
// FREEBIE
2017-08-03 10:41:16 -04:00
Matthew Chen
138301975c Don’t dismiss call view controller to present other view.
// FREEBIE
2017-08-03 10:40:45 -04:00
Matthew Chen
791e270578 Terminate call if call view presentation is delayed.
// FREEBIE
2017-08-03 10:29:40 -04:00
Matthew Chen
634617b7d4 Terminate call if call view presentation is delayed.
// FREEBIE
2017-08-03 10:26:22 -04:00
Michael Kirk
2da8741df9 Merge branch 'mkirk/call-screen-timer' into hotfix/2.15.2 2017-08-03 09:51:45 -04:00
Michael Kirk
81d7f28253 Timer to ensure call screen shown
// FREEBIE
2017-08-02 19:13:46 -04:00
Michael Kirk
c6069376d8 more logging
// FREEBIE
2017-08-02 19:13:06 -04:00
Matthew Chen
f8e153fb71 Bump build from to 2.15.2.1.
// FREEBIE
2017-08-02 18:15:20 -04:00
Matthew Chen
639fcac211 Merge branch 'charlesmchen/hideThreadsVsDisappearingMessages' into hotfix/2.15.2 2017-08-02 15:12:52 -04:00
Matthew Chen
6f03c2d92f Don’t hide threads if they are a group thread, or if they have _ever_ had a message.
// FREEBIE
2017-08-02 15:12:42 -04:00
Matthew Chen
5c4019b9c5 Bump version to 2.15.2.0.
// FREEBIE
2017-08-02 14:19:39 -04:00
Matthew Chen
c603a2651d Rework how user profiles are updated and persisted. Persist other user’s profiles. Load and cache other user’s profile avatars.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
d7f275ce73 Add accessor for other users’ profile names.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
4a54f1a99c DRY up and refine the logic to attach the local profile key to outgoing messages.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
aa6312b586 DRY up and refine the logic to attach the local profile key to outgoing messages.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
282ac4bb29 Add “share profile” row to conversation settings.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
1c1e173c58 Add support for adding groups to the profile whitelist.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
26b668cce7 Add profile key to proto schema. Send and receive profile keys. Cache profile manager state.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
e58358ce53 Add profile key to content proto schema.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
202724cdcc Persist profile whitelist and known profile keys.
// FREEBIE
2017-08-02 10:50:44 -04:00
Matthew Chen
ec6283face Merge branch 'charlesmchen/yapDatabaseConnectionCategory' 2017-08-02 10:49:57 -04:00
Matthew Chen
2993ac002f Clean up database convenience methods and add assertions.
// FREEBIE
2017-08-02 10:47:42 -04:00
Matthew Chen
a3b16812ec Add convenience category for YapDatabaseConnection.
// FREEBIE
2017-08-02 10:38:23 -04:00
Matthew Chen
4be706caf5 Add convenience category for YapDatabaseConnection.
// FREEBIE
2017-08-02 10:38:23 -04:00
Matthew Chen
7692a393c1 Add convenience category for YapDatabaseConnection.
// FREEBIE
2017-08-02 10:38:23 -04:00
Matthew Chen
92e84ea21e Merge branch 'charlesmchen/profileView3' 2017-08-02 10:37:31 -04:00
Matthew Chen
a748987d72 Add option to clear profile avatar.
// FREEBIE
2017-08-01 16:32:36 -04:00
Matthew Chen
83a02536a4 Merge branch 'charlesmchen/profileView2' 2017-08-01 16:30:42 -04:00
Matthew Chen
03a4ebc4d8 Respond to CR.
// FREEBIE
2017-08-01 16:30:24 -04:00
Matthew Chen
8a8f3d81fc Clean up ahead of PR.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
c331788c06 Modify the profile view to update profile manager state.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
0f3a3d1903 Sketch out profile upload.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
0bd23345a1 Sketch out the profile view.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
873f5208c4 Sketch out the profile view.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
72ea096970 Sketch out the profile view.
// FREEBIE
2017-08-01 16:17:59 -04:00
Matthew Chen
b62ab3f666 Merge remote-tracking branch 'origin/hotfix/2.15.1' 2017-08-01 16:17:18 -04:00
Matthew Chen
868d19972c Merge branch 'charlesmchen/ios8vsLayout' into hotfix/2.15.1 2017-08-01 15:12:11 -04:00