Commit Graph

6055 Commits

Author SHA1 Message Date
Matthew Chen
86aae78f1b Include migrations in backup. 2018-03-17 09:18:01 -03:00
Matthew Chen
c62b5f9b55 Fix build break. 2018-03-17 09:17:16 -03:00
Matthew Chen
163c5b487a Fix cocoapods. 2018-03-17 09:08:52 -03:00
Michael Kirk
9bce78572d Merge branch 'mkirk/media-gallery' 2018-03-16 15:58:07 -04:00
Michael Kirk
4ac9a1019b Media page view controller
First pass at a swipe-through media view for conversations.

Future work could include

- title label per item
  - sender name
  - date/time
- photo rail
- include caption

// FREEBIE
2018-03-16 15:55:34 -04:00
Michael Kirk
88e1386720 Move frame to presentation logic, out of init
This no longer made sense now that we're using this in a
PageViewController we won't always be zooming from a particular frame.

TODO:

- why is background image all wonky?
- why aren't views created by the time it's presented? Is that a
regression? (how is self.view a MenuView if loadView hasn't been called)

// FREEBIE
2018-03-14 12:50:27 -04:00
Matthew Chen
168ca76e68 Merge branch 'charlesmchen/incrementalBackup2' 2018-03-14 10:02:59 -03:00
Matthew Chen
4746948dfe Respond to CR. 2018-03-14 10:02:44 -03:00
Matthew Chen
f10b549940 Clean up ahead of PR. 2018-03-14 09:27:39 -03:00
Matthew Chen
eb263e265b Clean up ahead of PR. 2018-03-14 09:27:39 -03:00
Matthew Chen
68ba8976c5 Clean up ahead of PR. 2018-03-14 09:27:39 -03:00
Matthew Chen
cc10dbf32f Clean up ahead of PR. 2018-03-14 09:27:39 -03:00
Matthew Chen
b3ecc085d5 Clean up ahead of PR. 2018-03-14 09:27:39 -03:00
Matthew Chen
76b4deffe4 Respond to CR. 2018-03-14 09:27:39 -03:00
Matthew Chen
70d14c84c4 Clean up backup code. 2018-03-14 09:27:39 -03:00
Matthew Chen
08149005b1 Clean up backup code. 2018-03-14 09:27:39 -03:00
Matthew Chen
3f822e8ce3 Complete minimal backup MVP. 2018-03-14 09:27:39 -03:00
Matthew Chen
f46ea0e87d Implement backup import logic. 2018-03-14 09:27:39 -03:00
Matthew Chen
30065493a3 Implement backup import logic. 2018-03-14 09:27:39 -03:00
Matthew Chen
5035cb040e Implement backup import logic. 2018-03-14 09:27:39 -03:00
Matthew Chen
04c527a0f4 Implement backup import logic. 2018-03-14 09:27:39 -03:00
Matthew Chen
f53f1fb46a Add check for backup in cloud. 2018-03-14 09:27:39 -03:00
Matthew Chen
6cea2779d2 Stub out backup private key. 2018-03-14 09:27:39 -03:00
Matthew Chen
999321c067 Check for manifest in cloud. 2018-03-14 09:27:39 -03:00
Matthew Chen
90c8f5483b Clean up cloud after successful backup export. 2018-03-14 09:27:39 -03:00
Matthew Chen
aa546a02df Merge remote-tracking branch 'origin/release/2.22.0' 2018-03-14 09:19:15 -03:00
Michael Kirk
8f468b6138 "Bump build to 2.22.0.4." 2018-03-13 15:23:18 -04:00
Michael Kirk
56f025baed Sync Translations
// FREEBIE
2018-03-13 15:23:08 -04:00
Michael Kirk
a6d6d1e757 Merge branch 'mkirk/remove-pin-placeholder' into release/2.22.0 2018-03-13 15:22:50 -04:00
Michael Kirk
89f1779253 Remove PIN placeholder text
It's not always 6 digits, so it's a confusing placeholder

// FREEBIE
2018-03-13 15:10:27 -04:00
Michael Kirk
5f8c5ccd53 Merge branch 'charlesmchen/backgroundTaskTypo' into release/2.22.0 2018-03-13 15:09:27 -04:00
Matthew Chen
c1169ce240 Fix typo in background task. 2018-03-13 15:09:06 -04:00
Matthew Chen
bdb35c566c Merge branch 'charlesmchen/incrementalBackup' 2018-03-12 17:06:43 -03:00
Matthew Chen
37d4c413d5 Clean up before merge. 2018-03-12 16:47:48 -03:00
Matthew Chen
b1ca550345 Clean up ahead of PR. 2018-03-12 16:40:07 -03:00
Matthew Chen
0e0628a8dc Clean up ahead of PR. 2018-03-12 16:40:07 -03:00
Matthew Chen
b65cc953ec Clean up ahead of PR. 2018-03-12 16:40:07 -03:00
Matthew Chen
a91eea9a17 Fix rebase breakage. 2018-03-12 16:40:07 -03:00
Matthew Chen
202a35fddd Only backup every N hours. 2018-03-12 16:40:07 -03:00
Matthew Chen
fefba6c63e Don't download files from cloud when testing for their existence. 2018-03-12 16:40:07 -03:00
Matthew Chen
c2751665c3 Only backup attachments once. 2018-03-12 16:40:07 -03:00
Matthew Chen
20587ba377 Upload attachments to cloud; upsert files to cloud. 2018-03-12 16:40:07 -03:00
Matthew Chen
0971bad4b2 Upload database and manifest files to CloudKit. 2018-03-12 16:40:07 -03:00
Matthew Chen
c84bf81cf3 Export database for backup. 2018-03-12 16:40:07 -03:00
Matthew Chen
b603a8dcbe Upload test file to CloudKit. 2018-03-12 16:40:07 -03:00
Matthew Chen
593f7da72d Upload test file to CloudKit. 2018-03-12 16:40:07 -03:00
Matthew Chen
d06ad25d77 Sketch out incremental backup manager and settings view. 2018-03-12 16:40:07 -03:00
Matthew Chen
b296cfb893 Sketch out incremental backup manager and settings view. 2018-03-12 16:40:07 -03:00
Matthew Chen
46a89e89f0 Sketch out OWSBackupStorage. 2018-03-12 16:40:06 -03:00
Matthew Chen
792be8018f Incremental backup. 2018-03-12 16:40:06 -03:00