keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix rebase breakage.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent df53033caf
commit 5ba8445f05
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
Signal/src/util/OWSBackup.m
Unescape Escape View File

@ -198,7 +198,7 @@ NSString *const Keychain_ImportBackupKey = @"ImportBackupKey";
DDLogInfo(@"%@ backupZipPath: %@", self.logTag, backupZipPath); DDLogInfo(@"%@ backupZipPath: %@", self.logTag, backupZipPath);
[OWSFileSystem ensureDirectoryExists:rootDirPath]; [OWSFileSystem ensureDirectoryExists:rootDirPath];
[OWSFileSystem protectFolderAtPath:rootDirPath]; [OWSFileSystem protectFileOrFolderAtPath:rootDirPath];
[OWSFileSystem ensureDirectoryExists:backupDirPath]; [OWSFileSystem ensureDirectoryExists:backupDirPath];
if (self.isCancelledOrFailed) { if (self.isCancelledOrFailed) {
@ -267,7 +267,7 @@ NSString *const Keychain_ImportBackupKey = @"ImportBackupKey";
return [self fail]; return [self fail];
} }
[OWSFileSystem protectFolderAtPath:backupZipPath]; [OWSFileSystem protectFileOrFolderAtPath:backupZipPath];
[OWSFileSystem deleteFileIfExists:self.backupDirPath]; [OWSFileSystem deleteFileIfExists:self.backupDirPath];
} }
@ -486,7 +486,7 @@ NSString *const Keychain_ImportBackupKey = @"ImportBackupKey";
DDLogInfo(@"%@ backupZipPath: %@", self.logTag, backupZipPath); DDLogInfo(@"%@ backupZipPath: %@", self.logTag, backupZipPath);
[OWSFileSystem ensureDirectoryExists:rootDirPath]; [OWSFileSystem ensureDirectoryExists:rootDirPath];
[OWSFileSystem protectFolderAtPath:rootDirPath]; [OWSFileSystem protectFileOrFolderAtPath:rootDirPath];
[OWSFileSystem ensureDirectoryExists:backupDirPath]; [OWSFileSystem ensureDirectoryExists:backupDirPath];
NSError *error = nil; NSError *error = nil;
@ -799,7 +799,7 @@ NSString *const Keychain_ImportBackupKey = @"ImportBackupKey";
OWSFail(@"%@ failed to move directory item: %@, %@", self.logTag, dstFilePath, error); OWSFail(@"%@ failed to move directory item: %@, %@", self.logTag, dstFilePath, error);
return NO; return NO;
} }
if (![OWSFileSystem protectFolderAtPath:oldFilePath]) { if (![OWSFileSystem protectFileOrFolderAtPath:oldFilePath]) {
OWSFail(@"%@ failed to protect old directory item: %@, %@", self.logTag, oldFilePath, error); OWSFail(@"%@ failed to protect old directory item: %@, %@", self.logTag, oldFilePath, error);
return NO; return NO;
} }
@ -810,7 +810,7 @@ NSString *const Keychain_ImportBackupKey = @"ImportBackupKey";
OWSFail(@"%@ failed to move directory item: %@, %@", self.logTag, dstFilePath, error); OWSFail(@"%@ failed to move directory item: %@, %@", self.logTag, dstFilePath, error);
return NO; return NO;
} }
if (![OWSFileSystem protectFolderAtPath:dstFilePath]) { if (![OWSFileSystem protectFileOrFolderAtPath:dstFilePath]) {
OWSFail(@"%@ failed to protect directory item: %@, %@", self.logTag, dstFilePath, error); OWSFail(@"%@ failed to protect directory item: %@, %@", self.logTag, dstFilePath, error);
return NO; return NO;
} }

Write Preview
Loading…
Cancel
Save