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

Clean up ahead of PR.

This commit is contained in:
Matthew Chen 2018-01-25 15:24:21 -05:00
parent 51fb062af1
commit b3e6278a45
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Signal/src/ViewControllers/DebugUI/DebugUIMisc.m
View File

@ -186,9 +186,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)sendEncryptedDatabase:(TSThread *)thread
{
NSString *temporaryDirectory = NSTemporaryDirectory();
NSString *fileName = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
NSString *filePath = [temporaryDirectory stringByAppendingPathComponent:fileName];
NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
NSString *fileName = filePath.lastPathComponent;
__block BOOL success;
[TSStorageManager.sharedManager.newDatabaseConnection
@ -223,9 +222,8 @@ NS_ASSUME_NONNULL_BEGIN
+ (void)sendUnencryptedDatabase:(TSThread *)thread
{
NSString *temporaryDirectory = NSTemporaryDirectory();
NSString *fileName = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
NSString *filePath = [temporaryDirectory stringByAppendingPathComponent:fileName];
NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
NSString *fileName = filePath.lastPathComponent;
NSError *error = [TSStorageManager.sharedManager.newDatabaseConnection backupToPath:filePath];
if (error) {

4
Signal/test/util/OWSDatabaseConverterTest.m
View File

@ -225,9 +225,7 @@ NS_ASSUME_NONNULL_BEGIN
- (NSString *)createTempDatabaseFilePath
{
NSString *temporaryDirectory = NSTemporaryDirectory();
NSString *filename = [[NSUUID UUID].UUIDString stringByAppendingString:@".sqlite"];
NSString *databaseFilePath = [temporaryDirectory stringByAppendingPathComponent:filename];
NSString *databaseFilePath = [OWSFileSystem temporaryFilePathWithFileExtension:@"sqlite"];
DDLogInfo(@"%@ databaseFilePath: %@", self.logTag, databaseFilePath);
[DDLog flushLog];

7
SignalServiceKit/src/Util/DataSource.m
View File

@ -1,10 +1,11 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
// Copyright (c) 2018 Open Whisper Systems. All rights reserved.
//
#import "DataSource.h"
#import "MIMETypeUtil.h"
#import "NSData+Image.h"
#import "OWSFileSystem.h"
NS_ASSUME_NONNULL_BEGIN
@ -173,9 +174,7 @@ NS_ASSUME_NONNULL_BEGIN
@synchronized(self)
{
if (!self.cachedFilePath) {
NSString *dirPath = NSTemporaryDirectory();
NSString *fileName = [[[NSUUID UUID] UUIDString] stringByAppendingPathExtension:self.fileExtension];
NSString *filePath = [dirPath stringByAppendingPathComponent:fileName];
NSString *filePath = [OWSFileSystem temporaryFilePathWithFileExtension:self.fileExtension];
if ([self writeToPath:filePath]) {
self.cachedFilePath = filePath;
} else {