From d7b0424c755cf7773b25fa18c32bce6a92bcfb22 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 3 Nov 2017 11:20:15 -0400 Subject: [PATCH] Don't back up profile pics, attachments or gifs. // FREEBIE --- Signal/src/Profiles/OWSProfileManager.m | 10 ++++++++++ Signal/src/network/GiphyDownloader.swift | 6 ++++++ .../src/Messages/Attachments/TSAttachmentStream.m | 10 ++++++++++ 3 files changed, 26 insertions(+) diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m index 57bdbf215..92a69421f 100644 --- a/Signal/src/Profiles/OWSProfileManager.m +++ b/Signal/src/Profiles/OWSProfileManager.m @@ -1408,6 +1408,16 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; DDLogError(@"Failed to create profile avatars directory: %@", error); } } + + NSURL *dirURL = [NSURL fileURLWithPath:profileAvatarsDirPath]; + NSError *error = nil; + [dirURL setResourceValues:@{ + NSURLIsExcludedFromBackupKey : @(YES), + } + error:&error]; + if (error) { + OWSFail(@"Failed to exclude profile avatars directory from backup: %@", error); + } }); return profileAvatarsDirPath; } diff --git a/Signal/src/network/GiphyDownloader.swift b/Signal/src/network/GiphyDownloader.swift index 4ec87f95d..8c781fcdc 100644 --- a/Signal/src/network/GiphyDownloader.swift +++ b/Signal/src/network/GiphyDownloader.swift @@ -842,6 +842,12 @@ extension URLSessionTask { attributes:nil) gifFolderPath = dirPath } + + // Don't back up Giphy downloads. + var dirURL = NSURL.fileURL(withPath:dirPath) + var resourceValues = URLResourceValues() + resourceValues.isExcludedFromBackup = true + try dirURL.setResourceValues(resourceValues) } catch let error as NSError { owsFail("\(GiphyAsset.TAG) ensureTempFolder failed: \(dirPath), \(error)") gifFolderPath = tempDirPath diff --git a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m index 7f7fa85db..3d6812d76 100644 --- a/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m +++ b/SignalServiceKit/src/Messages/Attachments/TSAttachmentStream.m @@ -204,6 +204,16 @@ NS_ASSUME_NONNULL_BEGIN DDLogError(@"Failed to create attachments directory: %@", error); } } + + NSURL *dirURL = [NSURL fileURLWithPath:attachmentsFolder]; + NSError *error = nil; + [dirURL setResourceValues:@{ + NSURLIsExcludedFromBackupKey : @(YES), + } + error:&error]; + if (error) { + OWSFail(@"Failed to exclude attachments directory from backup: %@", error); + } }); return attachmentsFolder; }